From 92018c34b04d8ad83292a63a8f3d9978365348e6 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 28 Sep 2024 17:40:50 -0700 Subject: [PATCH] whoops --- code/modules/surgery/organs/lungs.dm | 2 +- .../can_spessmen_feel_pain/pain/status_effects/pain_limp.dm | 2 +- monkestation/code/modules/the_fabled_dna_changes/dna.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index e10ff336846daa..ebe938e69eafd0 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -675,7 +675,7 @@ breather.failed_last_breath = TRUE lung_pop_tick++ // Robot, don't care lol - else if(!HAS_TRAIT(owner, TRAIT_ASSISTED_BREATHING)) + else if((owner && !HAS_TRAIT(owner, TRAIT_ASSISTED_BREATHING))) // Can't breathe! breather.failed_last_breath = TRUE diff --git a/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/pain_limp.dm b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/pain_limp.dm index 0005d91fcc3ca1..00fce8026bf52c 100644 --- a/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/pain_limp.dm +++ b/monkestation/code/modules/can_spessmen_feel_pain/pain/status_effects/pain_limp.dm @@ -40,7 +40,7 @@ ) /datum/status_effect/limp/pain/update_limp() - if(QDELING(owner)) + if(QDELETED(owner)) return var/mob/living/carbon/human/limping_human = owner diff --git a/monkestation/code/modules/the_fabled_dna_changes/dna.dm b/monkestation/code/modules/the_fabled_dna_changes/dna.dm index c16d2d4b810023..6dd56105bd8ba6 100644 --- a/monkestation/code/modules/the_fabled_dna_changes/dna.dm +++ b/monkestation/code/modules/the_fabled_dna_changes/dna.dm @@ -20,7 +20,7 @@ for(var/datum/color_palette/palette as anything in generic_colors) color_palettes += palette var/datum/color_palette/new_palette = new palette - if(holder.client?.prefs) + if(holder?.client?.prefs) new_palette.apply_prefs(holder.client.prefs) color_palettes[palette] = new_palette