Morb0 29a7082223 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/Names/military.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Prototypes/Maps/kettle.yml # Resources/ServerInfo/Guidebook/Service/Botany.xml		2023-12-11 21:56:43 +03:00
..
IncurableZombieComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -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	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	2023-12-11 21:56:43 +03:00
ZombifyOnDeathComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00