From 30e8a39869bc733d43a8e210259d4cd33a2baf5f Mon Sep 17 00:00:00 2001 From: Incoming Date: Mon, 2 Nov 2015 01:12:48 -0500 Subject: [PATCH] Checks work better when you actually check them. Adds some low level logging for implanted pill use. If you want specific logging for when certain chemicals come into play, that's more a goofchem problem. Fixes some grammer while I'm here --- code/modules/surgery/dental_implant.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index 1fdf59b9b21..3f6cb539baf 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -9,7 +9,7 @@ time = 16 /datum/surgery_step/insert_pill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] begins to wedge [tool] in [target]'s [parse_zone(target_zone)].", "You begin to wedge [tool] in [target]'s [parse_zone(target_zone)]...") + user.visible_message("[user] begins to wedge \the [tool] in [target]'s [parse_zone(target_zone)].", "You begin to wedge [tool] in [target]'s [parse_zone(target_zone)]...") /datum/surgery_step/insert_pill/success(mob/user, mob/living/carbon/target, target_zone, var/obj/item/weapon/reagent_containers/pill/tool, datum/surgery/surgery) if(!istype(tool)) @@ -24,16 +24,17 @@ P.target = tool P.Grant(target) - user.visible_message("[user] wedges [tool] into [target]'s [parse_zone(target_zone)]!", "You wedge [tool] into [target]'s [parse_zone(target_zone)].") + user.visible_message("[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", "You wedge [tool] into [target]'s [parse_zone(target_zone)].") return 1 /datum/action/item_action/hands_free/activate_pill name = "activate pill" /datum/action/item_action/hands_free/activate_pill/Trigger() - owner << "You grit your teeth and burst the implanted [target]!" - if(CheckRemoval(owner)) + if(!..() || CheckRemoval(owner)) return 0 + owner << "You grit your teeth and burst the implanted [target]!" + add_logs(owner, null, "swallowed an implanted pill", target) if(target.reagents.total_volume) target.reagents.reaction(owner, INGEST) target.reagents.trans_to(owner, target.reagents.total_volume)