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

[port][refactor][modular] Adds 3 new hand based emotes because Ook said my jazz game wasn't good enough #2616

Merged
merged 1 commit into from
Jul 12, 2024
Merged

[port][refactor][modular] Adds 3 new hand based emotes because Ook said my jazz game wasn't good enough #2616

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
41 changes: 41 additions & 0 deletions ...estation/code/modules/mob/living/emote.dm → ...station/code/modules/emotes/code/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,47 @@
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
vary = FALSE

/datum/emote/living/clap1
key = "clap1"
key_third_person = "claps once"
message = "claps once."
emote_type = EMOTE_AUDIBLE
muzzle_ignore = TRUE
hands_use_check = TRUE
vary = TRUE
mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)

/datum/emote/living/clap1/get_sound(mob/living/user)
return pick('monkestation/code/modules/emotes/sound/claponce1.ogg',
'monkestation/code/modules/emotes/sound/claponce2.ogg')

/datum/emote/living/clap1/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional)
if(user.usable_hands < 2)
return FALSE
return ..()

/datum/emote/living/snap2
key = "snap2"
key_third_person = "snaps twice"
message = "snaps twice."
message_param = "snaps twice at %t."
emote_type = EMOTE_AUDIBLE
muzzle_ignore = TRUE
hands_use_check = TRUE
vary = TRUE
sound = 'monkestation/code/modules/emotes/sound/snap2.ogg'

/datum/emote/living/snap3
key = "snap3"
key_third_person = "snaps thrice"
message = "snaps thrice."
message_param = "snaps thrice at %t."
emote_type = EMOTE_AUDIBLE
muzzle_ignore = TRUE
hands_use_check = TRUE
vary = TRUE
sound = 'monkestation/code/modules/emotes/sound/snap3.ogg'

/datum/emote/living/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
return
Expand Down
Binary file added monkestation/code/modules/emotes/sound/claponce1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added monkestation/code/modules/emotes/sound/claponce2.ogg
View file
Open in desktop
Binary file not shown.
Binary file added monkestation/code/modules/emotes/sound/snap2.ogg
View file
Open in desktop
Binary file not shown.
Binary file added monkestation/code/modules/emotes/sound/snap3.ogg
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6695,6 +6695,7 @@
#include "monkestation\code\modules\donator\code\item\effects.dm"
#include "monkestation\code\modules\donator\code\item\plush.dm"
#include "monkestation\code\modules\donator\code\mob\pets.dm"
#include "monkestation\code\modules\emotes\code\emote.dm"
#include "monkestation\code\modules\events\brand_intelligence.dm"
#include "monkestation\code\modules\events\gravity_generator_blackout.dm"
#include "monkestation\code\modules\events\radiation_storm.dm"
Expand Down Expand Up @@ -6925,7 +6926,6 @@
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\sock_color.dm"
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\tails.dm"
#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\underwear.dm"
#include "monkestation\code\modules\mob\living\emote.dm"
#include "monkestation\code\modules\mob\living\living_defines.dm"
#include "monkestation\code\modules\mob\living\status_procs.dm"
#include "monkestation\code\modules\mob\living\basic\animatronic.dm"
Expand Down
Loading