add(sound): add new sounds for megaphone, console and emotes

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"

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'
 	)
 ))

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("<B>[user]</B> 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))

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,

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."

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)
 

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)

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)

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)