Morb0 75443d7fb6 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Communications/CommunicationsConsoleSystem.cs # README.md # Resources/Prototypes/Entities/Mobs/Species/reptilian.yml # Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json		2023-10-11 16:56:19 +03:00
..
Commands	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
Events	Make AdminLogsSystem an IoC manager (#8492)	2022-05-28 23:41:17 -07:00
Presets	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Prototypes	Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566)	2023-04-20 20:16:01 +10:00
Rules	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-05 19:37:38 +03:00
GameTicker.cs	Move minds, roles, jobs and objectives to shared (#19679)	2023-08-30 21:46:11 -07:00
GameTicker.CVars.cs	Enrich discord round notifications (#19502)	2023-08-24 19:53:32 -07:00
GameTicker.GamePreset.cs	Move minds, roles, jobs and objectives to shared (#19679)	2023-08-30 21:46:11 -07: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	Allow gamemodes to specify custom map pools (#18429)	2023-08-01 16:11:50 -05: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 'upstream/master' into upstream-sync	2023-10-11 16:56:19 +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-09-13 16:51:52 +03:00
GameTicker.Spawning.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-05 00:12:02 +03:00
GameTicker.StatusShell.cs	Hotfix join queue resolve in status shell	2023-10-03 15:50:05 +03:00
ManifestEntry.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00