Arthur b877259791 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml		2022-07-29 17:59:17 +03:00
..
Commands	Fix a bug where toggleready returns an exception when provided with the wrong number of arguments (#9631)	2022-07-12 12:14:24 +10:00
Events	Make AdminLogsSystem an IoC manager (#8492)	2022-05-28 23:41:17 -07:00
Presets	Allow game presets to have min/max players (#8327)	2022-05-21 20:55:19 -07:00
Prototypes	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
Rules	Audio System Rejig (#9635)	2022-07-29 12:13:12 +10:00
GameTicker.cs	Localize jobs (#8968)	2022-06-28 22:55:05 +10:00
GameTicker.CVars.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-05-15 16:38:40 +03:00
GameTicker.GamePreset.cs	Make sandbox the local gamemode (#8360)	2022-05-22 17:32:34 -07:00
GameTicker.GameRule.cs	Event refactor (#9589)	2022-07-10 20:48:41 -05:00
GameTicker.Lobby.cs	Secret! (#8276)	2022-05-19 14:44:24 +10:00
GameTicker.LobbyBackground.cs	Fixing warnings (#8131)	2022-05-13 15:35:13 +10:00
GameTicker.LobbyMusic.cs	Audio System Rejig (#9635)	2022-07-29 12:13:12 +10:00
GameTicker.Player.cs	Fix server update restarts when server paused. (#8509)	2022-05-30 01:09:50 -07:00
GameTicker.RoundFlow.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-29 17:59:17 +03:00
GameTicker.Spawning.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-29 17:59:17 +03:00
GameTicker.StatusShell.cs	Add SoftMaxPlayers to status response for launcher use (#9365)	2022-07-08 21:44:49 +02:00
GameTicket.Discord.cs	Fix compiling (#137)	2022-03-05 03:20:42 +03:00
ManifestEntry.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00