diff --git a/code/datums/keybindings/emote_keybinds.dm b/code/datums/keybindings/emote_keybinds.dm index 5357d703195..851cde58f96 100644 --- a/code/datums/keybindings/emote_keybinds.dm +++ b/code/datums/keybindings/emote_keybinds.dm @@ -263,6 +263,10 @@ linked_emote = /datum/emote/living/carbon/scowl name = "Scowl" +/datum/keybinding/emote/carbon/twirl + linked_emote = /datum/emote/living/carbon/twirl + name = "Twirl" + /datum/keybinding/emote/carbon/faint linked_emote = /datum/emote/living/carbon/faint name = "Faint" @@ -345,6 +349,10 @@ linked_emote = /datum/emote/living/carbon/human/eyebrow name = "Eyebrow" +/datum/keybinding/emote/carbon/human/facepalm + linked_emote = /datum/emote/living/carbon/human/facepalm + name = "Facepalm" + /datum/keybinding/emote/carbon/human/grumble linked_emote = /datum/emote/living/carbon/human/grumble name = "Grumble" @@ -361,6 +369,10 @@ linked_emote = /datum/emote/living/carbon/human/nod name = "Nod" +/datum/keybinding/emote/carbon/human/palm + linked_emote = /datum/emote/living/carbon/human/palm + name = "Extend palm" + /datum/keybinding/emote/carbon/human/scream linked_emote = /datum/emote/living/carbon/human/scream name = "Scream" @@ -409,6 +421,14 @@ linked_emote = /datum/emote/living/carbon/human/slap name = "Slap" +/datum/keybinding/emote/carbon/human/wince + linked_emote = /datum/emote/living/carbon/human/wince + name = "Wince" + +/datum/keybinding/emote/carbon/human/squint + linked_emote = /datum/emote/living/carbon/human/squint + name = "Squint" + /datum/keybinding/emote/carbon/human/wink linked_emote = /datum/emote/living/carbon/human/wink name = "Wink" @@ -513,6 +533,14 @@ linked_emote = /datum/emote/living/carbon/human/rattle name = "Rattle" +/datum/keybinding/emote/carbon/human/bubble + linked_emote = /datum/emote/living/carbon/human/bubble + name = "Bubble" + +/datum/keybinding/emote/carbon/human/pop + linked_emote = /datum/emote/living/carbon/human/pop + name = "Pop" + /datum/keybinding/emote/carbon/human/monkey/can_use(client/C, mob/M) return ismonkeybasic(M) && ..() diff --git a/code/modules/mob/living/carbon/carbon_emote.dm b/code/modules/mob/living/carbon/carbon_emote.dm index 0c0f15d7161..5cbb7b12da6 100644 --- a/code/modules/mob/living/carbon/carbon_emote.dm +++ b/code/modules/mob/living/carbon/carbon_emote.dm @@ -188,3 +188,27 @@ if(. && isliving(user)) var/mob/living/L = user L.SetSleeping(2 SECONDS) + +/datum/emote/living/carbon/twirl + key = "twirl" + key_third_person = "twirls" + message = "twirls something around in their hand." + hands_use_check = TRUE + +/datum/emote/living/carbon/twirl/can_run_emote(mob/living/user, status_check, intentional) + . = ..() + if(!.) + return + + if(user.l_hand || user.r_hand) + return TRUE + + to_chat(user, "You need something in your hand to use this emote!") + return FALSE + +/datum/emote/living/carbon/twirl/run_emote(mob/user, params, type_override, intentional) + + var/obj/item/thing = user.l_hand || user.r_hand + message = "twirls [thing] around in their hand!" + . = ..() + message = initial(message) diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm index 4853edb7dce..24a65b83f1d 100644 --- a/code/modules/mob/living/carbon/human/human_emote.dm +++ b/code/modules/mob/living/carbon/human/human_emote.dm @@ -60,6 +60,32 @@ message = "raises an eyebrow." message_param = "raises an eyebrow at %t." +/datum/emote/living/carbon/human/wince + key = "wince" + key_third_person = "winces" + message = "winces." + message_param = "winces at %t." + +/datum/emote/living/carbon/human/squint + key = "squint" + key_third_person = "squints" + message = "squints." + message_param = "squints at %t." + +/datum/emote/living/carbon/human/facepalm + key = "facepalm" + key_third_person = "facepalms" + message = "facepalms." + hands_use_check = TRUE + sound = 'sound/weapons/slap.ogg' + emote_type = EMOTE_SOUND + volume = 50 + +/datum/emote/living/carbon/human/palm + key = "palm" + message = "extends their palm expectingly." + message_param = "extends their palm expectingly towards %t." + /datum/emote/living/carbon/human/grumble key = "grumble" key_third_person = "grumbles" @@ -622,6 +648,31 @@ return TRUE return FALSE +/datum/emote/living/carbon/human/bubble + key = "bubble" + key_third_person = "bubbles" + message = "bubbles." + message_param = "bubbles at %t." + emote_type = EMOTE_SOUND + age_based = TRUE + // Sound is CC-4.0 by Audiolarx + // Effect is cut out of original clip + // https://freesound.org/people/audiolarx/sounds/263945/ + sound = 'sound/effects/mob_effects/slime_bubble.ogg' + +/datum/emote/living/carbon/human/pop + key = "pop" + key_third_person = "pops" + message = "makes a popping sound." + message_param = "makes a popping sound at %t." + message_mime = "makes a silent pop." + emote_type = EMOTE_SOUND + age_based = TRUE + // CC0 + // https://freesound.org/people/greenvwbeetle/sounds/244653/ + sound = 'sound/effects/mob_effects/slime_pop.ogg' + volume = 50 + /datum/emote/living/carbon/human/howl key = "howl" key_third_person = "howls" diff --git a/sound/effects/mob_effects/slime_bubble.ogg b/sound/effects/mob_effects/slime_bubble.ogg new file mode 100644 index 00000000000..c8ca98ef7a1 Binary files /dev/null and b/sound/effects/mob_effects/slime_bubble.ogg differ diff --git a/sound/effects/mob_effects/slime_pop.ogg b/sound/effects/mob_effects/slime_pop.ogg new file mode 100644 index 00000000000..e1196fc29c0 Binary files /dev/null and b/sound/effects/mob_effects/slime_pop.ogg differ