Merge pull request #10082 from xxalpha/bass

Fixed not being able to insert a brain into an MMI.
This commit is contained in:
phil235
2015-06-21 19:33:45 +02:00
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -41,7 +41,7 @@
user << "<span class='warning'>You aren't sure where this brain came from, but you're pretty sure it's a useless brain!</span>"
return
if(!user.unEquip(src))
if(!user.unEquip(O))
return
var/mob/living/carbon/brain/B = newbrain.brainmob
if(!B.key)
+3 -3
View File
@@ -77,9 +77,9 @@
return 1
/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","[target_zone]")
if(ishuman(target) || ismonkey(target) || isalienadult(target))
var/mob/living/carbon/M = target
M.apply_damage(75,"brute","[target_zone]")
user.visible_message("[user] saws [target]'s [parse_zone(target_zone)] open!", "<span class='notice'>You saw [target]'s [parse_zone(target_zone)] open.</span>")
feedback_add_details("surgery_step_success","[src.type]")
return 1