Skip to content
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

TG emotes in emote panel #920

Merged
merged 6 commits into from
Dec 29, 2024
Merged

TG emotes in emote panel #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4da503
Initial commit
Chorden523 Dec 26, 2024
6508188
Removes alphabet sorting
Chorden523 Dec 26, 2024
01dd6d5
Absolutely removes all alphabet sorting
Chorden523 Dec 26, 2024
cf30867
No more alphabet sorting
Chorden523 Dec 26, 2024
d8c2c21
Compilataion returns
Chorden523 Dec 26, 2024
8e93114
Fix compilation
Chorden523 Dec 26, 2024
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
22 changes: 17 additions & 5 deletions modular_bandastation/emote_panel/code/_emote_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@
#define EMOTE_BURP "Рыгнуть"
#define EMOTE_CHOKE "Подавиться"
#define EMOTE_COLLAPSE "Рухнуть"
#define EMOTE_CROSS "Скрестить руки"
#define EMOTE_DANCE "Танцевать"
#define EMOTE_JUMP "Прыгнуть"
#define EMOTE_DEATHGASP "Предсмертный вздох"
#define EMOTE_DROOL "Пускать слюни"
#define EMOTE_QUIVER "Трепетать"
#define EMOTE_FROWN "Смотреть в недоумении"
#define EMOTE_GAG "Вырвать"
#define EMOTE_GLARE "Смотреть с ненавистью"
#define EMOTE_GRIN "Оскалиться в улыбке"
#define EMOTE_GAG "Потужиться"
#define EMOTE_GLARE "Сверлить взглядом"
#define EMOTE_GRIN "Ухмыльнуться"
#define EMOTE_GRIMACE "Скорчить рожицу"
#define EMOTE_GROAN "Болезненный вздох"
#define EMOTE_GROAN "Болезненный стон"
#define EMOTE_LOOK "Посмотреть"
#define EMOTE_BSHAKE "Трястись"
#define EMOTE_SHUDDER "Содрогаться"
Expand All @@ -27,9 +28,10 @@
#define EMOTE_SHIVER "Дрожать"
#define EMOTE_SIGH "Вздыхать"
#define EMOTE_SIGH_HAPPY "Удовлетворённо вздыхать"
#define EMOTE_SING_TUNE "Подпевать"
#define EMOTE_SIT "Сесть"
#define EMOTE_SMILE "Улыбнуться"
#define EMOTE_SMUG "Ухмыляться"
#define EMOTE_SMUG "Самодовольно улыбнуться"
#define EMOTE_SNIFF "Шмыгать носом"
#define EMOTE_SNORE "Храпеть"
#define EMOTE_NIGHTMARE "Ворочаться во сне"
Expand All @@ -38,6 +40,7 @@
#define EMOTE_SULK "Обидеться"
#define EMOTE_SWAY "Качаться на месте"
#define EMOTE_SWEAR "Ругнуться"
#define EMOTE_SURRENDER "Сдаться"
#define EMOTE_TILT "Наклонить голову"
#define EMOTE_TREMBLE "Дрожать в ужасе"
#define EMOTE_TWITCH "Сильно дёргаться"
Expand All @@ -47,6 +50,7 @@
#define EMOTE_EXERCISE "Упражнения"
#define EMOTE_SQUAT "Приседания"
#define EMOTE_PUSHUP "Отжимания"
#define EMOTE_TAUNT "Дразнить"

