Hardsuits, EVA suits, Firesuits, and others now protect your feet from Glass Shards (#26764)

* Hardsuits and softsuits count as having shoes for step triggers * Add softsuit tag prototype * Change to suitEVA tag * Get rid of softsuit tag, found suitEVA tag * Full pass of ShoesRequiredStepTriggerImmune * Adds check to outerClothing for ShoesRequiredStepTriggerImmune * return * fuck Dionas * Convert to comp, space dragons immune as well * Merge conflict * Merge conflict * fix leftover tags * empty spaces * turns out the dragon didn't need it * minor optimization * Add access for system, add comp to baseShoes, check slotflags for every slot besides pockets * fix * fuck it we ball --------- Co-authored-by: Plykiya <plykiya@protonmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 00:11:46 -07:00
parent db200faf11
commit 0efcd30ac6
22 changed files with 164 additions and 86 deletions
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -138,6 +138,8 @@
        Radiation: 0
        Caustic: 0.75
  - type: GroupExamine
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  parent: ClothingOuterArmorHeavy
@@ -234,6 +236,8 @@
  - type: ExplosionResistance
    damageCoefficient: 0.5
  - type: GroupExamine
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  parent: ClothingOuterBaseLarge
@@ -260,6 +264,8 @@
  - type: Construction
    graph: BoneArmor
    node: armor
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  parent: ClothingOuterBaseLarge
@@ -279,3 +285,6 @@
        Piercing: 0.6
        Heat: 0.5
  - type: GroupExamine
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET
+
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -134,6 +134,8 @@
    tags:
    - Hardsuit
    - WhitelistChameleon
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  abstract: true
@@ -152,6 +154,8 @@
  - type: HeldSpeedModifier
  - type: Item
    size: Huge
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  parent: ClothingOuterBase
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -25,6 +25,8 @@
    tags:
    - Hardsuit
    - WhitelistChameleon
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  parent: ClothingOuterSuitBomb
@@ -63,6 +65,8 @@
    sprintModifier: 0.7
  - type: HeldSpeedModifier
  - type: GroupExamine
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  parent: ClothingOuterBaseLarge
@@ -70,26 +74,28 @@
  name: atmos fire suit
  description: An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame.
  components:
-    - type: Sprite
-      sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi
-    - type: Clothing
-      sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi
-    - type: PressureProtection
-      highPressureMultiplier: 0.02
-      lowPressureMultiplier: 1000
-    - type: TemperatureProtection
-      coefficient: 0.001
-    - type: Armor
-      modifiers:
-        coefficients:
-          Slash: 0.9
-          Heat: 0.3
-          Cold: 0.2
-    - type: ClothingSpeedModifier
-      walkModifier: 0.8
-      sprintModifier: 0.8
-    - type: HeldSpeedModifier
-    - type: GroupExamine
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.02
+    lowPressureMultiplier: 1000
+  - type: TemperatureProtection
+    coefficient: 0.001
+  - type: Armor
+    modifiers:
+      coefficients:
+        Slash: 0.9
+        Heat: 0.3
+        Cold: 0.2
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+  - type: HeldSpeedModifier
+  - type: GroupExamine
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  parent: [ClothingOuterBaseLarge, GeigerCounterClothing]
@@ -113,7 +119,9 @@
  - type: ContainerContainer
    containers:
      toggleable-clothing: !type:ContainerSlot {}
-      
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET
+
 - type: entity
  parent: ClothingOuterBaseLarge
  id: ClothingOuterSuitSpaceNinja
@@ -164,6 +172,8 @@
    sprite: Clothing/OuterClothing/Suits/chicken.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Suits/chicken.rsi
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  parent: ClothingOuterBase
@@ -189,6 +199,8 @@
  - type: ContainerContainer
    containers:
      toggleable-clothing: !type:ContainerSlot {}
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  parent: ClothingOuterBase
@@ -210,6 +222,8 @@
  - type: Construction
    graph: ClothingOuterSuitIan
    node: suit
+  - type: ClothingRequiredStepTriggerImmune
+    slots: WITHOUT_POCKET

 - type: entity
  parent: ClothingOuterBase
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -23,6 +23,7 @@
    tags:
    - ClothMade
    - WhitelistChameleon
+  - type: ClothingRequiredStepTriggerImmune

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -205,13 +205,13 @@
  - type: StandingState
  - type: Tag
    tags:
-    - ShoesRequiredStepTriggerImmune
    - DoorBumpOpener
    - CanPilot
  - type: Emoting
  - type: GuideHelp
    guides:
      - Cyborgs
+  - type: StepTriggerImmune

 - type: entity
  id: BaseBorgChassisNT
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -44,7 +44,6 @@
  - type: Tag
    tags:
    - DoorBumpOpener
-    - ShoesRequiredStepTriggerImmune
  - type: MobState
    allowedStates:
      - Alive
@@ -73,6 +72,8 @@
  - type: InputMover
  - type: MobMover
  - type: ZombieImmune
+  - type: ClothingRequiredStepTriggerImmune
+    slots: All

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -66,7 +66,6 @@
  - type: Tag
    tags:
    - DoorBumpOpener
-    - ShoesRequiredStepTriggerImmune
  - type: MobState
    allowedStates:
      - Alive
@@ -107,6 +106,7 @@
  - type: TypingIndicator
    proto: robot
  - type: ZombieImmune
+  - type: StepTriggerImmune

 - type: entity
  parent: MobSiliconBase
--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -15,7 +15,7 @@
      requiredTriggeredSpeed: 0
    - type: Mousetrap
    - type: TriggerOnStepTrigger
-    - type: ShoesRequiredStepTrigger
+    - type: ClothingRequiredStepTrigger
    - type: DamageUserOnTrigger
      damage:
        types:
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -121,7 +121,7 @@
  - type: StepTrigger
    intersectRatio: 0.2
  - type: TriggerOnStepTrigger
-  - type: ShoesRequiredStepTrigger
+  - type: ClothingRequiredStepTrigger
  - type: Slippery
    slipSound:
      path: /Audio/Effects/glass_step.ogg
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -63,7 +63,7 @@
        acts: [ "Destruction" ]
  - type: StepTrigger
    intersectRatio: 0.2
-  - type: ShoesRequiredStepTrigger
+  - type: ClothingRequiredStepTrigger
  - type: Slippery
    slipSound:
      path: /Audio/Effects/glass_step.ogg
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1104,9 +1104,6 @@
 - type: Tag
  id: Shiv

- type: Tag
-  id: ShoesRequiredStepTriggerImmune
-
 - type: Tag
  id: Shovel