Morb0 681762aca7 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/GameTicker.Player.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs # Resources/Prototypes/Objectives/objectiveGroups.yml		2023-10-28 14:14:36 +03:00
..
cargo_gifts.yml	Fix cargo gifts (#18449)	2023-07-30 12:53:54 -06:00
events.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-28 14:14:36 +03:00
midround.yml	dragon refactor, objectives and use GenericAntag (#20201)	2023-09-30 13:18:01 -07:00
roundstart.yml	Revolutionaries (#18477)	2023-10-04 18:47:33 -07:00