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>
This commit is contained in:
to4no_fix
2024-08-15 17:30:39 +03:00
committed by GitHub
parent 02eed07e21
commit 6567fa36e4
29 changed files with 326 additions and 21 deletions

View File

@@ -314,6 +314,29 @@
- type: Unremoveable
deleteOnDrop: false
- type: entity
parent: ClothingBackpack
id: ClothingBackpackElectropack
name: electropack
suffix: SelfUnremovable
description: Shocks on the signal. It is used to keep a particularly dangerous criminal under control.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/electropack.rsi
state: icon
- type: Clothing
stripDelay: 10
equipDelay: 5 # to avoid accidentally falling into the trap associated with SelfUnremovableClothing
- type: SelfUnremovableClothing
- type: ShockOnTrigger
damage: 5
duration: 3
cooldown: 4
- type: TriggerOnSignal
- type: DeviceLinkSink
ports:
- Trigger
# Debug
- type: entity
parent: ClothingBackpack

View File

@@ -0,0 +1,36 @@
- type: entity
parent: Clothing
id: ClothingNeckShockCollar
name: shock collar
suffix: SelfUnremovable
description: An electric collar that shocks on the signal.
components:
- type: Item
size: Small
- type: Sprite
sprite: Clothing/Neck/Misc/shock_collar.rsi
state: icon
- type: Clothing
sprite: Clothing/Neck/Misc/shock_collar.rsi
stripDelay: 10
equipDelay: 5 # to avoid accidentally falling into the trap associated with SelfUnremovableClothing
quickEquip: true
slots:
- neck
- type: SelfUnremovableClothing
- type: ShockOnTrigger
damage: 5
duration: 3
cooldown: 4
- type: TriggerOnSignal
- type: DeviceLinkSink
ports:
- Trigger
- type: GuideHelp
guides:
- Security
- type: StealTarget
stealGroup: ClothingNeckShockCollar
- type: Tag
tags:
- WhitelistChameleon

View File

@@ -16,7 +16,7 @@
mask:
- MachineMask
layer:
- MachineLayer
- MachineLayer
- type: Lathe
- type: MaterialStorage
- type: Destructible
@@ -808,6 +808,7 @@
- WeaponLaserCannon
- WeaponLaserCarbine
- WeaponXrayCannon
- ClothingBackpackElectropack
- type: MaterialStorage
whitelist:
tags: