Cherry Pick Haloperidol and Potassium Iodide (#1410)

# Description Title, doing this to make a single test pass. --------- Co-authored-by: slarticodefast <[email protected]>
Simple-Station · Jan 2, 2025 · 5767be1 · 5767be1
1 parent f411310
commit 5767be1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -378,3 +378,9 @@
     Blunt: 0.9
     Slash: 0.9
     Piercing: 0.9
+
+# protects against radiation
+- type: damageModifierSet
+  id: PotassiumIodide
+  coefficients:
+    Radiation: 0.1
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -25,6 +25,7 @@
     - ForcedSleep
     - TemporaryBlindness
     - Pacified
+    - Flashed
     - RadiationProtection
     - Drowsiness
   - type: Buckle
@@ -92,17 +93,18 @@
     baseDecayRate: 0.04
   - type: StatusEffects
     allowed:
-      - Stun
-      - KnockedDown
-      - SlowedDown
-      - Stutter
-      - Electrocution
-      - ForcedSleep
-      - TemporaryBlindness
-      - Pacified
-      - StaminaModifier
-      - RadiationProtection
-      - Drowsiness
+    - Stun
+    - KnockedDown
+    - SlowedDown
+    - Stutter
+    - Electrocution
+    - ForcedSleep
+    - TemporaryBlindness
+    - Pacified
+    - StaminaModifier
+    - Flashed
+    - RadiationProtection
+    - Drowsiness
   - type: Bloodstream
     bloodMaxVolume: 150
   - type: MobPrice

diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -142,6 +142,7 @@
     - TemporaryBlindness
     - Pacified
     - StaminaModifier
+    - Flashed
     - RadiationProtection
     - Drowsiness
     - PsionicsDisabled

diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
@@ -172,7 +172,7 @@
         - !type:ReagentThreshold
           min: 15
       - !type:Drunk
-      
+
 - type: reagent
   id: Cryoxadone
   name: reagent-name-cryoxadone
@@ -240,7 +240,7 @@
         damage:
           types:
             Heat: -2
-            Shock: -2 
+            Shock: -2
             Cold: -2 # Was 1.5, Buffed due to limb damage changes
       - !type:HealthChange
         conditions:
@@ -1395,3 +1395,4 @@
   plantMetabolism: #Heals plants a little with the holy power within it.
   - !type:PlantAdjustHealth
     amount: 0.1
+
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
@@ -63,6 +63,9 @@
 - type: statusEffect
   id: PhaseShifted
 
+- type: statusEffect
+  id: Flashed
+
 - type: statusEffect
   id: RadiationProtection