From 1b429cd8b693da467b5822e7709c8e7d973f45ca Mon Sep 17 00:00:00 2001 From: SethLafuente <84478872+SethLafuente@users.noreply.github.com> Date: Fri, 11 Jun 2021 16:53:51 -0700 Subject: [PATCH] Made walls and windows stronger (#4175) * Made plasma grindable * Removed grindable paper :( * Fixed tag being on the wrong item * Made reinforced and plasma windows stronger and made walls and windows inmmune to punch damage * Removed accidental plasma grindability sorry * Fixed walls being immune to all blunt damage * fixed windows being immune to piercing and slash damage * changed plasma window resistance Co-authored-by: Seth Lafuente --- .../Prototypes/Damage/resistance_sets.yml | 29 ++++++++++++++++++- .../Entities/Constructible/Walls/windows.yml | 10 +++---- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Damage/resistance_sets.yml b/Resources/Prototypes/Damage/resistance_sets.yml index 865a9ff8b6..b2ac9ac1aa 100644 --- a/Resources/Prototypes/Damage/resistance_sets.yml +++ b/Resources/Prototypes/Damage/resistance_sets.yml @@ -67,7 +67,7 @@ Bloodloss: 0 Cellular: 0 flatReductions: - Blunt: 0 + Blunt: 5 Slash: 0 Piercing: 0 Heat: 0 @@ -105,3 +105,30 @@ Asphyxiation: 0 Bloodloss: 0 Cellular: 0 + +- type: resistanceSet + id: glassResistances + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.5 + Heat: 0 + Shock: 0 + Cold: 0 + Poison: 0 + Radiation: 0 + Asphyxiation: 0 + Bloodloss: 0 + Cellular: 0 + flatReductions: + Blunt: 5 + Slash: 0 + Piercing: 0 + Heat: 0 + Shock: 0 + Cold: 0 + Poison: 0 + Radiation: 0 + Asphyxiation: 0 + Bloodloss: 0 + Cellular: 0 diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml index 228b98ff6e..fcaf1401dc 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml @@ -30,7 +30,7 @@ mask: - VaultImpassable - type: Damageable - resistances: metallicResistances + resistances: glassResistances - type: Repairable - type: Destructible thresholds: @@ -74,7 +74,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 75 + damage: 150 behaviors: - !type:PlaySoundCollectionBehavior soundCollection: GlassBreak @@ -102,12 +102,12 @@ - type: Icon sprite: Constructible/Structures/Windows/plasma_window.rsi - type: Damageable - resistances: metallicResistances + resistances: glassResistances - type: Destructible thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 200 behaviors: - !type:PlaySoundCollectionBehavior soundCollection: GlassBreak @@ -118,7 +118,7 @@ max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] - resistances: metallicResistances + resistances: glassResistances - type: Window base: pwindow - type: Construction