Vigers Ray
|
3355febe9b
|
Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
# Content.Client/StatusIcon/StatusIconSystem.cs
# Content.Server/Implants/ImplantedSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/markings/ears.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Mobs/Player/observer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
# Resources/manifest.yml
# Resources/migration.yml
# RobustToolbox
|
2025-02-09 22:17:22 +03:00 |
|
SlamBamActionman
|
e58d031300
|
Hristov & .60 changes - Hristov Rework, Part 2 (#31662)
* Initial commit
* Updated values to reflect new resistances
* Review fixes
* Review fixes
* LINQ BEGONETH
|
2025-02-04 22:55:09 +01:00 |
|
Vigers Ray
|
cef39bc293
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
# Content.Client/UserInterface/Controls/RadialContainer.cs
# Content.Server/Lathe/LatheSystem.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Wieldable/SharedWieldableSystem.cs
# Resources/Locale/en-US/_strings/station-events/events/radiation-storm.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Atmospherics/gases.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
# Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/RTG.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Security/CriminalRecords.xml
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/migration.yml
|
2025-01-30 11:33:49 +03:00 |
|
SlamBamActionman
|
5c782d3028
|
Add conditional camera offset based on cursor - Hristov Rework, Part 1 (#31626)
|
2025-01-28 00:20:45 +01:00 |
|