diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 24f5b9ac42..c6af589cb5 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -254,7 +254,7 @@ /obj/structure/door_assembly/door_assembly_clown name = "bananium airlock assembly" - desc = "Honk" + desc = "Honk." icon = 'icons/obj/doors/airlocks/station/bananium.dmi' airlock_type = /obj/machinery/door/airlock/clown anchored = TRUE @@ -580,7 +580,8 @@ user.visible_message("[user] wires the airlock assembly.", \ "You start to wire the airlock assembly...") if(do_after(user, 40, target = src)) - if(C.get_amount() < 1 || state != 0) return + if(C.get_amount() < 1 || state != 0) + return C.use(1) state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS to_chat(user, "You wire the airlock assembly.") @@ -642,7 +643,8 @@ user.visible_message("[user] adds [G.name] to the airlock assembly.", \ "You start to install [G.name] into the airlock assembly...") if(do_after(user, 40, target = src)) - if(G.get_amount() < 1 || mineral) return + if(G.get_amount() < 1 || mineral) + return if(!istype(G, /obj/item/stack/sheet/glass)) to_chat(user, "You install [G.name] windows into the airlock assembly.") heat_proof_finished = 1 //plasma & reinforced glass makes the airlock heat-proof @@ -670,7 +672,8 @@ user.visible_message("[user] adds [G.name] to the airlock assembly.", \ "You start to install [G.name] into the airlock assembly...") if(do_after(user, 40, target = src)) - if(G.get_amount() < 2 || mineral) return + if(G.get_amount() < 2 || mineral) + return to_chat(user, "You install [M] plating into the airlock assembly.") G.use(2) mineral = "[M]" diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index 91ae788db5..5bab1fc811 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -3,6 +3,7 @@ steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/extract_implant, /datum/surgery_step/close) species = list(/mob/living/carbon/human, /mob/living/carbon/monkey) possible_locs = list("chest") + requires_organic_bodypart = 0 //extract implant