Merge pull request #5776 from Citadel-Station-13/upstream-merge-36087

[MIRROR] Proper removal of chem implant action buttons
This commit is contained in:
LetterJay
2018-03-04 00:36:47 -06:00
committed by GitHub
2 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -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
@@ -3,6 +3,7 @@
desc = "Injects things."
icon_state = "reagents"
container_type = OPENCONTAINER
activated = FALSE
/obj/item/implant/chem/get_data()
var/dat = {"<b>Implant Specifications:</b><BR>
@@ -20,14 +21,14 @@
<b>Integrity:</b> 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")