From a3b0804a5ec029e87dc1e236d11906f0659fa87b Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 28 May 2023 16:06:15 -0400
Subject: [PATCH] re-enable zombies (#16901)

---
 .../Prototypes/Catalog/uplink_catalog.yml     | 38 +++++++++----------
 Resources/Prototypes/GameRules/events.yml     | 20 +++++-----
 Resources/Prototypes/GameRules/roundstart.yml | 12 +++---
 Resources/Prototypes/game_presets.yml         | 28 +++++++-------
 Resources/Prototypes/secret_weights.yml       |  2 +-
 5 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 35a108bb92..596f7ea97a 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -469,25 +469,25 @@
   categories:
   - UplinkBundles
 
-#- type: listing
-#  id: UplinkZombieBundle
-#  name: uplink-zombie-bundle-name
-#  description: uplink-zombie-bundle-desc
-#  icon: { sprite: /Textures/Structures/Wallmounts/signs.rsi, state: bio }
-#  productEntity: ClothingBackpackDuffelZombieBundle
-#  cost:
-#    Telecrystal: 40
-#  categories:
-#  - UplinkBundles
-#  conditions:
-#  - !type:StoreWhitelistCondition
-#    whitelist:
-#      tags:
-#      - NukeOpsUplink
-#  - !type:BuyerWhitelistCondition
-#    blacklist:
-#      components:
-#      - SurplusBundle
+- type: listing
+  id: UplinkZombieBundle
+  name: uplink-zombie-bundle-name
+  description: uplink-zombie-bundle-desc
+  icon: { sprite: /Textures/Structures/Wallmounts/signs.rsi, state: bio }
+  productEntity: ClothingBackpackDuffelZombieBundle
+  cost:
+    Telecrystal: 40
+  categories:
+  - UplinkBundles
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle
 
 - type: listing
   id: UplinkSurplusBundle
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 488ee5b76b..1336d42917 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -277,16 +277,16 @@
         amount: 4
         maxAmount: 8
 
-#- type: entity
-#  id: ZombieOutbreak
-#  parent: BaseGameRule
-#  noSpawn: true
-#  components:
-#  - type: StationEvent
-#    earliestStart: 50
-#    weight: 2.5
-#    duration: 1
-#  - type: ZombieRule
+- type: entity
+  id: ZombieOutbreak
+  parent: BaseGameRule
+  noSpawn: true
+  components:
+  - type: StationEvent
+    earliestStart: 50
+    weight: 2.5
+    duration: 1
+  - type: ZombieRule
 
 - type: entity
   id: LoneOpsSpawn
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index cef23d13e8..1346631af5 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -66,12 +66,12 @@
   components:
   - type: SecretRule
 
-#- type: entity
-#  id: Zombie
-#  parent: BaseGameRule
-#  noSpawn: true
-#  components:
-#  - type: ZombieRule
+- type: entity
+  id: Zombie
+  parent: BaseGameRule
+  noSpawn: true
+  components:
+  - type: ZombieRule
 
 # event schedulers
 - type: entity
diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml
index 7e49f08feb..c732e6c250 100644
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -73,20 +73,20 @@
     - Nukeops
     - BasicStationEventScheduler
 
-#- type: gamePreset
-#  id: Zombie
-#  alias:
-#    - zombie
-#    - zombies
-##    - Zombies
-#    - zz14
-#    - zomber
-#  name: zombie-title
-#  description: zombie-description
-#  showInVote: false
-#  rules:
-#    - Zombie
-#    - BasicStationEventScheduler
+- type: gamePreset
+  id: Zombie
+  alias:
+  - zombie
+  - zombies
+  - Zombies
+  - zz14
+  - zomber
+  name: zombie-title
+  description: zombie-description
+  showInVote: false
+  rules:
+  - Zombie
+  - BasicStationEventScheduler
 
 - type: gamePreset
   id: Pirates
diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml
index b68aea1b68..4c0f5423c6 100644
--- a/Resources/Prototypes/secret_weights.yml
+++ b/Resources/Prototypes/secret_weights.yml
@@ -3,4 +3,4 @@
   weights:
     Nukeops: 0.15
     Traitor: 0.70
-    # Zombie: 0.15
+    Zombie: 0.15