Merge pull request #4925 from phil235/SurgeryFix

Surgery fixes
This commit is contained in:
Cheridan
2014-09-23 09:11:52 -05:00
2 changed files with 6 additions and 6 deletions
+4 -4
View File
@@ -46,10 +46,10 @@
if(L)
if(ishuman(target))
var/mob/living/carbon/human/H = target
user.visible_message("<span class='notice'>[user] successfully augments [target]'s [parse_zone(user.zone_sel.selecting)]!</span>")
user.visible_message("<span class='notice'>[user] successfully augments [target]'s [parse_zone(target_zone)]!</span>")
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)
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 [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]")
else
user.visible_message("<span class='notice'>[user] [target] has no organic [parse_zone(user.zone_sel.selecting)] there!</span>")
user.visible_message("<span class='notice'>[user] [target] has no organic [parse_zone(target_zone)] there!</span>")
return 1
+2 -2
View File
@@ -29,7 +29,7 @@
initiate(user, target, target_zone, tool, surgery)
return 1
else
user << "<span class='notice'>You need to expose [target]'s [target_zone] to perform surgery on it!</span>"
user << "<span class='notice'>You need to expose [target]'s [parse_zone(target_zone)] to perform surgery on it!</span>"
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("<span class='notice'>[user] saws [target]'s [target_zone] open!")
user.visible_message("<span class='notice'>[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)