Morb0 32a8d1a21e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Server/Power/Generator/GeneratorSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png		2024-02-03 03:38:29 +03:00
..
IncurableZombieComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
InitialInfectedExemptComponent.cs	ERT, DeathSquad and Central Command Officer Inital Infected immunity (#23601)	2024-01-26 21:56:09 -05:00
NonSpreaderZombieComponent.cs	Tiny mobs can no longer pass on the zombie disease (#21676)	2023-11-19 14:28:05 -08:00
PendingZombieComponent.cs	Action container rejig (#20260)	2023-09-23 18:49:39 +10: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	Inventory slot enumerator rejig (#21788)	2023-12-08 08:20:51 +11:00
ZombieSystem.Transform.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-03 03:38:29 +03:00
ZombifyOnDeathComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00