/// Human Emotes
#define EMOTE_HUMAN_AIRGUITAR "Воображаемая гитара"
Expand All @@ -61,6 +65,7 @@
#define EMOTE_HUMAN_NOD "Кивнуть"
#define EMOTE_HUMAN_PALM "Протянуть руку"
#define EMOTE_HUMAN_SCREAM "Кричать"
#define EMOTE_HUMAN_SHOCK_GASP "Вздох (шок)"
#define EMOTE_HUMAN_GASP "Задыхаться"
#define EMOTE_HUMAN_SHAKE "Мотать головой"
#define EMOTE_HUMAN_PALE "Бледнеть"
Expand All @@ -76,6 +81,7 @@
#define EMOTE_HUMAN_WINCE "Морщиться"
#define EMOTE_HUMAN_SQUINT "Прищуриться"
#define EMOTE_HUMAN_WINK "Подмигнуть"
#define EMOTE_HUMAN_GLASSES "Приподнять очки"
#define EMOTE_HUMAN_HIGHFIVE "Дать пять"
#define EMOTE_HUMAN_HANDSHAKE "Пожать руку"
#define EMOTE_HUMAN_SNAP "Щёлкнуть пальцами"
Expand All @@ -85,6 +91,8 @@
#define EMOTE_HUMAN_WAG_STOP "Перестать махать хвостом"
#define EMOTE_HUMAN_FLAP "Махать крыльями"
#define EMOTE_HUMAN_AFLAP "Махать крыльями агрессивно"
#define EMOTE_HUMAN_WING "Расправить крылья"
#define EMOTE_HUMAN_CLEAR_THROAT "Прочистить горло"
#define EMOTE_HUMAN_FLUTTER "Трепетать крыльями"
#define EMOTE_HUMAN_QUILL "Шуршать перьями"
#define EMOTE_HUMAN_WARBLE "Трелить"
Expand Down Expand Up @@ -134,6 +142,10 @@
#define EMOTE_CARBON_INHALE "Вдохнуть"
#define EMOTE_CARBON_INHALE_SHARP "Глубоко вдохнуть"
#define EMOTE_CARBON_KISS "Поцеловать"
#define EMOTE_CARBON_HAND "Приготовить руку"
#define EMOTE_CARBON_NOOGIE "Дать леща"
#define EMOTE_CARBON_CIRCLE "Сделать кольцо из пальцев"
#define EMOTE_CARBON_SHOESTEAL "Украсть обувь"
#define EMOTE_CARBON_WAVE "Махать"
#define EMOTE_CARBON_YAWN "Зевать"
#define EMOTE_CARBON_EXHALE "Выдохнуть"
Expand Down
164 changes: 152 additions & 12 deletions modular_bandastation/emote_panel/code/emote_verbs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,26 @@
set category = "Эмоции"
emote("moan", intentional = TRUE)

/mob/living/carbon/human/verb/emote_deathgasp()
set name = "▷ " + EMOTE_DEATHGASP + " "
set category = "Эмоции"
emote("deathgasp", intentional = TRUE)

/mob/living/carbon/human/verb/emote_gasp_shock()
set name = "▷ " + EMOTE_HUMAN_SHOCK_GASP + " "
set category = "Эмоции"
emote("gaspshock", intentional = TRUE)

/mob/living/carbon/human/verb/emote_gasp()
set name = "▷ " + EMOTE_HUMAN_GASP + " "
set category = "Эмоции"
emote("gasp", intentional = TRUE)

/mob/living/carbon/human/verb/emote_hiss()
set name = "▷ " + EMOTE_HUMAN_HISS + " "
set category = "Эмоции"
emote("hiss", intentional = TRUE)

/mob/living/carbon/human/verb/emote_sigh()
set name = "▷ " + EMOTE_SIGH + " "
set category = "Эмоции"
Expand Down Expand Up @@ -79,6 +94,11 @@
set category = "Эмоции"
emote("snap", intentional = TRUE)

/mob/living/carbon/human/verb/emote_crack()
set name = "▷ " + EMOTE_HUMAN_CRACK + " "
set category = "Эмоции"
emote("crack", intentional = TRUE)

/mob/living/carbon/human/verb/emote_clap()
set name = "▷ " + EMOTE_HUMAN_CLAP + " "
set category = "Эмоции"
Expand Down Expand Up @@ -125,11 +145,6 @@
set category = "Эмоции"
emote("faint", intentional = TRUE)

/mob/living/carbon/human/verb/emote_highfive()
set name = "○ " + EMOTE_HUMAN_HIGHFIVE + " "
set category = "Эмоции"
emote("highfive", intentional = TRUE)

/mob/living/carbon/human/verb/emote_handshake()
set name = "○ " + EMOTE_HUMAN_HANDSHAKE + " "
set category = "Эмоции"
Expand All @@ -140,6 +155,66 @@
set category = "Эмоции"
emote("flip", intentional = TRUE)

