diff --git a/code/modules/mob/living/carbon/monkey/hud.dm b/code/modules/mob/living/carbon/monkey/hud.dm index 5bb39214c6..28676afc1e 100644 --- a/code/modules/mob/living/carbon/monkey/hud.dm +++ b/code/modules/mob/living/carbon/monkey/hud.dm @@ -95,43 +95,36 @@ mymob.throw_icon.screen_loc = ui_drop_throw mymob.oxygen = new /obj/screen() - mymob.oxygen.icon = ui_style mymob.oxygen.icon_state = "oxy0" mymob.oxygen.name = "oxygen" mymob.oxygen.screen_loc = ui_oxygen mymob.pressure = new /obj/screen() - mymob.pressure.icon = ui_style mymob.pressure.icon_state = "pressure0" mymob.pressure.name = "pressure" mymob.pressure.screen_loc = ui_pressure mymob.toxin = new /obj/screen() - mymob.toxin.icon = ui_style mymob.toxin.icon_state = "tox0" mymob.toxin.name = "toxin" mymob.toxin.screen_loc = ui_toxin mymob.internals = new /obj/screen() - mymob.internals.icon = ui_style mymob.internals.icon_state = "internal0" mymob.internals.name = "internal" mymob.internals.screen_loc = ui_internal mymob.fire = new /obj/screen() - mymob.fire.icon = ui_style mymob.fire.icon_state = "fire0" mymob.fire.name = "fire" mymob.fire.screen_loc = ui_fire mymob.bodytemp = new /obj/screen() - mymob.bodytemp.icon = ui_style mymob.bodytemp.icon_state = "temp1" mymob.bodytemp.name = "body temperature" mymob.bodytemp.screen_loc = ui_temp mymob.healths = new /obj/screen() - mymob.healths.icon = ui_style mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_health diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 487ddc5215..7719d9b0fc 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -100,7 +100,7 @@ proc/handle_mutations_and_radiation() if(getFireLoss()) - if((COLD_RESISTANCE in mutations) || prob(50)) + if((COLD_RESISTANCE in mutations) && prob(50)) switch(getFireLoss()) if(1 to 50) adjustFireLoss(-1) @@ -332,7 +332,7 @@ handle_temperature_damage(HEAD, environment.temperature, environment_heat_capacity*transfer_coefficient) - if(stat==2) + if(stat != 2) bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000) //Account for massive pressure differences