From 176d6cffae0e308f300f6ebaae092d486570699e Mon Sep 17 00:00:00 2001 From: FlattestGuitar Date: Wed, 5 Oct 2016 15:44:01 +0200 Subject: [PATCH] no more nodrop spam --- code/modules/mob/living/carbon/human/human_organs.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index 96a23acf5c7..8288c2dbd8b 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -108,11 +108,13 @@ if((E.body_part == HAND_LEFT) || (E.body_part == ARM_LEFT)) if(!l_hand) continue - unEquip(l_hand) + if(!unEquip(l_hand)) + continue else if(!r_hand) continue - unEquip(r_hand) + if(!unEquip(r_hand)) + continue var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ") custom_emote(1, "[(species.flags & NO_PAIN) ? "" : emote_scream ]drops what they were holding in their [E.name]!") @@ -122,11 +124,13 @@ if((E.body_part == HAND_LEFT) || (E.body_part == ARM_LEFT)) if(!l_hand) continue - unEquip(l_hand) + if(!unEquip(l_hand)) + continue else if(!r_hand) continue - unEquip(r_hand) + if(!unEquip(r_hand)) + continue custom_emote(1, "drops what they were holding, their [E.name] malfunctioning!")