Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/GameRules/midround.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml # Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png		2024-04-26 11:19:50 +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	Mega Antag Refactor (#25786)	2024-04-25 11:31:45 +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	Mega Antag Refactor (#25786)	2024-04-25 11:31:45 +10: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