From fd4ac0920dc2a6aa8a148c1aefe0418b27461713 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 28 May 2016 16:48:45 +0200 Subject: [PATCH 1/3] Posibrain fix --- code/modules/mob/living/carbon/brain/life.dm | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 857546732d7..78eed1d4228 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -33,20 +33,21 @@ updatehealth() /mob/living/carbon/brain/handle_environment(datum/gas_mixture/environment) - if(!environment) - return - var/environment_heat_capacity = environment.heat_capacity() - if(istype(get_turf(src), /turf/space)) - var/turf/heat_turf = get_turf(src) - environment_heat_capacity = heat_turf.heat_capacity + if(!istype(src, /obj/item/device/mmi/posibrain)) //we don't want posibrains suffocating, now do we? + if(!environment) + return + var/environment_heat_capacity = environment.heat_capacity() + if(istype(get_turf(src), /turf/space)) + var/turf/heat_turf = get_turf(src) + environment_heat_capacity = heat_turf.heat_capacity - if((environment.temperature > (T0C + 50)) || (environment.temperature < (T0C + 10))) - var/transfer_coefficient = 1 + if((environment.temperature > (T0C + 50)) || (environment.temperature < (T0C + 10))) + var/transfer_coefficient = 1 - handle_temperature_damage(HEAD, environment.temperature, environment_heat_capacity*transfer_coefficient) + handle_temperature_damage(HEAD, environment.temperature, environment_heat_capacity*transfer_coefficient) - if(stat == DEAD) - bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000) + if(stat == DEAD) + bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000) /mob/living/carbon/brain/proc/handle_temperature_damage(body_part, exposed_temperature, exposed_intensity) if(status_flags & GODMODE) From 1575a48e91e8fded44c47d401451a563d7a7eee3 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 30 May 2016 12:32:52 +0200 Subject: [PATCH 2/3] K den --- code/modules/mob/living/carbon/brain/life.dm | 17 ----------------- code/modules/mob/living/carbon/life.dm | 4 +++- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 78eed1d4228..99639b8777b 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -32,23 +32,6 @@ adjustToxLoss(3) updatehealth() -/mob/living/carbon/brain/handle_environment(datum/gas_mixture/environment) - if(!istype(src, /obj/item/device/mmi/posibrain)) //we don't want posibrains suffocating, now do we? - if(!environment) - return - var/environment_heat_capacity = environment.heat_capacity() - if(istype(get_turf(src), /turf/space)) - var/turf/heat_turf = get_turf(src) - environment_heat_capacity = heat_turf.heat_capacity - - if((environment.temperature > (T0C + 50)) || (environment.temperature < (T0C + 10))) - var/transfer_coefficient = 1 - - handle_temperature_damage(HEAD, environment.temperature, environment_heat_capacity*transfer_coefficient) - - if(stat == DEAD) - bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000) - /mob/living/carbon/brain/proc/handle_temperature_damage(body_part, exposed_temperature, exposed_intensity) if(status_flags & GODMODE) return diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 7b3f74ef65f..558780a4453 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -41,6 +41,8 @@ return if(NO_BREATH in mutations) return // No breath mutation means no breathing. + if(istype(src, /mob/living/carbon/brain)) + return var/datum/gas_mixture/environment if(loc) @@ -465,4 +467,4 @@ else healths.icon_state = "health6" else - healths.icon_state = "health7" \ No newline at end of file + healths.icon_state = "health7" From 0317e757a21ac63b787c884c837672da7a3c8331 Mon Sep 17 00:00:00 2001 From: Matt Milosevic Date: Mon, 30 May 2016 19:35:51 +0200 Subject: [PATCH 3/3] Very well! --- code/modules/mob/living/carbon/brain/life.dm | 3 +++ code/modules/mob/living/carbon/life.dm | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 99639b8777b..63eb38e607f 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -78,3 +78,6 @@ see_in_dark = 2 see_invisible = SEE_INVISIBLE_LIVING handle_hud_icons_health() + +/mob/living/carbon/brain/breathe() + return diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 558780a4453..c26508b1374 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -41,8 +41,6 @@ return if(NO_BREATH in mutations) return // No breath mutation means no breathing. - if(istype(src, /mob/living/carbon/brain)) - return var/datum/gas_mixture/environment if(loc)