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
..
IncurableZombieComponent.cs	Prevent non-inital infected from getting the succumb to zombie action (#27820)	2024-05-09 17:45:23 -04:00
InitialInfectedExemptComponent.cs	Resolve all non-obsoleting warnings in content (#27934)	2024-05-11 20:13:58 -07:00
NonSpreaderZombieComponent.cs	Tiny mobs can no longer pass on the zombie disease (#21676)	2023-11-19 14:28:05 -08:00
PendingZombieComponent.cs	Prevent non-inital infected from getting the succumb to zombie action (#27820)	2024-05-09 17:45:23 -04:00
ZombieAccentOverrideComponent.cs	Cooler zombie moths (#21744)	2023-12-10 19:17:55 -08:00
ZombieImmuneComponent.cs	Tiny mobs can no longer pass on the zombie disease (#21676)	2023-11-19 14:28:05 -08:00
ZombieSystem.cs	Prevent non-inital infected from getting the succumb to zombie action (#27820)	2024-05-09 17:45:23 -04:00
ZombieSystem.Transform.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03:00
ZombifyOnDeathComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00