From 83c6dc65ba213fe50490867163ac167d41137d01 Mon Sep 17 00:00:00 2001 From: Iatots <5155917+Iatots@users.noreply.github.com> Date: Fri, 24 Jul 2020 15:22:56 +0200 Subject: [PATCH] Update code/modules/reagents/chemistry/reagents/other_reagents.dm Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com> --- .../chemistry/reagents/other_reagents.dm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index ec68fc6dd1..801fd4ac18 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2352,18 +2352,14 @@ amount = M.reagents.get_reagent_amount(/datum/reagent/hairball) if(amount < 10) - knotted = 0 - if(prob(10)) M.losebreath += 1 M.emote("cough") to_chat(M, "You clear your throat.") - - if(amount >= 10) - - if(knotted == 0) + else + if(!knotted) to_chat(M, "You feel a knot in your stomach.") - knotted = 1 + knotted = TRUE if(prob(5 + amount * 0.5)) // don't want this to cause too much damage M.losebreath += 2 @@ -2376,10 +2372,12 @@ M.visible_message("[M] seems distressed!.", ignored_mobs=M) else if(prob(amount - 8)) - knotted = 0 + knotted = FALSE playsound(M,'sound/voice/catpeople/puking.ogg', 110, FALSE) M.Immobilize(30) - do_after(30) + sleep(30) //snowflake but it works, don't wanna proc this + if(QDELETED(M) || QDELETED(src)) //this handles race conditions about m or src not existing. + return M.visible_message("[M] throws up a hairball! Disgusting!", ignored_mobs=M) new /obj/item/toy/plush/hairball(get_turf(M)) to_chat(M, "Aaaah that's better!")