From 672b352f8f0c204b954bb65a036fc1b0d549e631 Mon Sep 17 00:00:00 2001 From: phil235 Date: Sun, 21 Sep 2014 22:16:34 +0200 Subject: [PATCH 1/4] Fixes "r_arm" (or equivalent) appearing in two surgery related messages. Fixes Robolimb overlay being placed on a limb other than the surgery location during the last step of augment surgery. --- code/modules/surgery/limb augmentation.dm | 8 ++++---- code/modules/surgery/surgery_step.dm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm index 2fc12830566..b8b663bc2cd 100644 --- a/code/modules/surgery/limb augmentation.dm +++ b/code/modules/surgery/limb augmentation.dm @@ -46,10 +46,10 @@ if(L) if(ishuman(target)) var/mob/living/carbon/human/H = target - user.visible_message("[user] successfully augments [target]'s [parse_zone(user.zone_sel.selecting)]!") + user.visible_message("[user] successfully augments [target]'s [target_zone]!") L.loc = get_turf(target) H.organs -= L - switch(user.zone_sel.selecting) //for the surgery to progress this MUST still be the original "location" so it's safe to do this. + switch(target_zone) //for the surgery to progress this MUST still be the original "location" so it's safe to do this. if("r_leg") H.organs += new /obj/item/organ/limb/robot/r_leg(src) if("l_leg") @@ -70,7 +70,7 @@ qdel(tool) H.update_damage_overlays(0) H.update_augments() //Gives them the Cyber limb overlay - add_logs(user, target, "augmented", addition="by giving him new [parse_zone(user.zone_sel.selecting)] INTENT: [uppertext(user.a_intent)]") + add_logs(user, target, "augmented", addition="by giving him new [target_zone] INTENT: [uppertext(user.a_intent)]") else - user.visible_message("[user] [target] has no organic [parse_zone(user.zone_sel.selecting)] there!") + user.visible_message("[user] [target] has no organic [target_zone] there!") return 1 diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index 4ceed4b0d5e..07140e8596d 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -29,7 +29,7 @@ initiate(user, target, target_zone, tool, surgery) return 1 else - user << "You need to expose [target]'s [target_zone] to perform surgery on it!" + user << "You need to expose [target]'s [parse_zone(target_zone)] to perform surgery on it!" return 1 //returns 1 so we don't stab the guy in the dick or wherever. return 0 @@ -77,7 +77,7 @@ if(ishuman(target)) var/mob/living/carbon/human/H = target H.apply_damage(75,"brute","[target_zone]") - user.visible_message("[user] saws [target]'s [target_zone] open!") + user.visible_message("[user] saws [target]'s [parse_zone(target_zone)] open!") return 1 /datum/surgery_step/proc/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) From b12273800e9224f9e2916438b0a00faa2b52cdc8 Mon Sep 17 00:00:00 2001 From: phil235 Date: Sun, 21 Sep 2014 22:22:02 +0200 Subject: [PATCH 2/4] missing two parse_zone. --- code/modules/surgery/limb augmentation.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm index b8b663bc2cd..a978ed1529d 100644 --- a/code/modules/surgery/limb augmentation.dm +++ b/code/modules/surgery/limb augmentation.dm @@ -46,7 +46,7 @@ if(L) if(ishuman(target)) var/mob/living/carbon/human/H = target - user.visible_message("[user] successfully augments [target]'s [target_zone]!") + user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!") L.loc = get_turf(target) H.organs -= L switch(target_zone) //for the surgery to progress this MUST still be the original "location" so it's safe to do this. @@ -72,5 +72,5 @@ H.update_augments() //Gives them the Cyber limb overlay add_logs(user, target, "augmented", addition="by giving him new [target_zone] INTENT: [uppertext(user.a_intent)]") else - user.visible_message("[user] [target] has no organic [target_zone] there!") + user.visible_message("[user] [target] has no organic [parse_zone(target_zone)] there!") return 1 From df554f10491128dd77c59fd6193acfc93d4c7145 Mon Sep 17 00:00:00 2001 From: phil235 Date: Sun, 21 Sep 2014 22:23:57 +0200 Subject: [PATCH 3/4] derp, last one missing --- code/modules/surgery/limb augmentation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm index a978ed1529d..83a0a553e3a 100644 --- a/code/modules/surgery/limb augmentation.dm +++ b/code/modules/surgery/limb augmentation.dm @@ -70,7 +70,7 @@ qdel(tool) H.update_damage_overlays(0) H.update_augments() //Gives them the Cyber limb overlay - add_logs(user, target, "augmented", addition="by giving him new [target_zone] INTENT: [uppertext(user.a_intent)]") + add_logs(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]") else user.visible_message("[user] [target] has no organic [parse_zone(target_zone)] there!") return 1 From 75de135f978401a0f8b58772a2e79aeb7d376375 Mon Sep 17 00:00:00 2001 From: phil235 Date: Sun, 21 Sep 2014 22:26:18 +0200 Subject: [PATCH 4/4] removing comment. --- code/modules/surgery/limb augmentation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm index 83a0a553e3a..f9a26f9f49a 100644 --- a/code/modules/surgery/limb augmentation.dm +++ b/code/modules/surgery/limb augmentation.dm @@ -49,7 +49,7 @@ user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!") L.loc = get_turf(target) H.organs -= L - switch(target_zone) //for the surgery to progress this MUST still be the original "location" so it's safe to do this. + switch(target_zone) if("r_leg") H.organs += new /obj/item/organ/limb/robot/r_leg(src) if("l_leg")