cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes stasis bags from killing (#19349)

Browse Source 
im DUMB

wtf

Update life.dm

Makes resurrection artifact not as jank

Allow fossil bags on belts
This commit is contained in:
Cameron Lennox
2026-03-28 20:44:09 +01:00
committed by GitHub
parent 891f5bbf5b
commit 13994707dc
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/brain/life.dm
+1 -1
View File
@@ -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
code/modules/mob/living/carbon/human/life.dm
+4 -3
View File
@@ -991,9 +991,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)
@@ -1002,7 +1003,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)
code/modules/xenoarcheaology/effects/resurrect.dm
+4
View File
@@ -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))