From 1b97f7937244bfee01e0c15d89942c93fc4aea35 Mon Sep 17 00:00:00 2001 From: Ediblebomb <95509996+Ediblebomb@users.noreply.github.com> Date: Sat, 22 Jun 2024 16:02:29 -0500 Subject: [PATCH] smoke again, yippee --- code/game/objects/effects/effect_system/smoke.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index 4cd3c4a37d..be254bc209 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -131,18 +131,21 @@ for(var/mob/living/carbon/M in get_turf(src)) affect(M) -/obj/effect/particle_effect/smoke/bad/affect(mob/living/carbon/M) +/obj/effect/particle_effect/smoke/bad/affect(mob/living/carbon/human/M) ..() if (M.internal != null && M.wear_mask && (M.wear_mask.flags_inventory & ALLOWINTERNALS)) return + if(M.wear_mask && (M.wear_mask.flags_inventory & BLOCKGASEFFECT)) + return FALSE + if(M.head && (M.head.flags_inventory & BLOCKGASEFFECT)) + return FALSE else if(prob(20)) M.drop_held_item() M.apply_damage(1, OXY) if(M.coughedtime != 1) M.coughedtime = 1 - if(ishuman(M)) //Humans only to avoid issues - M.emote("cough") + M.emote("cough") addtimer(VARSET_CALLBACK(M, coughedtime, 0), 2 SECONDS) /////////////////////////////////////////////