diff --git a/modular_splurt/code/modules/mob/living/emotes.dm b/modular_splurt/code/modules/mob/living/emotes.dm index de90be9231b4..447a0d123d21 100644 --- a/modular_splurt/code/modules/mob/living/emotes.dm +++ b/modular_splurt/code/modules/mob/living/emotes.dm @@ -712,6 +712,7 @@ /datum/emote/living/audio/taunt/alt key = "tt2" key_third_person = "taunts2" + emote_volume = 100 emote_sound = 'modular_splurt/sound/voice/orchestrahit.ogg' /datum/emote/living/audio/weh2 @@ -1072,5 +1073,129 @@ emote_pitch_variance = FALSE /datum/emote/living/audio/scream2/run_emote(mob/user, params) - emote_sound = pick('modular_splurt/sound/voice/cscream1.ogg', 'modular_splurt/sound/voice/cscream2.ogg', 'modular_splurt/sound/voice/cscream3.ogg', 'modular_splurt/sound/voice/cscream4.ogg', 'modular_splurt/sound/voice/cscream5.ogg', 'modular_splurt/sound/voice/cscream6.ogg', 'modular_splurt/sound/voice/cscream7.ogg', 'modular_splurt/sound/voice/cscream8.ogg', 'modular_splurt/sound/voice/cscream9.ogg', 'modular_splurt/sound/voice/cscream10.ogg', 'modular_splurt/sound/voice/cscream11.ogg') + emote_sound = pick('modular_splurt/sound/voice/cscream1.ogg', 'modular_splurt/sound/voice/cscream2.ogg', 'modular_splurt/sound/voice/cscream3.ogg', 'modular_splurt/sound/voice/cscream4.ogg', 'modular_splurt/sound/voice/cscream5.ogg', 'modular_splurt/sound/voice/cscream6.ogg', 'modular_splurt/sound/voice/cscream7.ogg', 'modular_splurt/sound/voice/cscream8.ogg', 'modular_splurt/sound/voice/cscream9.ogg', 'modular_splurt/sound/voice/cscream10.ogg', 'modular_splurt/sound/voice/cscream11.ogg', 'modular_splurt/sound/voice/cscream12.ogg') . = ..() + +// Here comes gachimuchi +/datum/emote/living/audio/scream3 + key = "scream3" + key_third_person = "screams3" + message = "screams manly!" + message_mime = "acts out a rather manly scream!" + emote_sound = 'modular_splurt/sound/voice/gachi/scream1.ogg' + emote_cooldown = 4.64 SECONDS // Uses longest sound's time. + +/datum/emote/living/audio/scream3/run_emote(mob/user, params) + emote_sound = pick('modular_splurt/sound/voice/gachi/scream1.ogg', 'modular_splurt/sound/voice/gachi/scream2.ogg', 'modular_splurt/sound/voice/gachi/scream3.ogg', 'modular_splurt/sound/voice/gachi/scream4.ogg') + . = ..() + +/datum/emote/living/audio/moan2 + key = "moan2" + key_third_person = "moans2" + message = "moans somewhat manly!" + message_mime = "acts out a rather manly moan!" + emote_sound = 'modular_splurt/sound/voice/gachi/moan1.ogg' + emote_cooldown = 2.7 SECONDS // Uses longest sound's time. + +/datum/emote/living/audio/moan2/run_emote(mob/user, params) + emote_sound = pick('modular_splurt/sound/voice/gachi/moan1.ogg', 'modular_splurt/sound/voice/gachi/moan2.ogg', 'modular_splurt/sound/voice/gachi/moan3.ogg', 'modular_splurt/sound/voice/gachi/moan4.ogg') + . = ..() + +/datum/emote/living/audio/woop + key = "woop" + key_third_person = "woops" + message = "woops!" + message_mime = "silently woops!" + emote_sound = 'modular_splurt/sound/voice/gachi/woop.ogg' + emote_volume = 35 + emote_cooldown = 0.4 SECONDS + +/datum/emote/living/audio/whatthehell/right + key = "wth2" + key_third_person = "wths2" + emote_sound = 'modular_splurt/sound/voice/gachi/wth2.ogg' + emote_volume = 100 + emote_cooldown = 1.0 SECONDS + +/datum/emote/living/audio/pardon + key = "sorry" + key_third_person = "sorrys" + message = "exclaims, \"Oh shit, I am sorry!\"" + emote_sound = 'modular_splurt/sound/voice/gachi/sorry.ogg' + emote_cooldown = 1.3 SECONDS + +/datum/emote/living/audio/fock + key = "fuckyou" + key_third_person = "fuckyous" + message = "curses someone!" + message_mime = "silently curses someone!" + emote_sound = 'modular_splurt/sound/voice/gachi/fockyou1.ogg' + emote_cooldown = 1.18 SECONDS // Uses longest sound's time. + +/datum/emote/living/audio/fock/run_emote(mob/user, params) + emote_sound = pick('modular_splurt/sound/voice/gachi/fockyou1.ogg', 'modular_splurt/sound/voice/gachi/fockyou2.ogg') + . = ..() + +/datum/emote/living/audio/letsgo + key = "go" + key_third_person = "goes" + message = "yells, \"Come on, lets go!\"" + message_mime = "motions moving forward!" + emote_sound = 'modular_splurt/sound/voice/gachi/go.ogg' + emote_cooldown = 1.6 SECONDS + +/datum/emote/living/audio/chuckle2 + key = "chuckle2" + key_third_person = "chuckles2" + message = "chuckles." + message_mime = "chuckles silently." + emote_sound = 'modular_splurt/sound/voice/gachi/chuckle.ogg' + emote_cooldown = 1.01 SECONDS + +/datum/emote/living/audio/boss + key = "boss" + key_third_person = "boss" + message = "seeks the boss of this place!" + message_mime = "stares at the potential boss of this place!" + emote_sound = 'modular_splurt/sound/voice/gachi/boss.ogg' + emote_cooldown = 1.68 SECONDS + +/datum/emote/living/audio/attention + key = "attention" + key_third_person = "attentions" + message = "demands an attention!" + message_mime = "seems to be looking for an attention." + emote_volume = 100 + emote_sound = 'modular_splurt/sound/voice/gachi/attention.ogg' + emote_cooldown = 1.36 SECONDS + +/datum/emote/living/audio/ah + key = "ah" + key_third_person = "ahs" + message = "ahs!" + message_mime = "ahs silently!" + emote_sound = 'modular_splurt/sound/voice/gachi/ah.ogg' + emote_cooldown = 0.67 SECONDS + emote_volume = 25 + +/datum/emote/living/audio/boolets + key = "ammo" + key_third_person = "ammos" + message = "is requesting ammo!" + message_mime = "seem to ask for ammo!" + emote_sound = 'modular_splurt/sound/voice/gachi/boolets.ogg' + emote_cooldown = 1.1 SECONDS // Uses longest sound's time. + emote_volume = 10 + +/datum/emote/living/audio/boolets/run_emote(mob/user, params) + emote_sound = pick('modular_splurt/sound/voice/gachi/boolets.ogg', 'modular_splurt/sound/voice/gachi/boolets2.ogg') + . = ..() + +/datum/emote/living/audio/wepon + key = "wepon" + key_third_person = "wepons" + message = "is requesting bigger weapons!" + message_mime = "seem to ask for weapons!" + emote_sound = 'modular_splurt/sound/voice/gachi/wepons.ogg' + emote_cooldown = 1.07 SECONDS + emote_volume = 10 diff --git a/modular_splurt/sound/voice/cscream12.ogg b/modular_splurt/sound/voice/cscream12.ogg new file mode 100644 index 000000000000..75b6740cf948 Binary files /dev/null and b/modular_splurt/sound/voice/cscream12.ogg differ diff --git a/modular_splurt/sound/voice/gachi/ah.ogg b/modular_splurt/sound/voice/gachi/ah.ogg new file mode 100644 index 000000000000..36bcbeaa3cf3 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/ah.ogg differ diff --git a/modular_splurt/sound/voice/gachi/attention.ogg b/modular_splurt/sound/voice/gachi/attention.ogg new file mode 100644 index 000000000000..91f4f618ac20 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/attention.ogg differ diff --git a/modular_splurt/sound/voice/gachi/boolets.ogg b/modular_splurt/sound/voice/gachi/boolets.ogg new file mode 100644 index 000000000000..9f9221a03897 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/boolets.ogg differ diff --git a/modular_splurt/sound/voice/gachi/boolets2.ogg b/modular_splurt/sound/voice/gachi/boolets2.ogg new file mode 100644 index 000000000000..c15bf7bc06ac Binary files /dev/null and b/modular_splurt/sound/voice/gachi/boolets2.ogg differ diff --git a/modular_splurt/sound/voice/gachi/boss.ogg b/modular_splurt/sound/voice/gachi/boss.ogg new file mode 100644 index 000000000000..96e39f73da29 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/boss.ogg differ diff --git a/modular_splurt/sound/voice/gachi/chuckle.ogg b/modular_splurt/sound/voice/gachi/chuckle.ogg new file mode 100644 index 000000000000..1adfc35def0c Binary files /dev/null and b/modular_splurt/sound/voice/gachi/chuckle.ogg differ diff --git a/modular_splurt/sound/voice/gachi/fockyou1.ogg b/modular_splurt/sound/voice/gachi/fockyou1.ogg new file mode 100644 index 000000000000..1b71c8c6dfa5 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/fockyou1.ogg differ diff --git a/modular_splurt/sound/voice/gachi/fockyou2.ogg b/modular_splurt/sound/voice/gachi/fockyou2.ogg new file mode 100644 index 000000000000..d7ac173bb6ee Binary files /dev/null and b/modular_splurt/sound/voice/gachi/fockyou2.ogg differ diff --git a/modular_splurt/sound/voice/gachi/go.ogg b/modular_splurt/sound/voice/gachi/go.ogg new file mode 100644 index 000000000000..1b0f3adcf557 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/go.ogg differ diff --git a/modular_splurt/sound/voice/gachi/moan1.ogg b/modular_splurt/sound/voice/gachi/moan1.ogg new file mode 100644 index 000000000000..b83332ed260d Binary files /dev/null and b/modular_splurt/sound/voice/gachi/moan1.ogg differ diff --git a/modular_splurt/sound/voice/gachi/moan2.ogg b/modular_splurt/sound/voice/gachi/moan2.ogg new file mode 100644 index 000000000000..0e164acabaf7 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/moan2.ogg differ diff --git a/modular_splurt/sound/voice/gachi/moan3.ogg b/modular_splurt/sound/voice/gachi/moan3.ogg new file mode 100644 index 000000000000..95ad56bf6d89 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/moan3.ogg differ diff --git a/modular_splurt/sound/voice/gachi/moan4.ogg b/modular_splurt/sound/voice/gachi/moan4.ogg new file mode 100644 index 000000000000..3f4045157e8b Binary files /dev/null and b/modular_splurt/sound/voice/gachi/moan4.ogg differ diff --git a/modular_splurt/sound/voice/gachi/scream1.ogg b/modular_splurt/sound/voice/gachi/scream1.ogg new file mode 100644 index 000000000000..a2458083afc9 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/scream1.ogg differ diff --git a/modular_splurt/sound/voice/gachi/scream2.ogg b/modular_splurt/sound/voice/gachi/scream2.ogg new file mode 100644 index 000000000000..eda29ef5e3b5 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/scream2.ogg differ diff --git a/modular_splurt/sound/voice/gachi/scream3.ogg b/modular_splurt/sound/voice/gachi/scream3.ogg new file mode 100644 index 000000000000..2c2e3c92a590 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/scream3.ogg differ diff --git a/modular_splurt/sound/voice/gachi/scream4.ogg b/modular_splurt/sound/voice/gachi/scream4.ogg new file mode 100644 index 000000000000..1ba2b670b7f1 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/scream4.ogg differ diff --git a/modular_splurt/sound/voice/gachi/sorry.ogg b/modular_splurt/sound/voice/gachi/sorry.ogg new file mode 100644 index 000000000000..a2b773ad0d5b Binary files /dev/null and b/modular_splurt/sound/voice/gachi/sorry.ogg differ diff --git a/modular_splurt/sound/voice/gachi/wepons.ogg b/modular_splurt/sound/voice/gachi/wepons.ogg new file mode 100644 index 000000000000..7c5cdb525078 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/wepons.ogg differ diff --git a/modular_splurt/sound/voice/gachi/woop.ogg b/modular_splurt/sound/voice/gachi/woop.ogg new file mode 100644 index 000000000000..fb304bc58650 Binary files /dev/null and b/modular_splurt/sound/voice/gachi/woop.ogg differ diff --git a/modular_splurt/sound/voice/gachi/wth2.ogg b/modular_splurt/sound/voice/gachi/wth2.ogg new file mode 100644 index 000000000000..7981444275ec Binary files /dev/null and b/modular_splurt/sound/voice/gachi/wth2.ogg differ