diff --git a/modular_nova/modules/emote_panel/code/emote_panel.dm b/modular_nova/modules/emote_panel/code/emote_panel.dm index 0ed01bdbec3..d7bb02996e2 100644 --- a/modular_nova/modules/emote_panel/code/emote_panel.dm +++ b/modular_nova/modules/emote_panel/code/emote_panel.dm @@ -169,6 +169,11 @@ /mob/living/proc/emote_teshsqueak, /mob/living/proc/emote_teshtrill, /mob/living/proc/emote_gecker, + // TFF ADDITION START + /mob/living/proc/emote_alli_growl, + /mob/living/proc/emote_alli_hiss, + /mob/living/proc/emote_alli_call, + // TFF ADDITION END ) all_emotes += nova_living_emotes diff --git a/tff_modular/modules/emotes/emotes.dm b/tff_modular/modules/emotes/emotes.dm new file mode 100644 index 00000000000..6dca234e9b4 --- /dev/null +++ b/tff_modular/modules/emotes/emotes.dm @@ -0,0 +1,38 @@ +/mob/living/proc/emote_alli_growl() + set name = "> Alli Growl" + set category = "Emotes+" + usr.emote("alligrowl", intentional = TRUE) + +/mob/living/proc/emote_alli_hiss() + set name = "> Alli Hiss" + set category = "Emotes+" + usr.emote("allihiss", intentional = TRUE) + +/mob/living/proc/emote_alli_call() + set name = "> Alli Call" + set category = "Emotes+" + usr.emote("allicall", intentional = TRUE) + +/datum/emote/living/alligrowl + key = "Alli Growl" + key_third_person = "alligrowl" + message = "Growls Intensively!" + emote_type = EMOTE_AUDIBLE + vary = TRUE + sound = 'tff_modular/modules/emotes/sounds/alli_growl.ogg' + +/datum/emote/living/allihiss + key = "Alli Hiss" + key_third_person = "allihiss" + message = "Hisses deeply!" + emote_type = EMOTE_AUDIBLE + vary = TRUE + sound = 'tff_modular/modules/emotes/sounds/alli_hiss.ogg' + +/datum/emote/living/allicall + key = "Alli Call" + key_third_person = "allicall" + message = "Shortly calls!" + emote_type = EMOTE_AUDIBLE + vary = TRUE + sound = 'tff_modular/modules/emotes/sounds/alli_call.ogg' diff --git a/tff_modular/modules/emotes/sounds/alli_call.ogg b/tff_modular/modules/emotes/sounds/alli_call.ogg new file mode 100644 index 00000000000..8278622c363 Binary files /dev/null and b/tff_modular/modules/emotes/sounds/alli_call.ogg differ diff --git a/tff_modular/modules/emotes/sounds/alli_growl.ogg b/tff_modular/modules/emotes/sounds/alli_growl.ogg new file mode 100644 index 00000000000..22d5e1e556b Binary files /dev/null and b/tff_modular/modules/emotes/sounds/alli_growl.ogg differ diff --git a/tff_modular/modules/emotes/sounds/alli_hiss.ogg b/tff_modular/modules/emotes/sounds/alli_hiss.ogg new file mode 100644 index 00000000000..c3a3c99b457 Binary files /dev/null and b/tff_modular/modules/emotes/sounds/alli_hiss.ogg differ diff --git a/tff_modular/modules/mutant_parts/code/snouts.dm b/tff_modular/modules/mutant_parts/code/snouts.dm new file mode 100644 index 00000000000..e3a7f7f129c --- /dev/null +++ b/tff_modular/modules/mutant_parts/code/snouts.dm @@ -0,0 +1,4 @@ +/datum/sprite_accessory/snouts/mammal/noodle + name = "Noodle" + icon_state = "noodle" + icon = 'tff_modular/modules/mutant_parts/icons/snouts.dmi' diff --git a/tff_modular/modules/mutant_parts/icons/snouts.dmi b/tff_modular/modules/mutant_parts/icons/snouts.dmi new file mode 100644 index 00000000000..4516b8752a9 Binary files /dev/null and b/tff_modular/modules/mutant_parts/icons/snouts.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 2b91e359fb5..f5da4fac121 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9833,6 +9833,7 @@ #include "tff_modular\modules\drinks\skrelluq\reaction.dm" #include "tff_modular\modules\drinks\skrelluq\reagent.dm" #include "tff_modular\modules\drone\code\droneDispenser.dm" +#include "tff_modular\modules\emotes\emotes.dm" #include "tff_modular\modules\eventers\eventmaker.dm" #include "tff_modular\modules\eventers\eventmaker_verbs.dm" #include "tff_modular\modules\eventers\random_stuff_ban.dm" @@ -9858,6 +9859,7 @@ #include "tff_modular\modules\map_vote_fair\map_vote.dm" #include "tff_modular\modules\modular_automapper\automapper.dm" #include "tff_modular\modules\modular_automapper\replacer.dm" +#include "tff_modular\modules\mutant_parts\code\snouts.dm" #include "tff_modular\modules\nabbers\code\_nabbers.dm" #include "tff_modular\modules\nabbers\code\nabber_bodyparts.dm" #include "tff_modular\modules\nabbers\code\nabber_bolaimmunity.dm"