Merge pull request #358 from VampyrBytes/master

More MP fixes
This commit is contained in:
ZomgPonies
2014-08-06 19:04:26 -04:00
2 changed files with 5 additions and 3 deletions
@@ -576,9 +576,6 @@
brute_mod = 1.5
burn_mod = 1.5
warning_low_pressure = 50
hazard_low_pressure = 0
cold_level_1 = 50
cold_level_2 = -1
cold_level_3 = -1
+5
View File
@@ -180,9 +180,14 @@
var/obj/item/weapon/organ/head/B = tool
if (B.brainmob.mind)
B.brainmob.mind.transfer_to(target)
if ((istype(B, /obj/item/weapon/organ/head/posi)) && (affected.status & ORGAN_ROBOT)) // cos you just know someone's going to put a robot head on a human body at some point!
dead_mob_list -= target
living_mob_list += target
target.stat = CONSCIOUS
target.update_body()
target.updatehealth()
target.UpdateDamageIcon()
del(B)
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)