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 389ed704e1 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Traitor/Uplink/UplinkSystem.cs
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
#	Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Resources/Audio/Ambience/Antag/attributions.yml
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
#	Resources/Locale/en-US/_strings/shuttles/commands.ftl
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	RobustToolbox
2024-10-30 13:26:32 +03:00
..
Commands Fix setmapatmos temperature argument 2024-09-13 14:49:27 -08:00
Components Hide role entities in the spawn menu (#32798) 2024-10-14 14:05:49 +11:00
Consoles Visualized regions for NavMapControl (#31910) 2024-10-23 14:49:58 +02:00
EntitySystems ayo (#545) 2024-10-30 10:42:02 +03:00
Monitor Atmospheric alerts computer (#25938) 2024-09-04 21:13:17 -04:00
Piping Makes it possible to disable the vent pressure lockout temporarily with a screwdriver (#31050) 2024-09-22 21:59:56 +02:00
Portable Power stuff (#31314) 2024-08-25 22:18:42 +10:00
Reactions Move GasMixture to shared (#27480) 2024-04-30 14:31:05 -07: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