Morb0 259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/CharacterSetupGui.xaml # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Resources/Prototypes/Catalog/Fills/Boxes/general.yml # Resources/Prototypes/Entities/Clothing/Back/satchel.yml # Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Textures/Objects/Storage/boxes.rsi/meta.json		2023-11-04 12:16:53 +03:00
..
IncurableZombieComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
PendingZombieComponent.cs	Action container rejig (#20260)	2023-09-23 18:49:39 +10:00
ZombieImmuneComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
ZombieSystem.cs	Moves cloning comp & cloning event to shared (#21253)	2023-10-28 09:47:42 -04:00
ZombieSystem.Transform.cs	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
ZombifyOnDeathComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00