From 04073e143e5a925c1c6a44a8567ce7155c3dfb85 Mon Sep 17 00:00:00 2001 From: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com> Date: Mon, 16 Dec 2024 03:47:38 -0600 Subject: [PATCH 1/2] initial --- code/modules/mob/living/silicon/robot/emote.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 78adc62be2144..b8e01922ba890 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -55,3 +55,8 @@ key = "warn" message = "blares an alarm!" sound = 'sound/machines/warning-buzzer.ogg' + +/datum/emote/silicon/slowclap + key = "slowclap" + message = "activates their slow clap processor." + sound = 'sound/machines/slowclap.ogg' From 98ae43860218990ead3b24724cd3607b197a96ea Mon Sep 17 00:00:00 2001 From: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com> Date: Mon, 16 Dec 2024 14:55:01 -0600 Subject: [PATCH 2/2] IPCs can slowclap, MMIs can use silicon emotes --- code/modules/mob/living/carbon/human/emote.dm | 10 ++++++++++ code/modules/mob/living/silicon/robot/emote.dm | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 953f5ee00dbee..dfcd53ef37147 100644 --- 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 index b8e01922ba890..a0eddb1a65fbe 100644 --- 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'