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.

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

WIP More Kepori Sounds #3034

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion code/datums/emotes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
var/sound //Sound to play when emote is called
var/vary = FALSE //used for the honk borg emote
var/only_forced_audio = FALSE //can only code call this event instead of the player.
var/cooldown = 0.8 SECONDS
var/cooldown = 2 SECONDS
var/static/regex/stop_bad_mime = regex(@"says|exclaims|yells|asks")

/datum/emote/New()
Expand Down
15 changes: 15 additions & 0 deletions code/modules/mob/living/carbon/human/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@
key_third_person = "whistles"
message = "whistles!"
emote_type = EMOTE_AUDIBLE
vary = TRUE

/datum/emote/living/carbon/human/kepiwhistle/get_sound(mob/living/user)
if(!ishuman(user))
Expand All @@ -357,3 +358,17 @@
key = "woop"
key_third_person = "woops"
message = "woops!"
emote_type = EMOTE_AUDIBLE

/datum/emote/living/carbon/human/chitter
key = "chitter"
key_third_person = "chitters"
message = "chitters."
emote_type = EMOTE_AUDIBLE
vary = TRUE

/datum/emote/living/carbon/human/chitter/get_sound(mob/living/user)
if(ismoth(user))
return 'sound/voice/moth/mothchitter.ogg'
if(iskepori(user))
return 'sound/voice/kepori/keporichitter.ogg' // provided by robustedsebster
12 changes: 0 additions & 12 deletions code/modules/mob/living/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,6 @@
message = "crosses their arms."
hands_use_check = TRUE

/datum/emote/living/carbon/mothchitter
key = "chitter"
key_third_person = "chitters"
message = "chitters."
emote_type = EMOTE_AUDIBLE
vary = TRUE

/datum/emote/living/carbon/mothchitter/get_sound(mob/living/user)
var/mob/living/carbon/human/H = user
if(ismoth(H) | (istype(H, /mob/living/simple_animal/pet/mothroach)))
return 'sound/voice/moth/mothchitter.ogg'

/datum/emote/living/chuckle
key = "chuckle"
key_third_person = "chuckles"
Expand Down
Binary file added sound/voice/kepori/keporichitter.ogg
Binary file not shown.
Loading