From fce77912116ce968b2c76e3fe3d82a83948eeabf Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Fri, 27 Jun 2025 11:56:40 -0400 Subject: [PATCH] environmental fix (#17919) --- .../mob/living/carbon/human/species/shadekin/shadekin.dm | 1 + .../mob/living/carbon/human/species/station/alraune.dm | 6 +++--- .../mob/living/carbon/human/species/station/station.dm | 4 +++- .../living/carbon/human/species/virtual_reality/avatar.dm | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm index 30cb28fee6..fa011c5662 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm @@ -131,6 +131,7 @@ /datum/species/shadekin/handle_environment_special(var/mob/living/carbon/human/H) handle_shade(H) + ..() /datum/species/shadekin/add_inherent_verbs(var/mob/living/carbon/human/H) ..() diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index e981df33ba..3c344f7657 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -134,7 +134,7 @@ if(H.does_not_breathe) H.failed_last_breath = 0 H.adjustOxyLoss(-5) - return // if somehow they don't breathe, abort breathing. + return ..()// if somehow they don't breathe, abort breathing. if(!breath || (breath.total_moles == 0)) H.failed_last_breath = 1 @@ -145,7 +145,7 @@ H.throw_alert("pressure", /obj/screen/alert/lowpressure) - return // skip air processing if there's no air + return ..() // skip air processing if there's no air else H.clear_alert("pressure") @@ -304,7 +304,7 @@ get_environment_discomfort(src,"cold") breath.update_values() - return 1 + ..() /obj/item/organ/internal/brain/alraune icon = 'icons/mob/species/alraune/organs.dmi' diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 7facdc2c99..536f346b35 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -707,6 +707,7 @@ //traumatic_shock is updated every tick, incrementing that is pointless - shock_stage is the counter. //Not that it matters much for diona, who have NO_PAIN. H.shock_stage++ + ..() @@ -1577,7 +1578,7 @@ coldshock = 16 H.eye_blurry = 5 H.shock_stage = min(H.shock_stage + coldshock, 160) //cold hurts and gives them pain messages, eventually weakening and paralysing, but doesn't damage. - return + ..() /datum/species/werebeast name = SPECIES_WEREBEAST @@ -1738,6 +1739,7 @@ if(temp_diff >= 50) H.shock_stage = min(H.shock_stage + (temp_diff/20), 160) // Divided by 20 is the same as previous numbers, but a full scale H.eye_blurry = max(5,H.eye_blurry) + ..() /datum/species/xenochimera/get_race_key() var/datum/species/real = GLOB.all_species[base_species] diff --git a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm index e049ce6f78..49529e6c5b 100644 --- a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm +++ b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm @@ -49,6 +49,7 @@ return /datum/species/shapeshifter/promethean/avatar/handle_environment_special(var/mob/living/carbon/human/H) + //Traits like anxiety won't apply here, but that's the issue with them being a subtype of Promethean. return /mob/living/carbon/human/proc/shapeshifter_change_opacity()