From 930af849234de29d0301ad1fcc3e0581801a9faa Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sun, 29 Mar 2026 14:23:12 -0700 Subject: [PATCH] [MIRROR] A few small tweaks (#12610) Co-authored-by: Cameron Lennox --- code/game/objects/items/weapons/storage/belt.dm | 3 ++- code/modules/mob/living/carbon/brain/life.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 7 ++++--- code/modules/xenoarcheaology/effects/resurrect.dm | 4 ++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 39d068656d..45668556c8 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -554,7 +554,8 @@ /obj/item/pickaxe/hand, /obj/item/xenoarch_multi_tool, /obj/item/pickaxe/excavationdrill, - /obj/item/storage/sample_container + /obj/item/storage/sample_container, + /obj/item/storage/bag/fossils ) /obj/item/storage/belt/fannypack diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 5c44f88ae2..0f32e85af5 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -52,7 +52,7 @@ handle_temperature_damage(HEAD, environment.temperature, environment_heat_capacity*transfer_coefficient) - if(stat==2) + if(stat == DEAD) bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000) //Account for massive pressure differences diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 81108c1f46..dbdeef31ab 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1002,9 +1002,10 @@ if(adjusted_pressure >= species.hazard_high_pressure) var/pressure_damage = min( ( (adjusted_pressure / species.hazard_high_pressure) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) - if(stat==DEAD) + if(stat == DEAD) pressure_damage = pressure_damage/2 - take_overall_damage(brute=pressure_damage, used_weapon = "High Pressure") + if(!istype(loc, /obj/structure/closet/body_bag/cryobag)) + take_overall_damage(brute=pressure_damage, used_weapon = "High Pressure") throw_alert("pressure", /atom/movable/screen/alert/highpressure, 2) else if(adjusted_pressure >= species.warning_high_pressure) throw_alert("pressure", /atom/movable/screen/alert/highpressure, 1) @@ -1013,7 +1014,7 @@ else if(adjusted_pressure >= species.hazard_low_pressure) throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 1) else - if( !(COLD_RESISTANCE in mutations)) + if(!(COLD_RESISTANCE in mutations) && !istype(loc, /obj/structure/closet/body_bag/cryobag)) if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) var/pressure_damage = LOW_PRESSURE_DAMAGE if(stat==DEAD) diff --git a/code/modules/xenoarcheaology/effects/resurrect.dm b/code/modules/xenoarcheaology/effects/resurrect.dm index 32be5fe057..bb1464344d 100644 --- a/code/modules/xenoarcheaology/effects/resurrect.dm +++ b/code/modules/xenoarcheaology/effects/resurrect.dm @@ -8,6 +8,10 @@ effect_state = "pulsing" effect_color = "#ff0000" +/datum/artifact_effect/resurrect/New() + effect = rand(EFFECT_AURA, EFFECT_PULSE) + trigger = pick(TRIGGER_WATER, TRIGGER_ACID, TRIGGER_VOLATILE, TRIGGER_TOXIN, TRIGGER_FORCE, TRIGGER_ENERGY, TRIGGER_HEAT, TRIGGER_COLD) //No trigger touch. + /datum/artifact_effect/resurrect/proc/steal_life(var/mob/living/target = null) var/atom/holder = get_master_holder() if(istype(holder, /obj/item/anobattery))