diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 694ec4fbea1..3cc2bb4fd7d 100644 --- 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 index bf7087fa03e..dae42c36190 100644 --- 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 index b294484ce45..f740b89f424 100644 --- 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 index 445a5344104..3a7eade1d8c 100644 --- 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 index 2bfa7ef7a0f..13036fda192 100644 --- 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