From 23e4357e4d4f0695ac05fcc75b63aabd05284022 Mon Sep 17 00:00:00 2001 From: Exavere Date: Mon, 20 Sep 2021 20:07:12 -0500 Subject: [PATCH 1/2] Making Plasmamen not emote "coughs up blood" --- code/modules/surgery/organs/lungs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 8250665d587..e23f0412d34 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -76,7 +76,7 @@ owner.emote("cough") //respitory tract infection if(is_bruised()) - if(prob(2)) + if(prob(2) && !(owner && (NO_BLOOD in owner.dna.species.species_traits))) owner.custom_emote(1, "coughs up blood!") owner.bleed(1) if(prob(4)) From e0df52c91840b9f363285c25b6fa334d37865e05 Mon Sep 17 00:00:00 2001 From: Exavere Date: Tue, 21 Sep 2021 11:34:38 -0500 Subject: [PATCH 2/2] Update code/modules/surgery/organs/lungs.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/modules/surgery/organs/lungs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index e23f0412d34..2d6cb8d79e8 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -76,7 +76,7 @@ owner.emote("cough") //respitory tract infection if(is_bruised()) - if(prob(2) && !(owner && (NO_BLOOD in owner.dna.species.species_traits))) + if(prob(2) && !(NO_BLOOD in owner.dna.species.species_traits)) owner.custom_emote(1, "coughs up blood!") owner.bleed(1) if(prob(4))