From df607bb24c640335d21b6cf77cf79c6499d62c39 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Sun, 24 Sep 2017 12:54:22 -0400 Subject: [PATCH 1/2] Implant Chairs now also support organs (#30982) * Implant Chairs now also support organs * Update implantchair.dm * Update implantchair.dm --- code/game/objects/items/implants/implantchair.dm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 2f59020cbe..76c61ade81 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -85,10 +85,17 @@ update_icon() /obj/machinery/implantchair/proc/implant_action(mob/living/M) - var/obj/item/implant/I = new implant_type - if(I.implant(M)) - visible_message("[M] has been implanted by the [name].") - return 1 + var/obj/item/I = new implant_type + if(istype(I, /obj/item/implant)) + var/obj/item/implant/P = I + if(P.implant(M)) + visible_message("[M] has been implanted by [src].") + return TRUE + else if(istype(I, /obj/item/organ)) + var/obj/item/organ/P = I + P.Insert(M, drop_if_replaced = FALSE) + visible_message("[M] has been implanted by [src].") + return TRUE /obj/machinery/implantchair/update_icon() icon_state = initial(icon_state)