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

Emote changes #1100

Merged
merged 4 commits into from
Mar 17, 2024
Merged

Emote changes #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65f1267
Some refactoring
m-dzianishchyts Mar 14, 2024
0900ca1
Croaks, more emotes in emote tab, refactoring
m-dzianishchyts Mar 14, 2024
ead3483
hehe
m-dzianishchyts Mar 14, 2024
628eb29
Polishing
m-dzianishchyts Mar 15, 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
7 changes: 6 additions & 1 deletion modular_ss220/_defines220/code/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
#define EMOTE_TWITCHS "Дёргаться"
#define EMOTE_WHIMPER "Хныкать"
#define EMOTE_WSMILE "Сдержанно улыбнуться"
#define EMOTE_EXERCISE "Упражнения"
#define EMOTE_SQUAT "Приседания"
#define EMOTE_PUSHUP "Отжимания"

/// Human Emotes
#define EMOTE_HUMAN_AIRGUITAR "Воображаемая гитара"
Expand Down Expand Up @@ -83,7 +86,9 @@
#define EMOTE_HUMAN_AFLAP "Махать крыльями агрессивно"
#define EMOTE_HUMAN_FLUTTER "Трепетать крыльями"
#define EMOTE_HUMAN_QUILL "Шуршать перьями"
#define EMOTE_HUMAN_WARBLE "Трель"
#define EMOTE_HUMAN_WARBLE "Трелить"
#define EMOTE_HUMAN_CROAK "Квакать"
#define EMOTE_HUMAN_CROAK_ANGER "Гневно квакать"
#define EMOTE_HUMAN_CLACK "Трещать"
#define EMOTE_HUMAN_CLICK "Щёлкать"
#define EMOTE_HUMAN_DRONE "Гудеть"
Expand Down
3 changes: 1 addition & 2 deletions modular_ss220/emotes/_emotes.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
#include "code/exercise/exercise_animation.dm"
#include "code/exercise/exercise_datum.dm"
#include "code/exercise/exercise_emotes.dm"
#include "code/emote_keybindings.dm"
#include "code/emote_panel_names.dm"
#include "code/emote_names.dm"
#include "code/emote_panel.dm"
#include "code/emote.dm"
#include "code/emote_verbs.dm"
Expand Down
Binary file added modular_ss220/emotes/audio/skrell/anger_1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/emotes/audio/skrell/anger_2.ogg
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions modular_ss220/emotes/audio/skrell/credit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
anger_1.ogg
CC4-BY-NC https://freesound.org/people/BiancaBothaPure/sounds/365671/

anger_2.ogg
CC0 https://freesound.org/people/BaDoink/sounds/522731/

warble_1.ogg
CC4-BY https://freesound.org/people/JPBILLINGSLEYJR/sounds/469364/

warble_2.ogg
CC0 https://freesound.org/people/D.jones/sounds/527846/

croak_1.ogg, croak_2.ogg, croak_3.ogg
CC4-BY https://freesound.org/people/juskiddink/sounds/99644/
Binary file added modular_ss220/emotes/audio/skrell/croak_1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/emotes/audio/skrell/croak_2.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/emotes/audio/skrell/croak_3.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/emotes/audio/skrell/warble_1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/emotes/audio/skrell/warble_2.ogg
View file
Open in desktop
Binary file not shown.
35 changes: 35 additions & 0 deletions modular_ss220/emotes/code/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,3 +357,38 @@
return FALSE

return TRUE

/datum/emote/living/carbon/human/warble/get_sound(mob/living/user)
return pick(
'modular_ss220/emotes/audio/skrell/warble_1.ogg',
'modular_ss220/emotes/audio/skrell/warble_2.ogg')

/datum/emote/living/carbon/human/croak
key = "croak"
key_third_person = "croak"
message = "квакает."
message_param = "квакает на %t."
emote_type = EMOTE_AUDIBLE
age_based = TRUE
species_type_whitelist_typecache = list(/datum/species/skrell)

/datum/emote/living/carbon/human/croak/get_sound(mob/living/user)
return pick(
'modular_ss220/emotes/audio/skrell/croak_1.ogg',
'modular_ss220/emotes/audio/skrell/croak_2.ogg',
'modular_ss220/emotes/audio/skrell/croak_3.ogg')

/datum/emote/living/carbon/human/croak/anger
key = "croak_anger"
key_third_person = "croak_anger"
message = "гневно квакает!"
message_param = "гневно квакает на %t."
emote_type = EMOTE_AUDIBLE
age_based = TRUE
volume = 80
species_type_whitelist_typecache = list(/datum/species/skrell)

/datum/emote/living/carbon/human/croak/anger/get_sound(mob/living/user)
return pick(
'modular_ss220/emotes/audio/skrell/anger_1.ogg',
'modular_ss220/emotes/audio/skrell/anger_2.ogg')
63 changes: 0 additions & 63 deletions modular_ss220/emotes/code/emote_keybindings.dm
View file
Open in desktop

This file was deleted.

112 changes: 96 additions & 16 deletions ...ar_ss220/emotes/code/emote_panel_names.dm → modular_ss220/emotes/code/emote_names.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,25 +148,25 @@

/// Emote Brain

/datum/emote/living/carbon/brain/alarm
/datum/emote/living/brain/alarm
name = EMOTE_BRAIN_ALARM

/datum/emote/living/carbon/brain/alert
/datum/emote/living/brain/alert
name = EMOTE_BRAIN_ALERT