/mob/living/carbon/human/verb/emote_spin()
set name = "○ " + EMOTE_SPIN + " "
set category = "Эмоции"
emote("spin", intentional = TRUE)

/mob/living/carbon/human/verb/emote_circle()
set name = "○ " + EMOTE_CARBON_CIRCLE + " "
set category = "Эмоции"
emote("circle", intentional = TRUE)

/mob/living/carbon/human/verb/emote_glasses()
set name = "○ " + EMOTE_HUMAN_GLASSES + " "
set category = "Эмоции"
emote("glasses", intentional = TRUE)

/mob/living/carbon/human/verb/emote_hand()
set name = "○ " + EMOTE_CARBON_HAND + " "
set category = "Эмоции"
emote("hand", intentional = TRUE)

/mob/living/carbon/human/verb/emote_kiss()
set name = "○ " + EMOTE_CARBON_KISS + " "
set category = "Эмоции"
emote("kiss", intentional = TRUE)

/mob/living/carbon/human/verb/emote_noogie()
set name = "○ " + EMOTE_CARBON_NOOGIE + " "
set category = "Эмоции"
emote("noogie", intentional = TRUE)

/mob/living/carbon/human/verb/emote_shoesteal()
set name = "○ " + EMOTE_CARBON_SHOESTEAL + " "
set category = "Эмоции"
emote("shoesteal", intentional = TRUE)

/mob/living/carbon/human/verb/emote_surrender()
set name = "○ " + EMOTE_SURRENDER + " "
set category = "Эмоции"
emote("surrender", intentional = TRUE)

/mob/living/carbon/human/verb/emote_sway()
set name = "○ " + EMOTE_SWAY + " "
set category = "Эмоции"
emote("sway", intentional = TRUE)

/mob/living/carbon/human/verb/emote_swear()
set name = "◦ " + EMOTE_SWEAR + " "
set category = "Эмоции"
emote("swear", intentional = TRUE)

/mob/living/carbon/human/verb/emote_taunt()
set name = "○ " + EMOTE_TAUNT + " "
set category = "Эмоции"
emote("taunt", intentional = TRUE)

/mob/living/carbon/human/verb/emote_wing()
set name = "○ " + EMOTE_HUMAN_WING + " "
set category = "Эмоции"
emote("wing", intentional = TRUE)

/mob/living/carbon/human/verb/emote_dance()
set name = "○ " + EMOTE_DANCE + " "
set category = "Эмоции"
Expand Down Expand Up @@ -181,11 +256,51 @@
set category = "Эмоции"
emote("chuckle", intentional = TRUE)

/mob/living/carbon/human/verb/emote_clear_throat()
set name = "◦ " + EMOTE_HUMAN_CLEAR_THROAT + " "
set category = "Эмоции"
emote("clear", intentional = TRUE)

/mob/living/carbon/human/verb/emote_cross()
set name = "◦ " + EMOTE_CROSS + " "
set category = "Эмоции"
emote("cross", intentional = TRUE)

/mob/living/carbon/human/verb/emote_dap()
set name = "◦ " + EMOTE_HUMAN_DAP + " "
set category = "Эмоции"
emote("dap", intentional = TRUE)

/mob/living/carbon/human/verb/emote_sing_tune()
set name = "◦ " + EMOTE_SING_TUNE + " "
set category = "Эмоции"
emote("tunesing", intentional = TRUE)

/mob/living/carbon/human/verb/emote_sit()
set name = "◦ " + EMOTE_SIT + " "
set category = "Эмоции"
emote("sit", intentional = TRUE)

/mob/living/carbon/human/verb/emote_drool()
set name = "◦ " + EMOTE_DROOL + " "
set category = "Эмоции"
emote("drool", intentional = TRUE)

/mob/living/carbon/human/verb/emote_exhale()
set name = "◦ " + EMOTE_CARBON_EXHALE + " "
set category = "Эмоции"
emote("exhale", intentional = TRUE)

/mob/living/carbon/human/verb/emote_gag()
set name = "◦ " + EMOTE_GAG + " "
set category = "Эмоции"
emote("gag", intentional = TRUE)

/mob/living/carbon/human/verb/emote_grimace()
set name = "◦ " + EMOTE_GRIMACE + " "
set category = "Эмоции"
emote("grimace", intentional = TRUE)

