diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 63ea974c47..cdd1a0b0bf 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -88,7 +88,7 @@ coefficients: Blunt: 0.8 Slash: 0.8 - Piercing: 0.95 + Piercing: 0.9 # WD #Bombsuit Helmet - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 5eca9c6b41..ae2efa650b 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -61,7 +61,7 @@ coefficients: Blunt: 0.4 Slash: 0.4 - Piercing: 0.9 + Piercing: 0.7 # WD Heat: 0.9 Caustic: 0.9 - type: ExplosionResistance diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 991fa93c5c..50aff47b94 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -105,7 +105,7 @@ modifiers: coefficients: Heat: 0.90 - Radiation: 0.001 + Radiation: 0.01 # WD - type: Clothing sprite: Clothing/OuterClothing/Suits/rad.rsi - type: GroupExamine diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 3648e41db6..9c5e6c360f 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -70,6 +70,32 @@ id: RiotShield description: A large tower shield. Good for controlling crowds. components: + - type: Sprite # WD start + state: riot-icon + - type: Item + heldPrefix: riot + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.5 + activeBlockModifier: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.4 + flatReductions: + Blunt: 1.5 + Piercing: 1.5 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 160 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] - type: StaticPrice price: 90 @@ -92,8 +118,16 @@ Heat: 0.7 flatReductions: Heat: 2 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 120 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] - type: Reflect - reflectProb: 0.25 + reflectProb: 0.5 reflects: - Energy @@ -111,14 +145,24 @@ passiveBlockModifier: coefficients: Blunt: 0.8 + Slash: 0.8 Piercing: 0.8 activeBlockModifier: coefficients: Blunt: 0.7 + Slash: 0.7 Piercing: 0.7 flatReductions: Blunt: 1.5 Piercing: 1.5 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 220 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] # WD end #Changeling shield - type: entity