]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Adding shock collar and electropack (#30529)
authorto4no_fix <156101927+chavonadelal@users.noreply.github.com>
Thu, 15 Aug 2024 14:30:39 +0000 (17:30 +0300)
committerGitHub <noreply@github.com>
Thu, 15 Aug 2024 14:30:39 +0000 (10:30 -0400)
commit6567fa36e468ca0b2091a862609ee82b77f3d277
tree4cee7f56e95676f1e6a7f74f7f30a9a4c83e78ad
parent02eed07e21c0dda42cec9f203f59c122f8720978
Adding shock collar and electropack (#30529)

* Adding shock collar with the new ShockOnTrigger

* Cleaning and updating the shock collar

* Add StripDelay datafield to ClothingComponent

* Adding SelfUnremovableClothingComponent

* ShockCollar Update

* Correction of the shock collar

* Correction of the shock collar 2

* Renaming the DamageSpecifier DataField to Damage

* Fixing the damage field in ShockCollar

* Cleaning the ShockCollar

* Renaming ShockCollar to ClothingNeckShockCollar

* Adding ClothingNeckShockCollar as a stealTarget to a thief

* Fixing a typo of the sprite path in ClothingNeckShockCollar

* Cleaning the ShockOnTriggerComponent

* Revision of SelfUnremovableClothing

* Adding a ClothingBackpackElectropack

* Sprite fix

* Code review

* Shock Collar sprite update

* add commit hash

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
29 files changed:
Content.Server/Explosion/Components/ShockOnTriggerComponent.cs [new file with mode: 0644]
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
Content.Server/Strip/StrippableSystem.cs
Content.Shared/Clothing/Components/ClothingComponent.cs
Content.Shared/Clothing/Components/SelfUnremovableClothingComponent.cs [new file with mode: 0644]
Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
Content.Shared/Clothing/EntitySystems/SelfUnremovableClothingSystem.cs [new file with mode: 0644]
Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
Content.Shared/Strip/Components/StrippableComponent.cs
Content.Shared/Strip/SharedStrippableSystem.cs
Resources/Locale/en-US/clothing/components/self-unremovable-clothing-component.ftl [new file with mode: 0644]
Resources/Locale/en-US/research/technologies.ftl
Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Resources/Prototypes/Entities/Objects/Devices/shock_collar.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Objectives/objectiveGroups.yml
Resources/Prototypes/Objectives/stealTargetGroups.yml
Resources/Prototypes/Objectives/thief.yml
Resources/Prototypes/Recipes/Lathes/security.yml
Resources/Prototypes/Research/arsenal.yml
Resources/Textures/Clothing/Back/Backpacks/electropack.rsi/equipped-BACKPACK.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Backpacks/electropack.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Backpacks/electropack.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Backpacks/electropack.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Back/Backpacks/electropack.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/equipped-NECK.png [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/meta.json [new file with mode: 0644]