diff --git a/code/datums/keybindings/emote_keybinds.dm b/code/datums/keybindings/emote_keybinds.dm index 851cde58f96..afd3013c759 100644 --- a/code/datums/keybindings/emote_keybinds.dm +++ b/code/datums/keybindings/emote_keybinds.dm @@ -509,8 +509,8 @@ linked_emote = /datum/emote/living/carbon/human/creak name = "Creak" -/datum/keybinding/emote/carbon/human/squish - linked_emote = /datum/emote/living/carbon/human/squish +/datum/keybinding/emote/carbon/human/slime/squish + linked_emote = /datum/emote/living/carbon/human/slime/squish name = "Squish" /datum/keybinding/emote/carbon/human/howl @@ -534,11 +534,11 @@ name = "Rattle" /datum/keybinding/emote/carbon/human/bubble - linked_emote = /datum/emote/living/carbon/human/bubble + linked_emote = /datum/emote/living/carbon/human/slime/bubble name = "Bubble" /datum/keybinding/emote/carbon/human/pop - linked_emote = /datum/emote/living/carbon/human/pop + linked_emote = /datum/emote/living/carbon/human/slime/pop name = "Pop" /datum/keybinding/emote/carbon/human/monkey/can_use(client/C, mob/M) diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm index 24a65b83f1d..4497ce32271 100644 --- a/code/modules/mob/living/carbon/human/human_emote.dm +++ b/code/modules/mob/living/carbon/human/human_emote.dm @@ -625,17 +625,10 @@ species_type_whitelist_typecache = list(/datum/species/diona) sound = "sound/voice/dionatalk1.ogg" -/datum/emote/living/carbon/human/squish - key = "squish" - key_third_person = "squishes" - message = "squishes." - message_param = "squishes at %t." - emote_type = EMOTE_SOUND - age_based = TRUE - // Credit to DrMinky (freesound.org) for the sound. - sound = "sound/effects/slime_squish.ogg" +/datum/emote/living/carbon/human/slime -/datum/emote/living/carbon/human/squish/can_run_emote(mob/user, status_check, intentional) + +/datum/emote/living/carbon/human/slime/can_run_emote(mob/user, status_check, intentional) . = ..() if(!.) return FALSE @@ -648,7 +641,17 @@ return TRUE return FALSE -/datum/emote/living/carbon/human/bubble +/datum/emote/living/carbon/human/slime/squish + key = "squish" + key_third_person = "squishes" + message = "squishes." + message_param = "squishes at %t." + emote_type = EMOTE_SOUND + age_based = TRUE + // Credit to DrMinky (freesound.org) for the sound. + sound = "sound/effects/slime_squish.ogg" + +/datum/emote/living/carbon/human/slime/bubble key = "bubble" key_third_person = "bubbles" message = "bubbles." @@ -660,7 +663,7 @@ // https://freesound.org/people/audiolarx/sounds/263945/ sound = 'sound/effects/mob_effects/slime_bubble.ogg' -/datum/emote/living/carbon/human/pop +/datum/emote/living/carbon/human/slime/pop key = "pop" key_third_person = "pops" message = "makes a popping sound."