From 758994d62059c403b53d69d6a1fdd71aa5faab26 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 2 May 2015 18:50:58 -0400 Subject: [PATCH] Adds in Fingersnapping --- code/modules/mob/living/carbon/human/emote.dm | 25 +++++++++++++++++- sound/effects/fingersnap.ogg | Bin 0 -> 7235 bytes 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 sound/effects/fingersnap.ogg diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 809844ea3b7..da2f516375b 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -36,7 +36,7 @@ on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm else //Everyone else fails, skip the emote attempt return - if("scream", "fart", "flip") + if("scream", "fart", "flip", "snap") on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm //Everything else, including typos of the above emotes else @@ -720,6 +720,29 @@ m_type = 2 + if ("snap") + if(prob(95)) + m_type = 2 + var/mob/living/carbon/human/H = src + var/obj/item/organ/external/L = H.get_organ("l_hand") + var/obj/item/organ/external/R = H.get_organ("r_hand") + var/left_hand_good = 0 + var/right_hand_good = 0 + if(L && (!(L.status & ORGAN_DESTROYED)) && (!(L.status & ORGAN_SPLINTED)) && (!(L.status & ORGAN_BROKEN))) + left_hand_good = 1 + if(R && (!(R.status & ORGAN_DESTROYED)) && (!(R.status & ORGAN_SPLINTED)) && (!(R.status & ORGAN_BROKEN))) + right_hand_good = 1 + + if (!left_hand_good && !right_hand_good) + usr << "You need at least one hand in good working order to snap your fingers." + return + + message = "[src] snaps \his fingers." + playsound(src.loc, 'sound/effects/fingersnap.ogg', 50, 1, -3) + else + message = "[src] snaps \his fingers right off!" + playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) + // Needed for M_TOXIC_FART if("fart") diff --git a/sound/effects/fingersnap.ogg b/sound/effects/fingersnap.ogg new file mode 100644 index 0000000000000000000000000000000000000000..f7046403513dad1bfa059f5113b8dc6e800c8389 GIT binary patch literal 7235 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 literal 0 HcmV?d00001