From aa55eed2116361bd6c6976a0e1b2957ec402ae8e Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 24 Jun 2016 01:22:53 -0700 Subject: [PATCH 1/7] Initial checkin - Improved tracking implants - Added parole implant (chem implant with ether) - Added parole jumpsuit + control wand - Added box of the above to warden's locker --- code/game/machinery/computer/prisoner.dm | 16 +++--- code/game/objects/items/control_wand.dm | 31 ++++++++++++ .../items/weapons/implants/implant_chem.dm | 28 +++++++++++ .../items/weapons/implants/implanter.dm | 5 ++ .../objects/items/weapons/storage/boxes.dm | 15 ++++++ .../crates_lockers/closets/secure/security.dm | 1 + code/modules/clothing/clothing.dm | 4 +- code/modules/clothing/under/color.dm | 49 +++++++++++++++++++ 8 files changed, 142 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 7ae15a086f2..6c5f995362b 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -38,13 +38,12 @@ dat += text("Space Law recommends sentences of 100 points per minute they would normally serve in the brig.
") else dat += text("Insert Prisoner ID
") - dat += "
Chemical Implants
" var/turf/Tr = null + dat += "
Chemical Implants
" for(var/obj/item/weapon/implant/chem/C in tracked_implants) Tr = get_turf(C) if((Tr) && (Tr.z != src.z)) continue//Out of range if(!C.implanted) continue - // AUTOFIXED BY fix_string_idiocy.py // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\computer\prisoner.dm:41: dat += "[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: " dat += {"[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: @@ -58,12 +57,17 @@ Tr = get_turf(T) if((Tr) && (Tr.z != src.z)) continue//Out of range if(!T.implanted) continue - var/loc_display = "Unknown" var/mob/living/carbon/M = T.imp_in + var/loc_display = "Unknown" + var/health_display = "OK" + var/total_loss = round(M.getOxyLoss() + M.getToxLoss() + M.getFireLoss() + M.getBruteLoss(), 1) + if (M.stat > UNCONSCIOUS) + health_display = "DEAD" + else if (total_loss) + health_display = "HURT ([total_loss])" if((M.z in config.station_levels) && !istype(M.loc, /turf/space)) - var/turf/mob_loc = get_turf(M) - loc_display = mob_loc.loc - dat += "ID: [T.id] | Location: [loc_display]
" + loc_display = "[get_area(M)]" + dat += "ID: [T.id]
Subject: [M]
Location: [loc_display]
Health: [health_display]
" dat += "(Message Holder) |
" dat += "********************************
" dat += "
Lock Console" diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 178f56912c1..b04ed35fe75 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -111,3 +111,34 @@ #undef WAND_OPEN #undef WAND_BOLT #undef WAND_EMERGENCY + + +/obj/item/weapon/parolesuit_control + icon_state = "gangtool-red" + item_state = "electronic" + icon = 'icons/obj/device.dmi' + name = "parole suit control wand" + desc = "Remotely controls parole jumpsuits." + w_class = 1 + var/emagged = 0 + +/obj/item/weapon/parolesuit_control/attack(mob/living/carbon/human/H, mob/user) + if(!istype(H)) + to_chat(user,"[src] only works on humanoids.") + return + if (!istype(H.w_uniform, /obj/item/clothing/under/color/yellow/parole)) + to_chat(user,"[H] is not wearing a parole jumpsuit.") + return + var/obj/item/clothing/under/color/yellow/parole/J = H.w_uniform + var/obj/item/weapon/card/id/I = H.get_item_by_slot(slot_wear_id) + if (!istype(I)) + to_chat(user,"[H] is not wearing an ID.") + return + if (emagged) + visible_message(J,"[J] emits an error tone.") + else if (J.parole_locked && J.flags & NODROP && I.flags & NODROP) + J.unlock() + else if (!J.parole_locked && !(J.flags & NODROP) && !(I.flags & NODROP)) + J.lock(I) + else + to_chat(user,"[src] emits a loud buzzzing sound! Its display reads: jumpsuit/ID lock desynched.") diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm index 33025b0a41f..989539f4faf 100644 --- a/code/game/objects/items/weapons/implants/implant_chem.dm +++ b/code/game/objects/items/weapons/implants/implant_chem.dm @@ -58,4 +58,32 @@ /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 2d7d3e0a956..5512c841ccd 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -58,7 +58,12 @@ 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 ce1e6aad9bb..86b2271ed92 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -232,6 +232,21 @@ 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/tracking(src) + new /obj/item/weapon/implanter/tracking(src) + new /obj/item/clothing/under/color/yellow/parole(src) + new /obj/item/clothing/under/color/yellow/parole(src) + new /obj/item/weapon/parolesuit_control(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 2b823041950..6055381d89f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -148,6 +148,7 @@ 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) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 8d6595b73ff..7013f1d73b1 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -629,8 +629,10 @@ BLIND // can't see anything //makes sure that the clothing is equipped so that we can't drag it into our hand from miles away. if (!(src.loc == usr)) return - if (!( usr.restrained() ) && !( usr.stat ) && ( over_object )) + if (flags & NODROP) + to_chat(usr, "[src] appears stuck on you!") + return switch(over_object.name) if("r_hand") usr.unEquip(src) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index e0386585f26..a64e6047db8 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -103,6 +103,55 @@ item_color = "yellow" flags = ONESIZEFITSALL + +/obj/item/clothing/under/color/yellow/parole + name = "parole jumpsuit" + desc = "" + var/desc_locked = "A jumpsuit worn by parolees. Its suit sensors are always fully on. It is LOCKED." + var/desc_unlocked = "A jumpsuit worn by parolees. Its suit sensors are always fully on. It is UNLOCKED." + has_sensor = 2 + sensor_mode = 3 + var/parole_locked = 0 + var/emagged = 0 + var/obj/item/weapon/card/id/parole_id = null + var/mob/living/carbon/human/worn_by = null + +/obj/item/clothing/under/color/yellow/parole/New() + ..() + desc = desc_unlocked + +/obj/item/clothing/under/color/yellow/parole/emag_act(user as mob) + if(parole_locked && !emagged) + to_chat(user, "\red You overload the suit's locking mechanism.") + emagged = 1 + unlock() + +/obj/item/clothing/under/color/yellow/parole/emp_act(var/severity) + if(parole_locked && !emagged && prob(30)) + unlock() + +/obj/item/clothing/under/color/yellow/parole/proc/unlock() + worn_by = loc + flags &= ~NODROP + parole_locked = 0 + desc = desc_unlocked + parole_id.flags &= ~NODROP + parole_id = null + playsound(loc, 'sound/machines/click.ogg', 10, 1) + worn_by.visible_message("[worn_by] is released from the parole jumpsuit.") + +/obj/item/clothing/under/color/yellow/parole/proc/lock(var/obj/item/weapon/card/id/D) + worn_by = loc + flags |= NODROP + parole_locked = 1 + desc = desc_locked + parole_id = D + parole_id.flags |= NODROP + playsound(loc, 'sound/machines/click.ogg', 10, 1) + worn_by.visible_message("[worn_by] is secured into the parole jumpsuit.") + + + /obj/item/clothing/under/psyche name = "psychedelic jumpsuit" desc = "Groovy!" From 8a610e5a84a636bc1147fd59d8a2cfe89bd720f7 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 24 Jun 2016 23:55:08 -0700 Subject: [PATCH 2/7] Fixes - Fox Fixes. - Clear messages when emagged or EMPed. - Parole suit can no longer be locked on people with sec or head access. --- code/game/machinery/computer/prisoner.dm | 4 ++-- code/game/objects/items/control_wand.dm | 12 ++++++++++-- code/modules/clothing/under/color.dm | 19 ++++++++++--------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 6c5f995362b..c42b1811c26 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -61,9 +61,9 @@ var/loc_display = "Unknown" var/health_display = "OK" var/total_loss = round(M.getOxyLoss() + M.getToxLoss() + M.getFireLoss() + M.getBruteLoss(), 1) - if (M.stat > UNCONSCIOUS) + if(M.stat == DEAD) health_display = "DEAD" - else if (total_loss) + else if(total_loss) health_display = "HURT ([total_loss])" if((M.z in config.station_levels) && !istype(M.loc, /turf/space)) loc_display = "[get_area(M)]" diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index b04ed35fe75..07a1d2b4e92 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -134,10 +134,18 @@ if (!istype(I)) to_chat(user,"[H] is not wearing an ID.") return - if (emagged) - visible_message(J,"[J] emits an error tone.") + if (J.emagged) + to_chat(user, "[J] emits an error tone.") + else if (J.emped) + to_chat(user, "The circuits on [J] appear to be fried.") else if (J.parole_locked && J.flags & NODROP && I.flags & NODROP) J.unlock() + else if (access_heads in I.access) + to_chat(user, "[J] cannot be locked on someone wearing an ID with head access. They might need to use their ID on a keycard swiper.") + return + else if (access_security in I.access) + to_chat(user, "[J] cannot be locked on someone wearing an ID with security access.") + return else if (!J.parole_locked && !(J.flags & NODROP) && !(I.flags & NODROP)) J.lock(I) else diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index a64e6047db8..8c049b9cdea 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -106,35 +106,36 @@ /obj/item/clothing/under/color/yellow/parole name = "parole jumpsuit" - desc = "" - var/desc_locked = "A jumpsuit worn by parolees. Its suit sensors are always fully on. It is LOCKED." - var/desc_unlocked = "A jumpsuit worn by parolees. Its suit sensors are always fully on. It is UNLOCKED." + desc = "A jumpsuit worn by parolees. Its suit sensors are always fully on. Its lock light is OFF." + var/desc_locked = "A jumpsuit worn by parolees. Its suit sensors are always fully on. Its lock light is ON." + var/desc_emagged = "A jumpsuit worn by parolees. Its suit sensors are always fully on. Its lock light is BLINKING." + var/desc_emped = "A jumpsuit worn by parolees. Its suit sensors are always fully on. Its lock light is FLICKERING." has_sensor = 2 sensor_mode = 3 var/parole_locked = 0 var/emagged = 0 + var emped = 0 var/obj/item/weapon/card/id/parole_id = null var/mob/living/carbon/human/worn_by = null -/obj/item/clothing/under/color/yellow/parole/New() - ..() - desc = desc_unlocked - /obj/item/clothing/under/color/yellow/parole/emag_act(user as mob) if(parole_locked && !emagged) to_chat(user, "\red You overload the suit's locking mechanism.") - emagged = 1 unlock() + emagged = 1 + desc = desc_emagged /obj/item/clothing/under/color/yellow/parole/emp_act(var/severity) if(parole_locked && !emagged && prob(30)) unlock() + emped = 1 + desc = desc_emped /obj/item/clothing/under/color/yellow/parole/proc/unlock() worn_by = loc flags &= ~NODROP parole_locked = 0 - desc = desc_unlocked + desc = initial(desc) parole_id.flags &= ~NODROP parole_id = null playsound(loc, 'sound/machines/click.ogg', 10, 1) From 4b208193e8b95de21ce9df1629c3821311f9871c Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 25 Jun 2016 07:50:06 -0700 Subject: [PATCH 3/7] Deletes parole jumpsuits --- code/game/objects/items/control_wand.dm | 41 +-------------- .../objects/items/weapons/storage/boxes.dm | 5 +- code/modules/clothing/under/color.dm | 50 ------------------- 3 files changed, 3 insertions(+), 93 deletions(-) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 07a1d2b4e92..c92d6468a7d 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -110,43 +110,4 @@ #undef WAND_OPEN #undef WAND_BOLT -#undef WAND_EMERGENCY - - -/obj/item/weapon/parolesuit_control - icon_state = "gangtool-red" - item_state = "electronic" - icon = 'icons/obj/device.dmi' - name = "parole suit control wand" - desc = "Remotely controls parole jumpsuits." - w_class = 1 - var/emagged = 0 - -/obj/item/weapon/parolesuit_control/attack(mob/living/carbon/human/H, mob/user) - if(!istype(H)) - to_chat(user,"[src] only works on humanoids.") - return - if (!istype(H.w_uniform, /obj/item/clothing/under/color/yellow/parole)) - to_chat(user,"[H] is not wearing a parole jumpsuit.") - return - var/obj/item/clothing/under/color/yellow/parole/J = H.w_uniform - var/obj/item/weapon/card/id/I = H.get_item_by_slot(slot_wear_id) - if (!istype(I)) - to_chat(user,"[H] is not wearing an ID.") - return - if (J.emagged) - to_chat(user, "[J] emits an error tone.") - else if (J.emped) - to_chat(user, "The circuits on [J] appear to be fried.") - else if (J.parole_locked && J.flags & NODROP && I.flags & NODROP) - J.unlock() - else if (access_heads in I.access) - to_chat(user, "[J] cannot be locked on someone wearing an ID with head access. They might need to use their ID on a keycard swiper.") - return - else if (access_security in I.access) - to_chat(user, "[J] cannot be locked on someone wearing an ID with security access.") - return - else if (!J.parole_locked && !(J.flags & NODROP) && !(I.flags & NODROP)) - J.lock(I) - else - to_chat(user,"[src] emits a loud buzzzing sound! Its display reads: jumpsuit/ID lock desynched.") +#undef WAND_EMERGENCY \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 86b2271ed92..c11b6fa5a9b 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -241,11 +241,10 @@ ..() 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) - new /obj/item/clothing/under/color/yellow/parole(src) - new /obj/item/clothing/under/color/yellow/parole(src) - new /obj/item/weapon/parolesuit_control(src) /obj/item/weapon/storage/box/exileimp name = "boxed exile implant kit" diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 8c049b9cdea..e0386585f26 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -103,56 +103,6 @@ item_color = "yellow" flags = ONESIZEFITSALL - -/obj/item/clothing/under/color/yellow/parole - name = "parole jumpsuit" - desc = "A jumpsuit worn by parolees. Its suit sensors are always fully on. Its lock light is OFF." - var/desc_locked = "A jumpsuit worn by parolees. Its suit sensors are always fully on. Its lock light is ON." - var/desc_emagged = "A jumpsuit worn by parolees. Its suit sensors are always fully on. Its lock light is BLINKING." - var/desc_emped = "A jumpsuit worn by parolees. Its suit sensors are always fully on. Its lock light is FLICKERING." - has_sensor = 2 - sensor_mode = 3 - var/parole_locked = 0 - var/emagged = 0 - var emped = 0 - var/obj/item/weapon/card/id/parole_id = null - var/mob/living/carbon/human/worn_by = null - -/obj/item/clothing/under/color/yellow/parole/emag_act(user as mob) - if(parole_locked && !emagged) - to_chat(user, "\red You overload the suit's locking mechanism.") - unlock() - emagged = 1 - desc = desc_emagged - -/obj/item/clothing/under/color/yellow/parole/emp_act(var/severity) - if(parole_locked && !emagged && prob(30)) - unlock() - emped = 1 - desc = desc_emped - -/obj/item/clothing/under/color/yellow/parole/proc/unlock() - worn_by = loc - flags &= ~NODROP - parole_locked = 0 - desc = initial(desc) - parole_id.flags &= ~NODROP - parole_id = null - playsound(loc, 'sound/machines/click.ogg', 10, 1) - worn_by.visible_message("[worn_by] is released from the parole jumpsuit.") - -/obj/item/clothing/under/color/yellow/parole/proc/lock(var/obj/item/weapon/card/id/D) - worn_by = loc - flags |= NODROP - parole_locked = 1 - desc = desc_locked - parole_id = D - parole_id.flags |= NODROP - playsound(loc, 'sound/machines/click.ogg', 10, 1) - worn_by.visible_message("[worn_by] is secured into the parole jumpsuit.") - - - /obj/item/clothing/under/psyche name = "psychedelic jumpsuit" desc = "Groovy!" From 9c42220dece62a3e1827f11516fae4d845446695 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 5 Jul 2016 21:39:03 -0700 Subject: [PATCH 4/7] DZD Fixes --- code/game/machinery/computer/prisoner.dm | 2 +- code/modules/clothing/clothing.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index c42b1811c26..ebc0db47c32 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -60,7 +60,7 @@ var/mob/living/carbon/M = T.imp_in var/loc_display = "Unknown" var/health_display = "OK" - var/total_loss = round(M.getOxyLoss() + M.getToxLoss() + M.getFireLoss() + M.getBruteLoss(), 1) + var/total_loss = (M.maxHealth - M.health) if(M.stat == DEAD) health_display = "DEAD" else if(total_loss) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 7013f1d73b1..973919499b3 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -95,7 +95,7 @@ ..() return - if(flags & NODROP) + if(!usr.canUnEquip(src)) return var/obj/item/clothing/ears/O From 45d4f7b768556d384d8856217b941c1f12b0f19f Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 5 Jul 2016 21:41:40 -0700 Subject: [PATCH 5/7] Second DZD change --- code/modules/clothing/clothing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 973919499b3..44a67c2ef0a 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -630,7 +630,7 @@ BLIND // can't see anything if (!(src.loc == usr)) return if (!( usr.restrained() ) && !( usr.stat ) && ( over_object )) - if (flags & NODROP) + if (!usr.canUnEquip(src)) to_chat(usr, "[src] appears stuck on you!") return switch(over_object.name) From c8cede89162d42c25087d7abbdb501a5bbf820a7 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 7 Jul 2016 21:53:44 -0700 Subject: [PATCH 6/7] Tiger --- code/modules/clothing/clothing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 44a67c2ef0a..3c3c65a929e 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -630,7 +630,7 @@ BLIND // can't see anything if (!(src.loc == usr)) return if (!( usr.restrained() ) && !( usr.stat ) && ( over_object )) - if (!usr.canUnEquip(src)) + if(!usr.canUnEquip(src)) to_chat(usr, "[src] appears stuck on you!") return switch(over_object.name) From f22f5747cd0553b49df1ece5daa5efda96afe573 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 13 Jul 2016 21:44:50 -0700 Subject: [PATCH 7/7] 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)