Skip to content

Commit

Permalink
fixerino
Browse files Browse the repository at this point in the history
  • Loading branch information
Tsar-Salat committed Sep 22, 2023
1 parent b6b727d commit 1c4cab7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
16 changes: 8 additions & 8 deletions code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1964,7 +1964,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
H.emote("scream")

// Apply the damage to all body parts
H.apply_damage(burn_damage, BURN, spread_damage = TRUE)
H.apply_damage(burn_damage, BURN)

// Body temperature is too cold, and we do not have resist traits
else if(H.bodytemperature < bodytemp_cold_damage_limit && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
Expand All @@ -1981,13 +1981,13 @@ GLOBAL_LIST_EMPTY(features_by_species)
// Apply more damage based on how cold you are
switch(H.bodytemperature)
if(200 to bodytemp_cold_damage_limit)
H.throw_alert("temp", /obj/screen/alert/cold, 1)
H.throw_alert("temp", /atom/movable/screen/alert/cold, 1)
H.apply_damage(COLD_DAMAGE_LEVEL_1 * coldmod * H.physiology.cold_mod, BURN)
if(120 to 200)
H.throw_alert("temp", /obj/screen/alert/cold, 2)
H.throw_alert("temp", /atom/movable/screen/alert/cold, 2)
H.apply_damage(COLD_DAMAGE_LEVEL_2 * coldmod * H.physiology.cold_mod, BURN)
else
H.throw_alert("temp", /obj/screen/alert/cold, 3)
H.throw_alert("temp", /atom/movable/screen/alert/cold, 3)
H.apply_damage(COLD_DAMAGE_LEVEL_3 * coldmod * H.physiology.cold_mod, BURN)

// We are not to hot or cold, remove status and moods
Expand All @@ -2010,13 +2010,13 @@ GLOBAL_LIST_EMPTY(features_by_species)
if(!HAS_TRAIT(H, TRAIT_RESISTHIGHPRESSURE))
H.adjustBruteLoss(min(((adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 ) * \
PRESSURE_DAMAGE_COEFFICIENT, MAX_HIGH_PRESSURE_DAMAGE) * H.physiology.pressure_mod)
H.throw_alert("pressure", /obj/screen/alert/highpressure, 2)
H.throw_alert("pressure", /atom/movable/screen/alert/highpressure, 2)
else
H.clear_alert("pressure")

// High pressure, show an alert
if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
H.throw_alert("pressure", /obj/screen/alert/highpressure, 1)
H.throw_alert("pressure", /atom/movable/screen/alert/highpressure, 1)

// No pressure issues here clear pressure alerts
if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
Expand All @@ -2028,7 +2028,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
if(HAS_TRAIT(H, TRAIT_RESISTLOWPRESSURE))
H.clear_alert("pressure")
else
H.throw_alert("pressure", /obj/screen/alert/lowpressure, 1)
H.throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 1)

// Very low pressure, show an alert and take damage
else
Expand All @@ -2037,7 +2037,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
H.clear_alert("pressure")
else
H.adjustBruteLoss(LOW_PRESSURE_DAMAGE * H.physiology.pressure_mod)
H.throw_alert("pressure", /obj/screen/alert/lowpressure, 2)
H.throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 2)

/**
* Used to stabilize the body temperature back to normal on living mobs
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/living_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@

var/slowed_by_drag = TRUE //Whether the mob is slowed down when dragging another prone mob

/// List of changes to body temperature, used by desease symtoms like fever
var/list/body_temp_changes = list()

var/is_busy = FALSE //Used for random actions that take time. ex: curbstomping. We need to make sure we can only do one of these at a time.

//this stuff is here to make it simple for admins to mess with custom held sprites
Expand Down

0 comments on commit 1c4cab7

Please sign in to comment.