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
..
Components	Engineering guidebook megaupdate v2 (#33062)	2025-01-27 11:42:27 -08:00
Consoles	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +03:00
EntitySystems	Predicted gas pumps (#33717)	2024-12-07 14:39:52 +11:00
Monitor	Remove client state from server AirAlarmComponent (#31236)	2024-08-25 12:01:46 +10:00
Piping	Хиллиум и БЗ в фильтры скрубберов	2024-12-15 13:49:55 +03:00
Portable/Components	Add space heaters (#25250)	2024-02-28 10:27:29 -08:00
Prototypes	Make all prototype types partial (#21374)	2023-11-01 19:56:23 -07:00
Reactions	Move GasMixture to shared (#27480)	2024-04-30 14:31:05 -07:00
Rotting	Hivelord mob (#31322)	2024-09-11 09:52:27 -04:00
Visuals	Add space heaters (#25250)	2024-02-28 10:27:29 -08:00
AtmosCommandUtils.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
AtmosDirection.cs	Replace NavMap dictionaries with int[] (#27602)	2024-05-02 12:51:21 +10:00
Atmospherics.cs	Revert "Уменьшение урона от удушения"	2025-01-17 22:32:56 +03:00
FireVisuals.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
GasMixture.cs	Make GasMixture enumerable	2025-01-18 00:50:22 +01:00
GasMixtureStringRepresentation.cs	Move GasMixture to shared (#27480)	2024-04-30 14:31:05 -07:00
GasOverlayChunk.cs	Fix exception with gas overlay rendering (#24001)	2024-01-13 00:22:10 +01:00
GetFireProtectionEvent.cs	make fire not burn through hardsuits (#27161)	2024-05-09 00:12:48 -07:00
PipeDirection.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00