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
..
base_objectives.yml	Objectives ecs rework (#19967)	2023-09-16 16:18:10 +10:00
dragon.yml	dragon refactor, objectives and use GenericAntag (#20201)	2023-09-30 13:18:01 -07:00
ninja.yml	Decrease doorjack count for ninja (#1439)	2023-09-22 17:49:19 +03:00
objectiveGroups.yml	Hijack shuttle objective (#19621)	2023-10-24 18:55:46 +11:00
traitor.yml	Fix hijack objective (#21241)	2023-10-27 22:33:18 -04:00