Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Emotes #10

Merged
merged 3 commits into from
Feb 18, 2022
Merged

Emotes #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
498c465
Adds the emotes
Jul 24, 2021
f9c4a39
Makes *whistle eardrum-friendly
Jul 25, 2021
f17a98b
Reverts *whistle because the XO doesn't like it
Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/emotes/definitions/_mob.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
/decl/emote/audible/alarm,
/decl/emote/audible/alert,
/decl/emote/audible/notice,
/decl/emote/audible/whistle,
/decl/emote/audible/synth,
/decl/emote/audible/boop,
/decl/emote/visible/blink,
Expand Down Expand Up @@ -163,7 +162,8 @@
/decl/emote/visible/rshoulder,
/decl/emote/visible/squint,
/decl/emote/visible/tfist,
/decl/emote/visible/tilt
/decl/emote/visible/tilt,
/decl/emote/audible/whistle
)

/mob/living/silicon/robot
Expand Down
8 changes: 6 additions & 2 deletions code/modules/emotes/definitions/_species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
/decl/emote/human/fastsway,
/decl/emote/human/swag,
/decl/emote/human/stopsway,
/decl/emote/audible/lizard_bellow
/decl/emote/visible/thump,
/decl/emote/audible/lizard_bellow,
/decl/emote/audible/lizard_hiss
)

/datum/species/unathi/yeosa
Expand All @@ -40,8 +42,10 @@
/decl/emote/human/fastsway,
/decl/emote/human/swag,
/decl/emote/human/stopsway,
/decl/emote/visible/thump,
/decl/emote/audible/lizard_bellow,
/decl/emote/audible/lizard_squeal
/decl/emote/audible/lizard_squeal,
/decl/emote/audible/lizard_hiss
)

/datum/species/nabber
Expand Down
11 changes: 9 additions & 2 deletions code/modules/emotes/definitions/audible.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
/decl/emote/audible/clap
key = "clap"
emote_message_3p = "USER claps."
emote_sound = 'sound/voice/clap.ogg'

/decl/emote/audible/chuckle
key = "chuckle"
Expand Down Expand Up @@ -194,10 +195,10 @@
emote_message_3p = "USER wheezes."

/decl/emote/audible/hiss
key ="hiss_"
key ="hiss"
emote_message_3p_target = "USER hisses softly at TARGET."
emote_message_3p = "USER hisses softly."

/decl/emote/audible/lizard_bellow
key = "bellow"
emote_message_3p_target = "USER bellows deeply at TARGET!"
Expand All @@ -208,3 +209,9 @@
key = "squeal"
emote_message_3p = "USER squeals."
emote_sound = 'sound/voice/LizardSqueal.ogg'

/decl/emote/audible/lizard_hiss
key = "hiss"
emote_message_3p_target = "USER hisses at TARGET!"
emote_message_3p = "USER hisses!"
emote_sound = 'sound/voice/LizardHiss.ogg'
7 changes: 6 additions & 1 deletion code/modules/emotes/definitions/visible.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,4 +331,9 @@

/decl/emote/visible/tilt
key = "tilt"
emote_message_3p = "USER tilts USER_THEIR head."
emote_message_3p = "USER tilts USER_THEIR head."

/decl/emote/visible/thump
key = "thump"
emote_message_3p_target = "USER thumps USER_THEIR tail against the ground."
emote_message_3p = "USER thumps USER_THEIR tail against the ground."
Binary file added sound/voice/LizardHiss.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/voice/clap.ogg
View file
Open in desktop
Binary file not shown.