/mob/living/carbon/human/verb/emote_frown()
set name = "◦ " + EMOTE_FROWN + " "
set category = "Эмоции"
Expand Down Expand Up @@ -221,12 +336,12 @@
set category = "Эмоции"
emote("smile", intentional = TRUE)

/mob/living/carbon/human/verb/emote_snuffle()
set name = "◦ " + EMOTE_HUMAN_SNUFFLE + " "
/mob/living/carbon/human/verb/emote_smug()
set name = "◦ " + EMOTE_SMUG + " "
set category = "Эмоции"
emote("snuffle", intentional = TRUE)
emote("smug", intentional = TRUE)

/mob/living/carbon/human/verb/emote_grunt()
/mob/living/carbon/human/verb/emote_grumble()
set name = "◦ " + EMOTE_HUMAN_GRUMBLE + " "
set category = "Эмоции"
emote("grumble", intentional = TRUE)
Expand All @@ -241,6 +356,11 @@
set category = "Эмоции"
emote("stare", intentional = TRUE)

/mob/living/carbon/human/verb/emote_sulk()
set name = "◦ " + EMOTE_SULK + " "
set category = "Эмоции"
emote("sulk", intentional = TRUE)

/mob/living/carbon/human/verb/emote_tremble()
set name = "◦ " + EMOTE_TREMBLE + " "
set category = "Эмоции"
Expand All @@ -261,6 +381,21 @@
set category = "Эмоции"
emote("eyebrow", intentional = TRUE)

/mob/living/carbon/human/verb/emote_gurgle()
set name = "◦ " + EMOTE_CARBON_GURGLE + " "
set category = "Эмоции"
emote("gurgle", intentional = TRUE)

/mob/living/carbon/human/verb/emote_hug()
set name = "◦ " + EMOTE_HUMAN_HUG + " "
set category = "Эмоции"
emote("hug", intentional = TRUE)

/mob/living/carbon/human/verb/emote_inhale()
set name = "◦ " + EMOTE_CARBON_INHALE + " "
set category = "Эмоции"
emote("inhale", intentional = TRUE)

/mob/living/carbon/human/verb/emote_airguitar()
set name = "◦ " + EMOTE_HUMAN_AIRGUITAR + " "
set category = "Эмоции"
Expand All @@ -286,10 +421,10 @@
set category = "Эмоции"
emote("pale", intentional = TRUE)

/mob/living/carbon/human/verb/emote_bshake()
set name = "◦ " + EMOTE_BSHAKE + " "
/mob/living/carbon/human/verb/emote_pout()
set name = "◦ " + EMOTE_POUT + " "
set category = "Эмоции"
emote("bshake", intentional = TRUE)
emote ("pout", intentional = TRUE)

/mob/living/carbon/human/proc/emote_flap()
set name = "◦ " + EMOTE_HUMAN_FLAP + " "
Expand All @@ -301,6 +436,11 @@
set category = "Эмоции"
emote("aflap", intentional = TRUE)

/mob/living/carbon/human/verb/emote_scowl()
set name = "◦ " + EMOTE_CARBON_SCOWL + " "
set category = "Эмоции"
emote("scowl", intentional = TRUE)

/mob/living/carbon/human/proc/emote_wag()
set name = "◦ " + EMOTE_HUMAN_WAG + " "
set category = "Эмоции"
Expand Down
4 changes: 4 additions & 0 deletions modular_bandastation/emote_panel/code/emotes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
else
return 'modular_bandastation/emote_panel/audio/male/sniff_male.ogg'

/datum/emote/living/carbon/scratch/New()
mob_type_allowed_typecache += list(/mob/living/carbon/human)
. = ..()

// Vulpkanin

/datum/emote/living/carbon/human/vulpkanin/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
Expand Down
1 change: 1 addition & 0 deletions modular_bandastation/translations/code/translation_data/ru_emotes.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"grumbles!" = "ворчит!"
"gurgles silently and uncomfortably." = "бесшумно и неприятно булькает."
"hisses softly." = "тихо шипит."
"hisses!" = "шипит!"
"hisses." = "шипит."
"honks happily!" = "радостно гудит!"
"honks." = "гудит."
Expand Down
Loading