Fixes Borgs and Syndicats getting hurt by glass shards and other things + honkbot slipping 2 (#31011)

* Lets do this again * I noticed this way to late
2024-09-10 21:12:08 -05:00
parent 4f7d3318b9
commit 14d5bbb8cb
15 changed files with 30 additions and 47 deletions
--- a/Content.Shared/StepTrigger/Components/ClothingRequiredStepTriggerComponent.cs
+++ b/Content.Shared/StepTrigger/Components/ClothingRequiredStepTriggerComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.StepTrigger.Components;

 /// <summary>
-/// This is used for marking step trigger events that require the user to wear shoes, such as for glass shards.
+/// This is used for marking step trigger events that require the user to wear shoes or have protection of some sort, such as for glass shards.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class ClothingRequiredStepTriggerComponent : Component;
+public sealed partial class PreventableStepTriggerComponent : Component;
--- a/Content.Shared/StepTrigger/Components/ClothingRequiredStepTriggerImmuneComponent.cs
+++ b/Content.Shared/StepTrigger/Components/ClothingRequiredStepTriggerImmuneComponent.cs
@@ -5,11 +5,11 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.StepTrigger.Components;

 /// <summary>
-/// This is used for cancelling step trigger events if the user is wearing clothing in a valid slot.
+/// This is used for cancelling preventable step trigger events if the user is wearing clothing in a valid slot or if the user itself has the component.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 [Access(typeof(StepTriggerImmuneSystem))]
-public sealed partial class ClothingRequiredStepTriggerImmuneComponent : Component, IClothingSlots
+public sealed partial class ProtectedFromStepTriggersComponent : Component, IClothingSlots
 {
    [DataField]
    public SlotFlags Slots { get; set; } = SlotFlags.FEET;
--- a/Content.Shared/StepTrigger/Components/StepTriggerImmuneComponent.cs
+++ b/Content.Shared/StepTrigger/Components/StepTriggerImmuneComponent.cs
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.StepTrigger.Components;
-
-/// <summary>
-/// Grants the attached entity to step triggers.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class StepTriggerImmuneComponent : Component;
--- a/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Inventory;
 using Content.Shared.StepTrigger.Components;
-using Content.Shared.Tag;

 namespace Content.Shared.StepTrigger.Systems;

@@ -12,25 +11,19 @@ public sealed class StepTriggerImmuneSystem : EntitySystem
    /// <inheritdoc/>
    public override void Initialize()
    {
-        SubscribeLocalEvent<StepTriggerImmuneComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
-        SubscribeLocalEvent<ClothingRequiredStepTriggerComponent, StepTriggerAttemptEvent>(OnStepTriggerClothingAttempt);
-        SubscribeLocalEvent<ClothingRequiredStepTriggerComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<PreventableStepTriggerComponent, StepTriggerAttemptEvent>(OnStepTriggerClothingAttempt);
+        SubscribeLocalEvent<PreventableStepTriggerComponent, ExaminedEvent>(OnExamined);
    }

-    private void OnStepTriggerAttempt(Entity<StepTriggerImmuneComponent> ent, ref StepTriggerAttemptEvent args)
+    private void OnStepTriggerClothingAttempt(Entity<PreventableStepTriggerComponent> ent, ref StepTriggerAttemptEvent args)
    {
-        args.Cancelled = true;
-    }
-
-    private void OnStepTriggerClothingAttempt(EntityUid uid, ClothingRequiredStepTriggerComponent component, ref StepTriggerAttemptEvent args)
-    {
-        if (_inventory.TryGetInventoryEntity<ClothingRequiredStepTriggerImmuneComponent>(args.Tripper, out _))
+        if (HasComp<ProtectedFromStepTriggersComponent>(args.Tripper) || _inventory.TryGetInventoryEntity<ProtectedFromStepTriggersComponent>(args.Tripper, out _))
        {
            args.Cancelled = true;
        }
    }

-    private void OnExamined(EntityUid uid, ClothingRequiredStepTriggerComponent component, ExaminedEvent args)
+    private void OnExamined(EntityUid uid, PreventableStepTriggerComponent component, ExaminedEvent args)
    {
        args.PushMarkup(Loc.GetString("clothing-required-step-trigger-examine"));
    }
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -210,7 +210,7 @@
        Radiation: 0
        Caustic: 0.75
  - type: GroupExamine
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

 - type: entity
@@ -308,7 +308,7 @@
  - type: ExplosionResistance
    damageCoefficient: 0.5
  - type: GroupExamine
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

 - type: entity
@@ -336,7 +336,7 @@
  - type: Construction
    graph: BoneArmor
    node: armor
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

 - type: entity
@@ -357,6 +357,6 @@
        Piercing: 0.6
        Heat: 0.5
  - type: GroupExamine
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -135,7 +135,7 @@
    tags:
    - Hardsuit
    - WhitelistChameleon
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET
  - type: DamageOnInteractProtection
    damageProtection:
@@ -161,7 +161,7 @@
  - type: HeldSpeedModifier
  - type: Item
    size: Huge
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET
  - type: DamageOnInteractProtection
    damageProtection:
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -25,7 +25,7 @@
    tags:
    - Hardsuit
    - WhitelistChameleon
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

 - type: entity
@@ -68,7 +68,7 @@
    sprintModifier: 0.7
  - type: HeldSpeedModifier
  - type: GroupExamine
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

 - type: entity
@@ -100,7 +100,7 @@
    sprintModifier: 0.8
  - type: HeldSpeedModifier
  - type: GroupExamine
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

 - type: entity
@@ -125,7 +125,7 @@
  - type: ContainerContainer
    containers:
      toggleable-clothing: !type:ContainerSlot {}
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

 - type: entity
@@ -198,7 +198,7 @@
    sprite: Clothing/OuterClothing/Suits/chicken.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Suits/chicken.rsi
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

 - type: entity
@@ -236,7 +236,7 @@
  - type: ContainerContainer
    containers:
      toggleable-clothing: !type:ContainerSlot {}
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

 - type: entity
@@ -259,7 +259,7 @@
  - type: Construction
    graph: ClothingOuterSuitIan
    node: suit
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET

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

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -233,7 +233,7 @@
    guides:
    - Cyborgs
    - Robotics
-  - type: StepTriggerImmune
+  - type: ProtectedFromStepTriggers
  - type: DamageOnInteractProtection
    damageProtection:
      flatReductions:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2927,7 +2927,7 @@
      - DoorBumpOpener
  - type: MovementAlwaysTouching
  - type: PressureImmunity
-  - type: StepTriggerImmune
+  - type: ProtectedFromStepTriggers
  - type: Insulated
  - type: InteractionPopup
    successChance: 0.7
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -72,8 +72,7 @@
  - type: InputMover
  - type: MobMover
  - type: ZombieImmune
-  - type: ClothingRequiredStepTriggerImmune
-    slots: All
+  - type: ProtectedFromStepTriggers

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -108,7 +108,7 @@
  - type: TypingIndicator
    proto: robot
  - type: ZombieImmune
-  - type: StepTriggerImmune
+  - type: ProtectedFromStepTriggers
  - type: NoSlip
  - type: Insulated

--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -15,7 +15,7 @@
      requiredTriggeredSpeed: 2
    - type: Mousetrap
    - type: TriggerOnStepTrigger
-    - type: ClothingRequiredStepTrigger
+    - type: PreventableStepTrigger
    - 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: ClothingRequiredStepTrigger
+  - type: PreventableStepTrigger
  - 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
@@ -65,7 +65,7 @@
        acts: [ "Destruction" ]
  - type: StepTrigger
    intersectRatio: 0.2
-  - type: ClothingRequiredStepTrigger
+  - type: PreventableStepTrigger
  - type: Slippery
    slipSound:
      path: /Audio/Effects/glass_step.ogg