From f22f5747cd0553b49df1ece5daa5efda96afe573 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 13 Jul 2016 21:44:50 -0700 Subject: [PATCH] Deletes Parole Implants Also deletes parole kit from warden's locker, as it is pointless now. --- code/game/objects/items/control_wand.dm | 2 +- .../items/weapons/implants/implant_chem.dm | 28 ------------------- .../items/weapons/implants/implanter.dm | 7 ----- .../objects/items/weapons/storage/boxes.dm | 14 ---------- .../crates_lockers/closets/secure/security.dm | 1 - 5 files changed, 1 insertion(+), 51 deletions(-) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index c92d6468a7d..178f56912c1 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -110,4 +110,4 @@ #undef WAND_OPEN #undef WAND_BOLT -#undef WAND_EMERGENCY \ No newline at end of file +#undef WAND_EMERGENCY diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm index f441f42658f..a68a617f2aa 100644 --- a/code/game/objects/items/weapons/implants/implant_chem.dm +++ b/code/game/objects/items/weapons/implants/implant_chem.dm @@ -59,31 +59,3 @@ /obj/item/weapon/implantcase/chem/New() imp = new /obj/item/weapon/implant/chem(src) ..() - - - -/obj/item/weapon/implant/chem/parole - name = "parole implant" - -/obj/item/weapon/implant/chem/parole/get_data() - var/dat = {"Implant Specifications:
- Name: Robust Corp MJ-421 Prisoner Management Implant
- Life: Deactivates upon death but remains within the body.
- Important Notes: Due to the system functioning off of nutrients in the implanted subject's body, the subject will suffer from an increased appetite.
-
- Implant Details:
- Function: Contains a small capsule filled with sedative. Upon receiving a specially encoded signal, sedates its host.
- Special Features: - Integrity: Implant will last so long as the subject is alive."} - return dat - -/obj/item/weapon/implant/chem/parole/New() - ..() - reagents.add_reagent("ether",50) - -/obj/item/weapon/implanter/parole - name = "implanter (Chem-Ether)" - -/obj/item/weapon/implanter/parole/New() - imp = new /obj/item/weapon/implant/chem/parole(src) - ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 32f21e1240b..6d5efda18b7 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -58,13 +58,6 @@ update_icon() -/obj/item/weapon/implanter/tracking - name = "implanter (tracking)" - -/obj/item/weapon/implanter/tracking/New() - imp = new /obj/item/weapon/implant/tracking(src) - ..() - /obj/item/weapon/implanter/adrenalin name = "implanter (adrenalin)" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 67fd01130c3..7bfef0b5d06 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -232,20 +232,6 @@ new /obj/item/weapon/implanter(src) new /obj/item/weapon/implantpad(src) -/obj/item/weapon/storage/box/parole - name = "parole kit" - desc = "Box of stuff used to manage parolees." - icon_state = "implant" - - New() - ..() - new /obj/item/weapon/implanter/parole(src) - new /obj/item/weapon/implanter/parole(src) - new /obj/item/weapon/implanter/parole(src) - new /obj/item/weapon/implanter/tracking(src) - new /obj/item/weapon/implanter/tracking(src) - new /obj/item/weapon/implanter/tracking(src) - /obj/item/weapon/storage/box/exileimp name = "boxed exile implant kit" desc = "Box of exile implants. It has a picture of a clown being booted through the Gateway." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index f474cc9947a..3fdf47dc0c5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -150,7 +150,6 @@ new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/clothing/mask/gas/sechailer/warden(src) new /obj/item/taperoll/police(src) - new /obj/item/weapon/storage/box/parole(src) new /obj/item/weapon/storage/box/zipties(src) new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/reagent_containers/spray/pepper(src)