IPCs can slowclap, MMIs can use silicon emotes

BeeStation · Dec 16, 2024 · 98ae438 · 98ae438
1 parent 04073e1
commit 98ae438
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
@@ -335,6 +335,16 @@
 	if(..())
 		playsound(user.loc, 'sound/emotes/dwoop.ogg', 50)
 
+/datum/emote/living/carbon/human/robot_tongue/slowclap
+	key = "slowclap"
+	key_third_person = "activates their slow clap processor."
+	message = "activates their slow clap processor."
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/carbon/human/robot_tongue/slowclap/run_emote(mob/user, params)
+	if(..())
+		playsound(user.loc, 'sound/machines/slowclap.ogg', 50)
+
 // Clown Robotic Tongue ONLY. Henk.
 
 /datum/emote/living/carbon/human/robot_tongue/clown/can_run_emote(mob/user, status_check = TRUE , intentional)

diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
@@ -1,5 +1,5 @@
 /datum/emote/silicon
-	mob_type_allowed_typecache = list(/mob/living/silicon, /mob/living/simple_animal/hostile/mining_drone)
+	mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon, /mob/living/simple_animal/hostile/mining_drone)
 	emote_type = EMOTE_AUDIBLE
 
 /datum/emote/silicon/boop
@@ -58,5 +58,5 @@
 
 /datum/emote/silicon/slowclap
 	key = "slowclap"
-	message = "activates their slow clap processor."
+	message = "activates its slow clap processor."
 	sound = 'sound/machines/slowclap.ogg'