Morb0 e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/aspid.yml # Resources/Prototypes/Maps/barratry.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/kettle.yml # Resources/Prototypes/Maps/origin.yml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json		2023-09-13 16:51:52 +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-09-13 16:51:52 +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	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10: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-08-31 20:55:00 +03:00
GameTicker.Replays.cs	Use full file path for temp replays (#19002)	2023-09-07 13:56:33 +10: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	Revert "Revert "Server join queue (#583)"" (#602)	2022-11-29 06:41:12 -08:00
ManifestEntry.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00