Vigers Ray 0c1e15e516 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Info/LinkBanner.cs # Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl # Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl # Resources/Prototypes/Datasets/Names/diona.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml		2024-11-26 17:50:59 +03:00
..
SharedAirlockSystem.cs	fix airlocks inconsistently auto-closing after unbolting (#33524)	2024-11-25 15:26:54 +11:00
SharedDoorSystem.Bolts.cs	fix airlocks inconsistently auto-closing after unbolting (#33524)	2024-11-25 15:26:54 +11:00
SharedDoorSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-26 17:50:59 +03:00
SharedFirelockSystem.cs	Firelocks are no longer pryable by hand if they are powered (#29221)	2024-06-22 10:49:50 -07:00