diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index f304cbbc400..99739279d85 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -63,9 +63,3 @@ message = "blares an alarm!" emote_type = EMOTE_AUDIBLE sound = 'sound/machines/warning-buzzer.ogg' - -/datum/emote/silicon/slowclap - key = "slowclap" - message = "activates their slow clap processor." - emote_type = EMOTE_AUDIBLE - sound = 'sound/machines/slowclap.ogg' diff --git a/modular_skyrat/modules/emote_panel/code/emote_panel.dm b/modular_skyrat/modules/emote_panel/code/emote_panel.dm index 485fef9ad18..58396cdb983 100644 --- a/modular_skyrat/modules/emote_panel/code/emote_panel.dm +++ b/modular_skyrat/modules/emote_panel/code/emote_panel.dm @@ -147,7 +147,8 @@ /mob/living/proc/emote_purr, /mob/living/proc/emote_moo, /mob/living/proc/emote_honk1, - /mob/living/proc/emote_mggaow + /mob/living/proc/emote_mggaow, + /mob/living/proc/emote_slowclap ) all_emotes += skyrat_living_emotes @@ -184,7 +185,6 @@ /mob/living/proc/emote_ping, /mob/living/proc/emote_sad, /mob/living/proc/emote_warn, - /mob/living/proc/emote_slowclap ) all_emotes += synth_emotes var/static/list/allowed_species_synth = list( @@ -723,6 +723,11 @@ set category = "Emotes+" usr.emote("clap1", intentional = TRUE) +/mob/living/proc/emote_slowclap() + set name = "> Slow Clap" + set category = "Emotes" + usr.emote("slowclap", intentional = TRUE) + /mob/living/proc/emote_headtilt() set name = "~ Head Hilt" set category = "Emotes+" @@ -978,11 +983,6 @@ set category = "Emotes" usr.emote("warn", intentional = TRUE) -/mob/living/proc/emote_slowclap() - set name = "< Slow Clap >" - set category = "Emotes" - usr.emote("slowclap", intentional = TRUE) - // modular_skyrat\modules\emotes\code\additionalemotes\overlay_emote.dm /mob/living/proc/emote_sweatdrop() set name = "| Sweatdrop |" diff --git a/modular_skyrat/modules/emotes/code/emotes.dm b/modular_skyrat/modules/emotes/code/emotes.dm index d7fff1a7349..f7a690feb6a 100644 --- a/modular_skyrat/modules/emotes/code/emotes.dm +++ b/modular_skyrat/modules/emotes/code/emotes.dm @@ -275,6 +275,12 @@ return pick('modular_zubbers/sound/emotes/claponce1.ogg', 'modular_zubbers/sound/emotes/claponce2.ogg') +/datum/emote/living/slowclap + key = "slowclap" + message = "activates their slow clap processor." + emote_type = EMOTE_AUDIBLE + sound = 'sound/machines/slowclap.ogg' + /datum/emote/living/clap1/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional) if(!istype(user) || user.usable_hands < 2) return FALSE