VigersRay aa156c2c86 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs		2024-06-15 21:05:02 +03:00
..
AirlockSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-01 09:38:18 +03:00
DoorSystem.cs	Predict doors and airlocks (#25419)	2024-02-23 10:01:31 +11:00
FirelockSystem.cs	Make firelock warning light not require power and add a PointLight (#29024)	2024-06-15 11:17:16 -04:00