/datum/emote/living/carbon/brain/flash
/datum/emote/living/brain/flash
name = EMOTE_BRAIN_FLASH

/datum/emote/living/carbon/brain/notice
/datum/emote/living/brain/notice
name = EMOTE_BRAIN_NOTICE

/datum/emote/living/carbon/brain/whistle
/datum/emote/living/brain/whistle
name = EMOTE_BRAIN_WHISTLE

/datum/emote/living/carbon/brain/beep
/datum/emote/living/brain/beep
name = EMOTE_BRAIN_BEEP

/datum/emote/living/carbon/brain/boop
/datum/emote/living/brain/boop
name = EMOTE_BRAIN_BOOP

// Emote Carbon
Expand Down Expand Up @@ -268,18 +268,12 @@
/datum/emote/living/carbon/sign/signal
name = EMOTE_HUMAN_SIGNAL

/datum/emote/living/carbon/human/flap
name = EMOTE_HUMAN_FLAP

/datum/emote/living/carbon/human/flutter
name = EMOTE_HUMAN_FLUTTER

/datum/emote/living/carbon/human/flap/aflap
name = EMOTE_HUMAN_AFLAP

/datum/emote/living/carbon/human/gasp
name = EMOTE_HUMAN_GASP

/datum/emote/living/carbon/human/shake
name = EMOTE_HUMAN_SHAKE

/datum/emote/living/carbon/human/grumble
name = EMOTE_HUMAN_GRUMBLE

Expand Down Expand Up @@ -340,9 +334,21 @@
/datum/emote/living/carbon/human/shrug
name = EMOTE_HUMAN_SHRUG

/datum/emote/living/carbon/human/sniff
name = EMOTE_HUMAN_SNIFF

/datum/emote/living/carbon/human/nod
name = EMOTE_HUMAN_NOD

/datum/emote/living/carbon/human/drask_talk/drone
name = EMOTE_HUMAN_DRONE

/datum/emote/living/carbon/human/drask_talk/hum
name = EMOTE_HUMAN_HUM

/datum/emote/living/carbon/human/drask_talk/rumble
name = EMOTE_HUMAN_RUMBLE

/datum/emote/living/carbon/human/monkey/gnarl
name = EMOTE_HUMAN_GNARL

Expand All @@ -352,6 +358,9 @@
/datum/emote/living/carbon/human/monkey/tail
name = EMOTE_HUMAN_TAIL

/datum/emote/living/carbon/human/monkey/scratch
name = EMOTE_HUMAN_SCRATCH

/// Emote Silicon

/datum/emote/living/silicon/scream
Expand Down Expand Up @@ -386,12 +395,48 @@

/// Species specific

/datum/emote/living/carbon/human/hiss
name = EMOTE_HUMAN_HISS

/datum/emote/living/carbon/human/creak
name = EMOTE_HUMAN_CREAK

/datum/emote/living/carbon/human/quill
name = EMOTE_HUMAN_QUILL

/datum/emote/living/carbon/human/warble
name = EMOTE_HUMAN_WARBLE

/datum/emote/living/carbon/human/croak
name = EMOTE_HUMAN_CROAK

/datum/emote/living/carbon/human/croak/anger
name = EMOTE_HUMAN_CROAK_ANGER

/datum/emote/living/carbon/human/clack
name = EMOTE_HUMAN_CLACK

/datum/emote/living/carbon/human/clack/click
name = EMOTE_HUMAN_CLICK

/datum/emote/living/carbon/human/flap
name = EMOTE_HUMAN_FLAP

/datum/emote/living/carbon/human/flutter
name = EMOTE_HUMAN_FLUTTER

/datum/emote/living/carbon/human/flap/aflap
name = EMOTE_HUMAN_AFLAP

/datum/emote/living/carbon/human/howl
name = EMOTE_HUMAN_HOWL

/datum/emote/living/carbon/human/growl
name = EMOTE_HUMAN_GROWL

/datum/emote/living/carbon/human/rattle
name = EMOTE_HUMAN_RATTLE

/datum/emote/living/carbon/human/slime/squish
name = EMOTE_HUMAN_SQUISH

Expand All @@ -401,6 +446,41 @@
/datum/emote/living/carbon/human/slime/pop
name = EMOTE_HUMAN_POP

/// Emote Animal

/datum/emote/living/simple_animal/gorilla/ooga
name = EMOTE_ANIMAL_OOGA

/datum/emote/living/simple_animal/diona_chirp
name = EMOTE_ANIMAL_CHIRP

/datum/emote/living/simple_animal/gorilla_ooga
name = EMOTE_ANIMAL_OOGA

/datum/emote/living/simple_animal/pet/dog/bark
name = EMOTE_ANIMAL_BARK

/datum/emote/living/simple_animal/pet/dog/yelp
name = EMOTE_ANIMAL_YELP

/datum/emote/living/simple_animal/pet/dog/growl
name = EMOTE_ANIMAL_GROWL

/datum/emote/living/simple_animal/mouse/squeak
name = EMOTE_ANIMAL_SQUEAK

/datum/emote/living/simple_animal/pet/cat/meow
name = EMOTE_ANIMAL_MEOW

/datum/emote/living/simple_animal/pet/cat/hiss
name = EMOTE_ANIMAL_HISS

/datum/emote/living/simple_animal/pet/cat/purr
name = EMOTE_ANIMAL_PURR

/datum/emote/living/simple_animal/pet/cat/sit
name = EMOTE_ANIMAL_SIT

/// New Emotes

/datum/emote/living/carbon/human/whistle
Expand Down
Loading
Loading