Morb0 d97a09543d Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Client/IoC/ClientContentIoC.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json		2024-05-15 18:53:52 +03:00
..
Commands	Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936)	2024-05-12 20:34:52 -04:00
Components	Mega Antag Refactor (#25786)	2024-04-25 11:31:45 +10:00
Events
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 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03:00
GameTicker.cs	Mega Antag Refactor (#25786)	2024-04-25 11:31:45 +10:00
GameTicker.CVars.cs	Make the round end sound collection a cvar (#25741)	2024-03-01 21:08:48 +11:00
GameTicker.GamePreset.cs	Fix ghosts getting spawned in nullspace (#27617)	2024-05-11 11:03:40 -04:00
GameTicker.GameRule.cs	Mega Antag Refactor (#25786)	2024-04-25 11:31:45 +10:00
GameTicker.Lobby.cs	fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) (#25530)	2024-03-02 15:40:04 -05:00
GameTicker.LobbyBackground.cs	WebP lobby images (#25184)	2024-02-16 16:55:57 -07:00
GameTicker.Player.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-09 13:28:43 +03:00
GameTicker.Replays.cs	Add server name into the replay final (#25564)	2024-02-25 23:44:05 +01:00
GameTicker.RoundFlow.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-11 01:41:28 +03:00
GameTicker.Spawning.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03:00
GameTicker.StatusShell.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
ManifestEntry.cs