Skip to content

Бомбардиро Крокадило #5829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Saukykouko wants to merge 1 commit into from
Closed

Бомбардиро Крокадило #5829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions modular_nova/modules/emote_panel/code/emote_panel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
38 changes: 38 additions & 0 deletions tff_modular/modules/emotes/emotes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Binary file added tff_modular/modules/emotes/sounds/alli_call.ogg
View file
Open in desktop
Binary file not shown.
Binary file added tff_modular/modules/emotes/sounds/alli_growl.ogg
View file
Open in desktop
Binary file not shown.
Binary file added tff_modular/modules/emotes/sounds/alli_hiss.ogg
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions tff_modular/modules/mutant_parts/code/snouts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/sprite_accessory/snouts/mammal/noodle
name = "Noodle"
icon_state = "noodle"
icon = 'tff_modular/modules/mutant_parts/icons/snouts.dmi'
Binary file added tff_modular/modules/mutant_parts/icons/snouts.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down