From 0f6808e16a7b7beb3a9a24309b27bb1426c72c17 Mon Sep 17 00:00:00 2001 From: LankLTE <135308300+LankLTE@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:56:56 -0700 Subject: [PATCH] Remove the shock collar. (#31229) * Remove the shock collar. * add migration --- .../Catalog/Fills/Lockers/security.yml | 4 +- .../Entities/Objects/Devices/shock_collar.yml | 36 ------------------ .../Prototypes/Objectives/objectiveGroups.yml | 1 - .../Objectives/stealTargetGroups.yml | 7 ---- Resources/Prototypes/Objectives/thief.yml | 11 ------ .../Misc/shock_collar.rsi/equipped-NECK.png | Bin 465 -> 0 bytes .../Neck/Misc/shock_collar.rsi/icon.png | Bin 800 -> 0 bytes .../Neck/Misc/shock_collar.rsi/meta.json | 19 --------- Resources/migration.yml | 3 ++ 9 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 Resources/Prototypes/Entities/Objects/Devices/shock_collar.yml delete mode 100644 Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/equipped-NECK.png delete mode 100644 Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/Neck/Misc/shock_collar.rsi/meta.json 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 ffca3249f13d35ed449938c85fc67b5c0e740977..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 465 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z3q4&NLn`LH zy=9o!Y#_q+z&=!8U}f>7IE~{c9L(|#xQUx7RlYeSI6=TYA>q`4mg@^R+WKVgEHvDD zY1Jdig*yM$T{$Fw+Ugkn+B?BCg0+=pp`3Mb4eyNykE#G-Cus!bxue(n@Yoc z4I3WjWdGlvw}nl!G@HG)#Czi5e;wPubJ#ZUr)xZVC|E1wer&E}gqH-H+b?@{VAz1c uqKo2e_qlSq7pxNo#spt#glC$sFM}44%>l$9a4C2)i1Kvxb6Mw<&;$VGYr@(9 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 f8e0a9cb8e4fab549dd7fe5de64098076d68774a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 800 zcmV+*1K<3KP)Px%z)3_wR9J=Wls{u6bN2Al~8x^Rx*@e4^4vUpo=M?7D666cDN4F2`Tzxr=ifn-y+?+cklb& zy>}1hm}8E=fUehM()yp1ce}?@k=|V27WZZ$^#2!&TL@tWe1tG57PmsacNU-sb-gAf zNJR#a$*iI4HJQn*;kQeW{&Uj=+@D6S0-w30lZoy5q*BY?dTHq)J4TC_dd(A5EN%fv z!)PtU@k}iNz>d-4%e#G#Ow-mwU$v)hWL889(Dj-ejV=+w^aA@c7sAA{#(}TGWMX?a zC4|Y2(Ml{uNPw=_WTmp}1=F;3J~rQwt2eN$F_txEI6MOgd~@{%2k!N&bCZe96;P?{ z#)^pT0e`lB3Z5DwQU@5akzyB48o_7Ad zMIU*mbC}q`v2#F)c;>Djr&k#c&(wSmA)Q{O+x>{9t@GWreQ?R+I1&XY5jnR99{2`Q zyS~W%#HwsLSFjc^-XkUxbiy*P$J^?Zc9GL9RCIW0O(JZ+iLn{RsaA14rN$LW=%~1 eDgXcg2mk;800000(o>TF0000