Morb0 c44d509701 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png		2024-03-29 11:43:30 +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	Buff Zombie Infection (#25954)	2024-03-12 14:44:08 -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	Reduced Warning Count By 130 For Full Rebuilds (#26518)	2024-03-29 16:28:16 +11:00
ZombieSystem.Transform.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-21 01:15:13 +03:00
ZombifyOnDeathComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00