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 77d4af8975 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Server/Atmos/EntitySystems/FlammableSystem.cs
#	Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs
#	Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs
#	Content.Shared/Damage/Systems/StaminaSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Locale/en-US/_strings/chat/ui/chat-window.ftl
#	Resources/Locale/en-US/_strings/damage/damage-popup-component.ftl
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/XenoArch/Effects/normal_effects.yml
#	Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo.png
#	Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
#	Resources/migration.yml
2025-04-15 04:03:44 +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 Вобля 2025-02-12 20:03:00 +03:00
EntitySystems Merge remote-tracking branch 'space-wizards/master' 2025-04-15 04:03:44 +03:00
Monitor Add air alarm admin logs (#33426) 2025-02-05 21:10:21 -08:00
Piping Merge remote-tracking branch 'space-wizards/master' 2025-04-06 04:22:26 +03:00
Portable Нитриум (#1538) 2025-03-25 09:50:48 +03:00
Reactions Merge remote-tracking branch 'space-wizards/master' 2025-03-25 11:30:01 +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