From 12507e68727c520529d7bcc8846ca937d62f6f93 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 21 Jun 2015 01:13:41 +0930 Subject: [PATCH 1/3] Fixes #9866 --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 9b62a14ef4b..5f98aa83ba0 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -22,6 +22,7 @@ /obj/structure/bed/New(var/newloc, var/new_material, var/new_padding_material) ..(newloc) + color = null if(!new_material) new_material = DEFAULT_WALL_MATERIAL material = get_material_by_name(new_material) From 7c1696c3c8226caf3b72ffc2698f2e0f4b93c5a7 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 21 Jun 2015 01:27:23 +0930 Subject: [PATCH 2/3] Fixes #9435 --- code/modules/mob/living/carbon/human/species/outsider/shadow.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/outsider/shadow.dm b/code/modules/mob/living/carbon/human/species/outsider/shadow.dm index 41349846ebb..dd614bb55ba 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/shadow.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/shadow.dm @@ -18,7 +18,7 @@ remains_type = /obj/effect/decal/cleanable/ash death_message = "dissolves into ash..." - flags = IS_RESTRICTED | NO_BLOOD | NO_POISON | NO_SCAN | NO_SLIP | NO_POISON + flags = IS_RESTRICTED | NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON /datum/species/shadow/handle_death(var/mob/living/carbon/human/H) spawn(1) From 6fff0069db87a4d8b51714370e224f00435dee3b Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 21 Jun 2015 01:48:15 +0930 Subject: [PATCH 3/3] Fixes # #8327 --- .../mob/living/carbon/human/human_defense.dm | 22 +++++++++---------- code/modules/mob/living/carbon/human/life.dm | 6 ++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index b2f3e177456..29832ae1ecd 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -446,19 +446,19 @@ emp_act var/penetrated_dam = max(0,(damage - SS.breach_threshold)) if(penetrated_dam) SS.create_breaches(damtype, penetrated_dam) -/mob/living/human/reagent_permeability() +/mob/living/carbon/human/reagent_permeability() var/perm = 0 - + var/list/perm_by_part = list( - "head" = THERMAL_PROTECTION_HEAD, - "upper_torso" = THERMAL_PROTECTION_UPPER_TORSO, - "lower_torso" = THERMAL_PROTECTION_LOWER_TORSO, - "legs" = THERMAL_PROTECTION_LEG_LEFT + THERMAL_PROTECTION_LEG_RIGHT, - "feet" = THERMAL_PROTECTION_FOOT_LEFT + THERMAL_PROTECTION_FOOT_RIGHT, - "arms" = THERMAL_PROTECTION_ARM_LEFT + THERMAL_PROTECTION_ARM_RIGHT, + "head" = THERMAL_PROTECTION_HEAD, + "upper_torso" = THERMAL_PROTECTION_UPPER_TORSO, + "lower_torso" = THERMAL_PROTECTION_LOWER_TORSO, + "legs" = THERMAL_PROTECTION_LEG_LEFT + THERMAL_PROTECTION_LEG_RIGHT, + "feet" = THERMAL_PROTECTION_FOOT_LEFT + THERMAL_PROTECTION_FOOT_RIGHT, + "arms" = THERMAL_PROTECTION_ARM_LEFT + THERMAL_PROTECTION_ARM_RIGHT, "hands" = THERMAL_PROTECTION_HAND_LEFT + THERMAL_PROTECTION_HAND_RIGHT ) - + for(var/obj/item/clothing/C in src.get_equipped_items()) if(C.permeability_coefficient == 1 || !C.body_parts_covered) continue @@ -476,9 +476,9 @@ emp_act perm_by_part["arms"] *= C.permeability_coefficient if(C.body_parts_covered & HANDS) perm_by_part["hands"] *= C.permeability_coefficient - + for(var/part in perm_by_part) perm += perm_by_part[part] - + return perm diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index a624b3d18c7..9df33958502 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -67,7 +67,7 @@ //No need to update all of these procs if the guy is dead. if(stat != DEAD && !in_stasis) - if(air_master.current_cycle%4==2 || failed_last_breath || (health < config.health_threshold_crit)) //First, resolve location and get a breath + if(air_master.current_cycle%4==2 || failed_last_breath || (health <= config.health_threshold_crit)) //First, resolve location and get a breath breathe() //Only try to take a breath every 4 ticks, unless suffocating //Updates the number of stored chemicals for powers @@ -865,7 +865,7 @@ if(touching) touching.metabolize() if(ingested) ingested.metabolize() if(bloodstr) bloodstr.metabolize() - + if(CE_PAINKILLER in chem_effects) analgesic = chem_effects[CE_PAINKILLER] @@ -957,7 +957,7 @@ return 1 //UNCONSCIOUS. NO-ONE IS HOME - if( (getOxyLoss() > 50) || (config.health_threshold_crit > health) ) + if((getOxyLoss() > 50) || (health <= config.health_threshold_crit)) Paralyse(3) if(hallucination)