diff --git a/code/datums/keybindings/emote_keybinds.dm b/code/datums/keybindings/emote_keybinds.dm index afd3013c759..85cffbf04cb 100644 --- a/code/datums/keybindings/emote_keybinds.dm +++ b/code/datums/keybindings/emote_keybinds.dm @@ -203,10 +203,6 @@ linked_emote = /datum/emote/living/carbon/blink_r name = "Blink (Rapid)" -/datum/keybinding/emote/carbon/clap - linked_emote = /datum/emote/living/carbon/clap - name = "Clap" - /datum/keybinding/emote/carbon/cross linked_emote = /datum/emote/living/carbon/cross name = "Cross Arms" @@ -337,6 +333,10 @@ linked_emote = /datum/emote/living/carbon/human/airguitar name = "Airguitar" +/datum/keybinding/emote/carbon/human/clap + linked_emote = /datum/emote/living/carbon/human/clap + name = "Clap" + /datum/keybinding/emote/carbon/human/cry linked_emote = /datum/emote/living/carbon/human/cry name = "Cry" diff --git a/code/modules/mob/living/carbon/carbon_emote.dm b/code/modules/mob/living/carbon/carbon_emote.dm index 5cbb7b12da6..7e67aad5c26 100644 --- a/code/modules/mob/living/carbon/carbon_emote.dm +++ b/code/modules/mob/living/carbon/carbon_emote.dm @@ -11,38 +11,6 @@ key = "blink_r" message = "blinks rapidly." -/datum/emote/living/carbon/clap - key = "clap" - key_third_person = "claps" - message = "claps." - message_mime = "claps silently." - message_param = "claps at %t." - emote_type = EMOTE_SOUND - vary = TRUE - -/datum/emote/living/carbon/clap/run_emote(mob/user, params, type_override, intentional) - var/mob/living/carbon/human/H = user - if(!H.bodyparts_by_name[BODY_ZONE_L_ARM] || !H.bodyparts_by_name[BODY_ZONE_R_ARM]) - if(!H.bodyparts_by_name[BODY_ZONE_L_ARM] && !H.bodyparts_by_name[BODY_ZONE_R_ARM]) - // no arms... - to_chat(user, "You need arms to be able to clap.") - else - // well, we've got at least one - user.visible_message("[user] makes the sound of one hand clapping.") - return TRUE - - return ..() - -/datum/emote/living/carbon/clap/get_sound(mob/living/user) - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(!H?.mind?.miming) - return pick( - 'sound/misc/clap1.ogg', - 'sound/misc/clap2.ogg', - 'sound/misc/clap3.ogg', - 'sound/misc/clap4.ogg') - /datum/emote/living/carbon/cross key = "cross" key_third_person = "crosses" diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm index f1e909d740a..67860156357 100644 --- a/code/modules/mob/living/carbon/human/human_emote.dm +++ b/code/modules/mob/living/carbon/human/human_emote.dm @@ -37,6 +37,44 @@ emote_type = EMOTE_VISIBLE hands_use_check = TRUE +/datum/emote/living/carbon/human/clap + key = "clap" + key = "clap" + key_third_person = "claps" + message = "claps." + message_mime = "claps silently." + message_param = "claps at %t." + emote_type = EMOTE_SOUND + vary = TRUE + +/datum/emote/living/carbon/human/clap/run_emote(mob/user, params, type_override, intentional) + if(!ishuman(user)) + return + + var/mob/living/carbon/human/H = user + if(!H.bodyparts_by_name[BODY_ZONE_L_ARM] || !H.bodyparts_by_name[BODY_ZONE_R_ARM]) + if(!H.bodyparts_by_name[BODY_ZONE_L_ARM] && !H.bodyparts_by_name[BODY_ZONE_R_ARM]) + // no arms... + to_chat(user, "You need arms to be able to clap.") + else + // well, we've got at least one + user.visible_message("[user] makes the sound of one hand clapping.") + return TRUE + + return ..() + +/datum/emote/living/carbon/human/clap/get_sound(mob/living/user) + if(!ishuman(user)) + return + + var/mob/living/carbon/human/H = user + if(!H.mind?.miming) + return pick( + 'sound/misc/clap1.ogg', + 'sound/misc/clap2.ogg', + 'sound/misc/clap3.ogg', + 'sound/misc/clap4.ogg') + /datum/emote/living/carbon/human/crack key = "crack" key_third_person = "cracks" @@ -779,4 +817,3 @@ var/obj/item/organ/external/bodypart = pick(H.bodyparts) message = "cracks their [bodypart.name]!" . = ..() -