cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 01:53:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds some fresh new emotes (#21828)

Browse Source 
* Adds some fresh emotes

* Adds necessary keybinds

* oops

* to_chat moment

* but here's the Thing

* Update code/modules/mob/living/carbon/human/human_emote.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Add missing name

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Luc
2023-08-16 12:04:11 -07:00
committed by GitHub
parent 3db565f553
commit b7f0f60364
5 changed files with 103 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_emote.dm
+24
View File
@@ -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, "<span class='warning'>You need something in your hand to use this emote!</span>")
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)
code/modules/mob/living/carbon/human/human_emote.dm
+51
View File
@@ -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"