Morb0 f22b645ff6 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Maps/europa.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Maps/omega.yml # Resources/Prototypes/Maps/packed.yml # Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml		2023-12-12 11:00:46 +03:00
..
Commands	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Events	Make AdminLogsSystem an IoC manager (#8492)	2022-05-28 23:41:17 -07:00
Presets	Make all prototype types partial (#21374)	2023-11-01 19:56:23 -07:00
Prototypes	Make all prototype types partial (#21374)	2023-11-01 19:56:23 -07:00
Rules	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
GameTicker.cs	Log server ID in connection logs table (#21911)	2023-12-07 09:48:56 +11:00
GameTicker.CVars.cs	Enrich discord round notifications (#19502)	2023-08-24 19:53:32 -07:00
GameTicker.GamePreset.cs	Log server ID in connection logs table (#21911)	2023-12-07 09:48:56 +11:00
GameTicker.GameRule.cs	Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564)	2023-09-28 10:48:59 -04:00
GameTicker.Lobby.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
GameTicker.LobbyBackground.cs	Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566)	2023-04-20 20:16:01 +10:00
GameTicker.LobbyMusic.cs	Lint more const string prototypes (#18922)	2023-08-13 20:26:59 -04:00
GameTicker.Player.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
GameTicker.Replays.cs	Add Exists check and try catch when creating replay dir (#20852)	2023-10-08 23:34:10 -07:00
GameTicker.RoundFlow.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
GameTicker.Spawning.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-22 20:22:45 +03:00
GameTicker.StatusShell.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
ManifestEntry.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00