]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Hardsuits, EVA suits, Firesuits, and others now protect your feet from Glass Shards...
authorPlykiya <58439124+Plykiya@users.noreply.github.com>
Sun, 28 Apr 2024 07:11:46 +0000 (00:11 -0700)
committerGitHub <noreply@github.com>
Sun, 28 Apr 2024 07:11:46 +0000 (17:11 +1000)
commit0efcd30ac6d58fe0a24565c3ddd102277997fbba
tree8b7e935ee40fe26345c255eb13c878f259f1f13d
parentdb200faf11fc6f3ed3572394c51cc8d011fcb76f
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>
22 files changed:
Content.Shared/Inventory/InventorySystem.Relay.cs
Content.Shared/Inventory/InventorySystem.Slots.cs
Content.Shared/Inventory/SlotFlags.cs
Content.Shared/StepTrigger/Components/ClothingRequiredStepTriggerComponent.cs [new file with mode: 0644]
Content.Shared/StepTrigger/Components/ClothingRequiredStepTriggerImmuneComponent.cs [new file with mode: 0644]
Content.Shared/StepTrigger/Components/ShoesRequiredStepTriggerComponent.cs [deleted file]
Content.Shared/StepTrigger/Components/StepTriggerImmuneComponent.cs [new file with mode: 0644]
Content.Shared/StepTrigger/Systems/ShoesRequiredStepTriggerSystem.cs [deleted file]
Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs [new file with mode: 0644]
Content.Shared/Weapons/Reflect/ReflectSystem.cs
Resources/Locale/en-US/step-trigger/shoes-required.ftl
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
Resources/Prototypes/Entities/Objects/Fun/dice.yml
Resources/Prototypes/Entities/Objects/Materials/shards.yml
Resources/Prototypes/tags.yml