rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Shared/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
..
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 Add air alarm admin logs (#33426) 2025-02-05 21:10:21 -08: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 ReactionResults an array (#34967) 2025-02-09 03:13:47 +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