Return back shock collar

space-exodus · Sep 8, 2024 · 371c5d7 · 371c5d7
1 parent 2ed0400
commit 371c5d7
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 3 deletions.
diff --git a/...entities/objects/devices/shock_collar.ftl → ...entities/objects/devices/shock_collar.ftl b/...entities/objects/devices/shock_collar.ftl → ...entities/objects/devices/shock_collar.ftl
@@ -1,3 +1,3 @@
-ent-ClothingNeckShockCollar = шоковый ошейник
+ent-ClothingNeckShockCollar = электрический ошейник
     .desc = Электрический ошейник, который бьёт током по сигналу.
     .suffix = СамостоятельноНеснимаемый
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -20,6 +20,10 @@
       - id: ClothingOuterHardsuitWarden
       - id: HoloprojectorSecurity
       - id: BookSpaceLaw
+      # Exodus-ShockCollar-Start
+      - id: ClothingNeckShockCollar
+        amount: 2
+      # Exodus-ShockCollar-End
       - id: ClothingBackpackElectropack
         amount: 2
       - id: RemoteSignaller
@@ -48,6 +52,10 @@
       - id: DoorRemoteArmory
       - id: HoloprojectorSecurity
       - id: BookSpaceLaw
+      # Exodus-ShockCollar-Start
+      - id: ClothingNeckShockCollar
+        amount: 2
+      # Exodus-ShockCollar-End
       - id: ClothingBackpackElectropack
         amount: 2
       - id: RemoteSignaller

diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -74,6 +74,7 @@
     ForensicScannerStealObjective: 1                    #sec
     FlippoEngravedLighterStealObjective: 0.5
     ClothingHeadHatWardenStealObjective: 1
+    ClothingNeckShockCollarStealObjective: 1 # Exodus-ShockCollar
     ClothingOuterHardsuitVoidParamedStealObjective: 1   #med
     MedicalTechFabCircuitboardStealObjective: 1
     ClothingHeadsetAltMedicalStealObjective: 1

diff --git a/Resources/Prototypes/_Exodus/Entities/Objects/Devices/shock_collar.yml b/Resources/Prototypes/_Exodus/Entities/Objects/Devices/shock_collar.yml
@@ -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: Exodus/Clothing/Neck/Misc/shock_collar.rsi
+    state: icon
+  - type: Clothing
+    sprite: Exodus/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
diff --git a/Resources/Prototypes/_Exodus/Objectives/stealTargetGroups.yml b/Resources/Prototypes/_Exodus/Objectives/stealTargetGroups.yml
@@ -0,0 +1,6 @@
+- type: stealTargetGroup
+  id: ClothingNeckShockCollar
+  name: shock collar
+  sprite:
+    sprite: Clothing/Neck/Misc/shock_collar.rsi
+    state: icon
diff --git a/Resources/Prototypes/_Exodus/Objectives/thief.yml b/Resources/Prototypes/_Exodus/Objectives/thief.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: BaseThiefStealObjective
+  id: ClothingNeckShockCollarStealObjective
+  components:
+  - type: NotJobRequirement
+    job: Warden
+  - type: StealCondition
+    stealGroup: ClothingNeckShockCollar
+  - type: Objective
+    difficulty: 1
diff --git a/Resources/Textures/Exodus/Clothing/Neck/Misc/shock_collar.rsi/equipped-NECK.png b/Resources/Textures/Exodus/Clothing/Neck/Misc/shock_collar.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Exodus/Clothing/Neck/Misc/shock_collar.rsi/icon.png b/Resources/Textures/Exodus/Clothing/Neck/Misc/shock_collar.rsi/icon.png
diff --git a/Resources/Textures/Exodus/Clothing/Neck/Misc/shock_collar.rsi/meta.json b/Resources/Textures/Exodus/Clothing/Neck/Misc/shock_collar.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Drawn by EmoGarbage404 (github) for Space Station 14",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+
+    "states": [
+      {
+        "name": "equipped-NECK",
+        "directions": 4
+      },
+      {
+        "name": "icon"
+      }
+    ]
+  }
diff --git a/Resources/migration.yml b/Resources/migration.yml
@@ -414,8 +414,10 @@ FoodMeatFiestaKebab: FoodKebabSkewer
 #2024-08-14
 ClothingBeltSuspenders: ClothingBeltSuspendersRed
 
-# 2024-08-19
-ClothingNeckShockCollar: ClothingBackpackElectropack
+# Exodus-ShockCollar-Start
+# # 2024-08-19
+# ClothingNeckShockCollar: ClothingBackpackElectropack
+# Exodus-ShockCollar-End
 
 # 2024-08-22
 ComputerShuttleSalvage: null