rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Server/Atmos
History
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
..
Commands Fix setmapatmos temperature argument 2024-09-13 14:49:27 -08:00
Components Доработки хитскана 2024-12-05 14:54:08 +03:00
Consoles Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-21 18:51:37 +03:00
EntitySystems Merge remote-tracking branch 'space-wizards/master' 2025-02-09 22:17:22 +03:00
Monitor Add air alarm admin logs (#33426) 2025-02-05 21:10:21 -08:00
Piping Add air alarm admin logs (#33426) 2025-02-05 21:10:21 -08:00
Portable Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-30 11:33:49 +03:00
Reactions Merge remote-tracking branch 'space-wizards/master' 2025-02-09 22:17:22 +03:00
Rotting replace all uses of TryGetContainingContainer with non-obsolete overload (#30583) 2024-08-04 15:38:53 +10:00
Serialization Move GasMixture to shared (#27480) 2024-04-30 14:31:05 -07:00
ExcitedGroup.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
GasMixtureStringRepresentation.cs Add cryopod logs (#16854) 2023-05-28 18:59:27 +10:00
Hotspot.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
IGasMixtureHolder.cs Move GasMixture to shared (#27480) 2024-04-30 14:31:05 -07:00
IGasReactionEffect.cs Move GasMixture to shared (#27480) 2024-04-30 14:31:05 -07:00
MonstermosInfo.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
PressureEvent.cs Rejig pressure protection (#7560) 2022-04-15 15:41:47 -07:00
TileAtmosphere.cs Use archived gas mixture in gas exchange comparison (#32088) 2024-09-29 22:14:07 -07:00
TileFireEvent.cs Minor atmos optimisations (#6625) 2022-02-20 17:43:20 +11:00
TileMixtureEnumerator.cs Move GasMixture to shared (#27480) 2024-04-30 14:31:05 -07:00