From 0e22fe7660fdd1526611e1fa9784d31f529596a4 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 3 Mar 2018 04:10:56 -0800 Subject: [PATCH] Chem implants can no longer be activated by action button (#36087) --- code/game/objects/items/implants/implant.dm | 2 +- code/game/objects/items/implants/implant_chem.dm | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm index ea3eb8bba4..b49f325690 100644 --- a/code/game/objects/items/implants/implant.dm +++ b/code/game/objects/items/implants/implant.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/implants.dmi' icon_state = "generic" //Shows up as the action button icon actions_types = list(/datum/action/item_action/hands_free/activate) - var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like mindshield implants + var/activated = TRUE //1 for implant types that can be activated, 0 for ones that are "always on" like mindshield implants var/mob/living/imp_in = null item_color = "b" var/allow_multiple = FALSE diff --git a/code/game/objects/items/implants/implant_chem.dm b/code/game/objects/items/implants/implant_chem.dm index e266f3ab09..1d57294b1a 100644 --- a/code/game/objects/items/implants/implant_chem.dm +++ b/code/game/objects/items/implants/implant_chem.dm @@ -3,6 +3,7 @@ desc = "Injects things." icon_state = "reagents" container_type = OPENCONTAINER + activated = FALSE /obj/item/implant/chem/get_data() var/dat = {"Implant Specifications:
@@ -20,14 +21,14 @@ Integrity: Implant will last so long as the subject is alive."} return dat -/obj/item/implant/chem/New() - ..() +/obj/item/implant/chem/Initialize() + . = ..() create_reagents(50) GLOB.tracked_chem_implants += src /obj/item/implant/chem/Destroy() - . = ..() GLOB.tracked_chem_implants -= src + return ..() /obj/item/implant/chem/trigger(emote, mob/source) if(emote == "deathgasp")