From: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date: Wed, 21 Aug 2024 17:56:56 +0000 (-0700)
Subject: Remove the shock collar. (#31229)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0f6808e16a7b7beb3a9a24309b27bb1426c72c17;p=space-station-14.git

Remove the shock collar. (#31229)

* Remove the shock collar.

* add migration
---

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 265ab7d86d..56683c7411 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -20,7 +20,7 @@
       - id: ClothingOuterHardsuitWarden
       - id: HoloprojectorSecurity
       - id: BookSpaceLaw
-      - id: ClothingNeckShockCollar
+      - id: ClothingBackpackElectropack
         amount: 2
       - id: RemoteSignaller
         amount: 2
@@ -46,7 +46,7 @@
       - id: DoorRemoteArmory
       - id: HoloprojectorSecurity
       - id: BookSpaceLaw
-      - id: ClothingNeckShockCollar
+      - id: ClothingBackpackElectropack
         amount: 2
       - id: RemoteSignaller
         amount: 2
diff --git a/Resources/Prototypes/Entities/Objects/Devices/shock_collar.yml b/Resources/Prototypes/Entities/Objects/Devices/shock_collar.yml
deleted file mode 100644
index 22f2d097fc..0000000000
--- a/Resources/Prototypes/Entities/Objects/Devices/shock_collar.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-- 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
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index b6d727f880..481ca0f93d 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -73,7 +73,6 @@
     ForensicScannerStealObjective: 1                    #sec
     FlippoEngravedLighterStealObjective: 0.5
     ClothingHeadHatWardenStealObjective: 1
-    ClothingNeckShockCollarStealObjective: 1
     ClothingOuterHardsuitVoidParamedStealObjective: 1   #med
     MedicalTechFabCircuitboardStealObjective: 1
     ClothingHeadsetAltMedicalStealObjective: 1
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index a912a6ad8e..5b57a95503 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -270,13 +270,6 @@
     sprite: Clothing/Neck/Medals/clownmedal.rsi
     state: icon
 
-- type: stealTargetGroup
-  id: ClothingNeckShockCollar
-  name: shock collar
-  sprite:
-    sprite: Clothing/Neck/Misc/shock_collar.rsi
-    state: icon
-
 #Thief structures
 
 - type: stealTargetGroup
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index c401ab4325..df34d09c24 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -316,17 +316,6 @@
   - type: Objective
     difficulty: 1
 
-- type: entity
-  parent: BaseThiefStealObjective
-  id: ClothingNeckShockCollarStealObjective
-  components:
-  - type: NotJobRequirement
-    job: Warden
-  - type: StealCondition
-    stealGroup: ClothingNeckShockCollar
-  - type: Objective
-    difficulty: 1
-
 # Structures
 
 - type: entity
diff --git a/Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/equipped-NECK.png
deleted file mode 100644
index ffca3249f1..0000000000
Binary files a/Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/icon.png b/Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/icon.png
deleted file mode 100644
index f8e0a9cb8e..0000000000
Binary files a/Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/meta.json
deleted file mode 100644
index 3119a51a15..0000000000
--- a/Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "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
index 9ce3d71156..55d91a0e68 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -403,3 +403,6 @@ FoodMeatSnakeKebab: FoodKebabSkewer
 FoodMeatHawaiianKebab: FoodKebabSkewer
 FoodMeatKebab: FoodKebabSkewer
 FoodMeatFiestaKebab: FoodKebabSkewer
+
+# 2024-08-19
+ClothingNeckShockCollar: ClothingBackpackElectropack