From c5abdfbd24c22f28b0c69561d07bfc549b2f7393 Mon Sep 17 00:00:00 2001 From: kyiakl Date: Thu, 15 Aug 2013 21:33:39 -0400 Subject: [PATCH 1/3] Issue #1012 Fix --- code/modules/surgery/brain_removal.dm | 8 -------- code/modules/surgery/surgery_step.dm | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/modules/surgery/brain_removal.dm b/code/modules/surgery/brain_removal.dm index de748a8a9d3..a04864fb6ba 100644 --- a/code/modules/surgery/brain_removal.dm +++ b/code/modules/surgery/brain_removal.dm @@ -11,14 +11,6 @@ time = 64 var/obj/item/organ/brain/B = null -/datum/surgery_step/saw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - if(ishuman(target)) - var/mob/living/carbon/human/H = target - H.apply_damage(75,"brute","head") - user.visible_message("[user] saws [target]'s skull open!") - return 1 - - /datum/surgery_step/extract_brain/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) B = target.getorgan(/obj/item/organ/brain) if(B) diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index ee89155c264..308bbc1fc54 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -68,6 +68,15 @@ user.visible_message("[user] succeeds!") return 1 +/datum/surgery_step/saw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(surgery.name == "brain removal") + if(ishuman(target)) + var/mob/living/carbon/human/H = target + H.apply_damage(75,"brute","head") + user.visible_message("[user] saws [target]'s skull open!") + else + user.visible_message("[user] saws [target]'s chest open!") + return 1 /datum/surgery_step/proc/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message("[user] screws up!") From 9cdbcf115cc3b911db21e5c6b540c027e28ba686 Mon Sep 17 00:00:00 2001 From: kyiakl Date: Mon, 19 Aug 2013 08:11:34 -0400 Subject: [PATCH 2/3] Update surgery_step.dm --- code/modules/surgery/surgery_step.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index 308bbc1fc54..b0090c29740 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -75,6 +75,8 @@ H.apply_damage(75,"brute","head") user.visible_message("[user] saws [target]'s skull open!") else + var/mob/living/carbon/human/H = target + H.apply_damage(75,"brute","chest") user.visible_message("[user] saws [target]'s chest open!") return 1 @@ -84,4 +86,4 @@ /datum/surgery_step/proc/tool_check(mob/user, obj/item/tool) - return 1 \ No newline at end of file + return 1 From ea4c604738be9c273d65f117e0177ec8d046e72c Mon Sep 17 00:00:00 2001 From: kyiakl Date: Mon, 19 Aug 2013 12:49:23 -0400 Subject: [PATCH 3/3] Update surgery_step.dm --- code/modules/surgery/surgery_step.dm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index b0090c29740..52c525d26b0 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -69,15 +69,10 @@ return 1 /datum/surgery_step/saw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - if(surgery.name == "brain removal") - if(ishuman(target)) - var/mob/living/carbon/human/H = target - H.apply_damage(75,"brute","head") - user.visible_message("[user] saws [target]'s skull open!") - else + if(ishuman(target)) var/mob/living/carbon/human/H = target - H.apply_damage(75,"brute","chest") - user.visible_message("[user] saws [target]'s chest open!") + H.apply_damage(75,"brute","[target_zone]") + user.visible_message("[user] saws [target]'s [target_zone] open!") return 1 /datum/surgery_step/proc/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)