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

fix: unathi's whip/s emote #874

Merged
merged 4 commits into from
Dec 18, 2023
Merged

fix: unathi's whip/s emote #874

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
b725d9a
add/fix unathi whip/s emote
Rerik007 Dec 18, 2023
16e5ed8
I got it mixed up
Rerik007 Dec 18, 2023
77e2451
wow, i must keybind this
Rerik007 Dec 18, 2023
c36ab8e
Apply suggestions from code review
Rerik007 Dec 18, 2023
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
Binary file added modular_ss220/emotes/audio/unathi/whip_short_unathi.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/emotes/audio/unathi/whip_unathi.ogg
View file
Open in desktop
Binary file not shown.
29 changes: 29 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 @@ -328,3 +328,32 @@
'modular_ss220/emotes/audio/kidan/wiggles_kidan_2.ogg',
'modular_ss220/emotes/audio/kidan/wiggles_kidan_3.ogg')

/datum/emote/living/carbon/human/whip
key = "whip"
key_third_person = "whip"
message = "ударяет хвостом."
message_mime = "взмахивает хвостом и бесшумно опускает его на пол."
message_postfix = ", грозно смотря на %t."
message_param = EMOTE_PARAM_USE_POSTFIX
species_type_whitelist_typecache = list(/datum/species/unathi)
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
volume = 75
audio_cooldown = 3 SECONDS
sound = 'modular_ss220/emotes/audio/unathi/whip_short_unathi.ogg'

/datum/emote/living/carbon/human/whip/whip_l
key = "whips"
key_third_person = "whips"
message = "хлестает хвостом."
species_type_whitelist_typecache = list(/datum/species/unathi)
audio_cooldown = 6 SECONDS
sound = 'modular_ss220/emotes/audio/unathi/whip_unathi.ogg'

/datum/emote/living/carbon/human/whip/can_run_emote(mob/user, status_check = TRUE, intentional)
if(!..())
return FALSE

if(!can_wag(user))
return FALSE

return TRUE
8 changes: 8 additions & 0 deletions modular_ss220/emotes/code/emote_keybindings.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,11 @@
/datum/keybinding/emote/carbon/human/wiggles
linked_emote = /datum/emote/living/carbon/human/wiggles
name = "Шевелить усиками"

/datum/keybinding/emote/carbon/human/whip_l
linked_emote = /datum/emote/living/carbon/human/whip/whip_l
name = "Хлестать хвостом"

/datum/keybinding/emote/carbon/human/whip
linked_emote = /datum/emote/living/carbon/human/whip
name = "Ударять хвостом"
6 changes: 6 additions & 0 deletions modular_ss220/emotes/code/emote_panel_names.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,3 +423,9 @@

/datum/emote/living/carbon/human/wiggles
name = "Шевелить усики"

/datum/emote/living/carbon/human/whip
name = "Ударять хвостом"

/datum/emote/living/carbon/human/whip/whip_l
name = "Хлестать хвостом"