diff --git a/code/__defines/sound.dm b/code/__defines/sound.dm index 585dcafc1ee..997db65813d 100644 --- a/code/__defines/sound.dm +++ b/code/__defines/sound.dm @@ -78,6 +78,10 @@ #define SFX_FEMALE_LONG_SCREAM "female_long_scream" #define SFX_FEMALE_FALL_ALIVE "female_fall_alive" #define SFX_FEMALE_FALL_DEAD "female_fall_dead" +#define SFX_FEMALE_CRY "female_cry" +#define SFX_FEMALE_LAUGH "female_laugh" +#define SFX_FEMALE_YAWN "female_yawn" +#define SFX_FEMALE_SIGH "female_sigh" // MALE EMOTES #define SFX_MALE_INTERNAL_BREATH "male_internal_breath" @@ -88,6 +92,10 @@ #define SFX_MALE_LONG_SCREAM "male_long_scream" #define SFX_MALE_FALL_ALIVE "male_fall_alive" #define SFX_MALE_FALL_DEAD "male_fall_dead" +#define SFX_MALE_CRY "male_cry" +#define SFX_MALE_LAUGH "male_laugh" +#define SFX_MALE_YAWN "male_yawn" +#define SFX_MALE_SIGH "male_sigh" // AMBIENT #define SFX_AMBIENT_POWERED_GLOBAL "ambient_powered_global" @@ -131,6 +139,7 @@ #define SFX_USE_BUTTON "use_button" #define SFX_USE_LIGHTER "use_lighter" #define SFX_USE_CHISEL "use_chisel" +#define SFX_KEYBOARD "use_keyboard" // PULLING #define SFX_PULL_BODY "pull_body" @@ -197,6 +206,9 @@ #define SFX_GIB "gib" #define SFX_CLOWN "clown" #define SFX_HISS "hiss" +#define SFX_WHISTLE "whistle" +#define SFX_SNORE "snore" +#define SFX_CLAP "clap" #define SFX_CHOP "chop" #define SFX_TRR "trr" #define SFX_RADIO "radio" diff --git a/code/_global_vars/sfx.dm b/code/_global_vars/sfx.dm index b796979e33d..1719be3f690 100644 --- a/code/_global_vars/sfx.dm +++ b/code/_global_vars/sfx.dm @@ -161,6 +161,21 @@ GLOBAL_LIST_INIT(sfx_list, list( 'sound/effects/damage/falling/f_fall_dead10.ogg', 'sound/effects/damage/falling/f_fall_dead11.ogg' ), + SFX_FEMALE_CRY = list( + 'sound/effects/emotes/f_cry1.ogg', + 'sound/effects/emotes/f_cry2.ogg', + 'sound/effects/emotes/f_cry3.ogg', + 'sound/effects/emotes/f_cry4.ogg' + ), + SFX_FEMALE_LAUGH = list( + 'sound/effects/emotes/f_laugh.ogg' + ), + SFX_FEMALE_YAWN = list( + 'sound/effects/emotes/f_yawn.ogg' + ), + SFX_FEMALE_SIGH = list( + 'sound/effects/emotes/f_sigh.ogg' + ), // MALE EMOTES SFX_MALE_INTERNAL_BREATH = list( 'sound/effects/emotes/m_internal1.ogg', @@ -271,6 +286,22 @@ GLOBAL_LIST_INIT(sfx_list, list( 'sound/effects/damage/falling/m_fall_dead10.ogg', 'sound/effects/damage/falling/m_fall_dead11.ogg' ), + SFX_MALE_CRY = list( + 'sound/effects/emotes/m_cry1.ogg', + 'sound/effects/emotes/m_cry2.ogg', + 'sound/effects/emotes/m_cry3.ogg', + 'sound/effects/emotes/m_cry4.ogg' + ), + SFX_MALE_LAUGH = list( + 'sound/effects/emotes/m_laugh1.ogg', + 'sound/effects/emotes/m_laugh2.ogg' + ), + SFX_MALE_YAWN = list( + 'sound/effects/emotes/m_yawn.ogg' + ), + SFX_MALE_SIGH = list( + 'sound/effects/emotes/m_sigh.ogg' + ), // AMBIENT SFX_AMBIENT_POWERED_GLOBAL = list( 'sound/ambient/global/amb2.ogg', @@ -1218,8 +1249,8 @@ GLOBAL_LIST_INIT(sfx_list, list( 'sound/effects/vent/vent19.ogg' ), SFX_CHAINSAW = list( - 'sound/weapons/chainsaw_attack1.ogg', - 'sound/weapons/chainsaw_attack2.ogg', + 'sound/weapons/chainsaw_attack1.ogg', + 'sound/weapons/chainsaw_attack2.ogg', 'sound/weapons/chainsaw_attack3.ogg' ), SFX_GLASS_HIT = list( @@ -1255,6 +1286,23 @@ GLOBAL_LIST_INIT(sfx_list, list( 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg' ), + SFX_WHISTLE = list( + 'sound/effects/emotes/whistle1.ogg', + 'sound/effects/emotes/whistle2.ogg', + 'sound/effects/emotes/whistle3.ogg', + 'sound/effects/emotes/whistle4.ogg' + ), + SFX_SNORE = list( + 'sound/effects/emotes/snore1.ogg', + 'sound/effects/emotes/snore2.ogg', + 'sound/effects/emotes/snore3.ogg' + ), + SFX_CLAP = list( + 'sound/effects/emotes/clap1.ogg', + 'sound/effects/emotes/clap2.ogg', + 'sound/effects/emotes/clap3.ogg', + 'sound/effects/emotes/clap4.ogg' + ), SFX_CHOP = list( 'sound/effects/fighting/chop1.ogg', 'sound/effects/fighting/chop2.ogg', @@ -1402,5 +1450,15 @@ GLOBAL_LIST_INIT(sfx_list, list( 'sound/effects/robot_footstep/spider01.ogg', 'sound/effects/robot_footstep/spider02.ogg', 'sound/effects/robot_footstep/spider03.ogg' + ), + SFX_KEYBOARD = list( + 'sound/machines/keyboard/keystroke1.ogg', + 'sound/machines/keyboard/keystroke2.ogg', + 'sound/machines/keyboard/keystroke3.ogg', + 'sound/machines/keyboard/keystroke4.ogg', + 'sound/machines/keyboard/keypress1.ogg', + 'sound/machines/keyboard/keypress2.ogg', + 'sound/machines/keyboard/keypress3.ogg', + 'sound/machines/keyboard/keypress4.ogg' ) )) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 0086bde70ab..5d04ab35c91 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -44,6 +44,7 @@ /obj/item/device/megaphone/proc/speak(mob/living/user, message, emagged = FALSE) for(var/mob/O in (viewers(user))) O.show_message("[user] broadcasts, [FONT_GIANT("\"[emagged ? pick(insultmsg) : message]\"")]", AUDIBLE_MESSAGE) + playsound(src, 'sound/items/megaphone.ogg', 50, 0, 1) if(O.get_preference_value(/datum/client_preference/runechat) == GLOB.PREF_YES && !O.is_deaf()) O.create_chat_message(O, message, FALSE, "big") for(var/obj/item/device/radio/intercom/I in view(3, user)) diff --git a/code/modules/emotes/definitions/_mob.dm b/code/modules/emotes/definitions/_mob.dm index 1ca1b8b2803..9ec5b17efab 100644 --- a/code/modules/emotes/definitions/_mob.dm +++ b/code/modules/emotes/definitions/_mob.dm @@ -51,7 +51,6 @@ /decl/emote/audible/alarm, /decl/emote/audible/alert, /decl/emote/audible/notice, - /decl/emote/audible/whistle, /decl/emote/audible/synth, /decl/emote/audible/boop, /decl/emote/visible/blink, @@ -93,6 +92,7 @@ /decl/emote/audible/giggle, /decl/emote/audible/scream, /decl/emote/audible/long_scream, + /decl/emote/audible/whistle, /decl/emote/visible/airguitar, /decl/emote/visible/blink_r, /decl/emote/visible/bow, diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm index f07430d4f4d..96043a63bde 100644 --- a/code/modules/emotes/definitions/audible.dm +++ b/code/modules/emotes/definitions/audible.dm @@ -54,11 +54,6 @@ emote_message_1p = "You play a loud tone." emote_message_3p = "USER plays a loud tone." -/decl/emote/audible/whistle - key = "whistle" - emote_message_1p = "You whistle." - emote_message_3p = "USER whistles." - /decl/emote/audible/boop key = "boop" emote_message_1p = "You boop." @@ -68,6 +63,10 @@ key = "sneeze" emote_message_3p = "USER sneezes." +/decl/emote/audible/whistle + key = "whistle" + emote_message_3p = "USER whistles." + /decl/emote/audible/sniff key = "sniff" emote_message_3p = "USER sniffs." diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm index 0e16cadb08e..e90fae27cf9 100644 --- a/code/modules/emotes/emote_define.dm +++ b/code/modules/emotes/emote_define.dm @@ -59,8 +59,22 @@ playsound(user, "[gender_prefix]_sneeze", rand(25, 40), FALSE) if ("long_scream") playsound(user, "[gender_prefix]_long_scream", rand(25, 40), FALSE) + if ("cry") + playsound(user, "[gender_prefix]_cry", rand(25, 40), 0) + if ("laugh","giggle","chuckle") + playsound(user, "[gender_prefix]_laugh", rand(25,40), 1) + if ("yawn") + playsound(user, "[gender_prefix]_yawn", rand(25, 40), 1) + if ("sigh") + playsound(user, "[gender_prefix]_sigh", rand(25, 40), 1) if ("oink") playsound(user, pick('sound/effects/pig1.ogg','sound/effects/pig2.ogg','sound/effects/pig3.ogg'), 100, 1) + if ("whistle") + playsound(user, SFX_WHISTLE, 25, 1) + if ("clap") + playsound(user, SFX_CLAP, 50, 0) + if ("snore") + playsound(user, SFX_SNORE, 25, 1) /decl/emote/proc/do_emote(atom/user, extra_params) diff --git a/code/modules/modular_computers/computers/subtypes/dev_console.dm b/code/modules/modular_computers/computers/subtypes/dev_console.dm index cc241482382..33271e890a9 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_console.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_console.dm @@ -22,4 +22,4 @@ /obj/item/modular_computer/console/CouldUseTopic(mob/user) ..() if(istype(user, /mob/living/carbon)) - playsound(src, 'sound/effects/using/console/press7.ogg', 50, 1) + playsound(src, SFX_KEYBOARD, 50, 1) diff --git a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm index 2391b5ab1d3..a5c50632aa1 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm @@ -37,3 +37,8 @@ /obj/item/modular_computer/laptop/preset anchored = FALSE + +/obj/item/modular_computer/laptop/CouldUseTopic(mob/user) + ..() + if(istype(user, /mob/living/carbon)) + playsound(src, SFX_KEYBOARD, 50, 1) diff --git a/code/modules/modular_computers/computers/subtypes/dev_tablet.dm b/code/modules/modular_computers/computers/subtypes/dev_tablet.dm index 0c216c2c60d..25e3874db5e 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_tablet.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_tablet.dm @@ -14,3 +14,8 @@ desc = "A small portable microcomputer. This one has a gold and blue stripe, and a serial number stamped into the case." icon_state = "tabletsol" icon_state_unpowered = "tabletsol" + +/obj/item/modular_computer/tablet/CouldUseTopic(mob/user) + ..() + if(istype(user, /mob/living/carbon)) + playsound(src, 'sound/effects/using/console/press7.ogg', 30, 1) diff --git a/sound/effects/emotes/clap1.ogg b/sound/effects/emotes/clap1.ogg new file mode 100644 index 00000000000..da0f7eded79 Binary files /dev/null and b/sound/effects/emotes/clap1.ogg differ diff --git a/sound/effects/emotes/clap2.ogg b/sound/effects/emotes/clap2.ogg new file mode 100644 index 00000000000..72e26d4a241 Binary files /dev/null and b/sound/effects/emotes/clap2.ogg differ diff --git a/sound/effects/emotes/clap3.ogg b/sound/effects/emotes/clap3.ogg new file mode 100644 index 00000000000..7a72ab9bf3c Binary files /dev/null and b/sound/effects/emotes/clap3.ogg differ diff --git a/sound/effects/emotes/clap4.ogg b/sound/effects/emotes/clap4.ogg new file mode 100644 index 00000000000..cdc533ca771 Binary files /dev/null and b/sound/effects/emotes/clap4.ogg differ diff --git a/sound/effects/emotes/f_cry1.ogg b/sound/effects/emotes/f_cry1.ogg new file mode 100644 index 00000000000..17fe293073f Binary files /dev/null and b/sound/effects/emotes/f_cry1.ogg differ diff --git a/sound/effects/emotes/f_cry2.ogg b/sound/effects/emotes/f_cry2.ogg new file mode 100644 index 00000000000..13060ee38e3 Binary files /dev/null and b/sound/effects/emotes/f_cry2.ogg differ diff --git a/sound/effects/emotes/f_cry3.ogg b/sound/effects/emotes/f_cry3.ogg new file mode 100644 index 00000000000..6f6d3a09182 Binary files /dev/null and b/sound/effects/emotes/f_cry3.ogg differ diff --git a/sound/effects/emotes/f_cry4.ogg b/sound/effects/emotes/f_cry4.ogg new file mode 100644 index 00000000000..505449ad730 Binary files /dev/null and b/sound/effects/emotes/f_cry4.ogg differ diff --git a/sound/effects/emotes/f_laugh.ogg b/sound/effects/emotes/f_laugh.ogg new file mode 100644 index 00000000000..1313bd445f2 Binary files /dev/null and b/sound/effects/emotes/f_laugh.ogg differ diff --git a/sound/effects/emotes/f_sigh.ogg b/sound/effects/emotes/f_sigh.ogg new file mode 100644 index 00000000000..6671e526747 Binary files /dev/null and b/sound/effects/emotes/f_sigh.ogg differ diff --git a/sound/effects/emotes/f_yawn.ogg b/sound/effects/emotes/f_yawn.ogg new file mode 100644 index 00000000000..485c6462c68 Binary files /dev/null and b/sound/effects/emotes/f_yawn.ogg differ diff --git a/sound/effects/emotes/m_cry1.ogg b/sound/effects/emotes/m_cry1.ogg new file mode 100644 index 00000000000..d7de7301fea Binary files /dev/null and b/sound/effects/emotes/m_cry1.ogg differ diff --git a/sound/effects/emotes/m_cry2.ogg b/sound/effects/emotes/m_cry2.ogg new file mode 100644 index 00000000000..56d2ec4e84e Binary files /dev/null and b/sound/effects/emotes/m_cry2.ogg differ diff --git a/sound/effects/emotes/m_cry3.ogg b/sound/effects/emotes/m_cry3.ogg new file mode 100644 index 00000000000..cf4234f3794 Binary files /dev/null and b/sound/effects/emotes/m_cry3.ogg differ diff --git a/sound/effects/emotes/m_cry4.ogg b/sound/effects/emotes/m_cry4.ogg new file mode 100644 index 00000000000..735873b7047 Binary files /dev/null and b/sound/effects/emotes/m_cry4.ogg differ diff --git a/sound/effects/emotes/m_laugh1.ogg b/sound/effects/emotes/m_laugh1.ogg new file mode 100644 index 00000000000..957d7a65291 Binary files /dev/null and b/sound/effects/emotes/m_laugh1.ogg differ diff --git a/sound/effects/emotes/m_laugh2.ogg b/sound/effects/emotes/m_laugh2.ogg new file mode 100644 index 00000000000..fe6c0c9b7bf Binary files /dev/null and b/sound/effects/emotes/m_laugh2.ogg differ diff --git a/sound/effects/emotes/m_sigh.ogg b/sound/effects/emotes/m_sigh.ogg new file mode 100644 index 00000000000..6d59effb77d Binary files /dev/null and b/sound/effects/emotes/m_sigh.ogg differ diff --git a/sound/effects/emotes/m_yawn.ogg b/sound/effects/emotes/m_yawn.ogg new file mode 100644 index 00000000000..51390959cb2 Binary files /dev/null and b/sound/effects/emotes/m_yawn.ogg differ diff --git a/sound/effects/emotes/snore1.ogg b/sound/effects/emotes/snore1.ogg new file mode 100644 index 00000000000..314b6cab317 Binary files /dev/null and b/sound/effects/emotes/snore1.ogg differ diff --git a/sound/effects/emotes/snore2.ogg b/sound/effects/emotes/snore2.ogg new file mode 100644 index 00000000000..94c7b155a52 Binary files /dev/null and b/sound/effects/emotes/snore2.ogg differ diff --git a/sound/effects/emotes/snore3.ogg b/sound/effects/emotes/snore3.ogg new file mode 100644 index 00000000000..468e7e6c800 Binary files /dev/null and b/sound/effects/emotes/snore3.ogg differ diff --git a/sound/effects/emotes/whistle1.ogg b/sound/effects/emotes/whistle1.ogg new file mode 100644 index 00000000000..eff37a98eb3 Binary files /dev/null and b/sound/effects/emotes/whistle1.ogg differ diff --git a/sound/effects/emotes/whistle2.ogg b/sound/effects/emotes/whistle2.ogg new file mode 100644 index 00000000000..0bdc0b18df1 Binary files /dev/null and b/sound/effects/emotes/whistle2.ogg differ diff --git a/sound/effects/emotes/whistle3.ogg b/sound/effects/emotes/whistle3.ogg new file mode 100644 index 00000000000..a11438620e2 Binary files /dev/null and b/sound/effects/emotes/whistle3.ogg differ diff --git a/sound/effects/emotes/whistle4.ogg b/sound/effects/emotes/whistle4.ogg new file mode 100644 index 00000000000..f1fca8d281e Binary files /dev/null and b/sound/effects/emotes/whistle4.ogg differ diff --git a/sound/items/megaphone.ogg b/sound/items/megaphone.ogg new file mode 100644 index 00000000000..31d7a8d1ad9 Binary files /dev/null and b/sound/items/megaphone.ogg differ