Emotes (#10)

* Adds the emotes thump * Makes *whistle eardrum-friendly * Reverts *whistle because the XO doesn't like it Co-authored-by: super12pl <[email protected]>
That0nePerson · Feb 18, 2022 · af7de3d · af7de3d
1 parent c4963c0
commit af7de3d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/code/modules/emotes/definitions/_mob.dm b/code/modules/emotes/definitions/_mob.dm
@@ -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,
@@ -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

diff --git a/code/modules/emotes/definitions/_species.dm b/code/modules/emotes/definitions/_species.dm
@@ -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
@@ -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

diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm
@@ -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"
@@ -189,10 +190,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!"
@@ -203,3 +204,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'
diff --git a/code/modules/emotes/definitions/visible.dm b/code/modules/emotes/definitions/visible.dm
@@ -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."
diff --git a/sound/voice/LizardHiss.ogg b/sound/voice/LizardHiss.ogg
diff --git a/sound/voice/clap.ogg b/sound/voice/clap.ogg