From 5377a879b837831e46a3810c0786ed95e06ffc2d Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Tue, 5 Aug 2014 10:48:21 +0100 Subject: [PATCH] More MP fixes removed immunity to pressure that was added with overheating MP will now revive when their heads are reattached --- code/modules/mob/living/carbon/species.dm | 3 --- code/modules/surgery/headreattach.dm | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 2d2242fc3d9..8ed4f4de722 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -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 diff --git a/code/modules/surgery/headreattach.dm b/code/modules/surgery/headreattach.dm index 6e28bb9e02b..704cdf98d2b 100644 --- a/code/modules/surgery/headreattach.dm +++ b/code/modules/surgery/headreattach.dm @@ -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)