Merge pull request #736 from Very-Soft/coolvibrations

Some new emotes

ATTRIBUTIONS.md

@@ -357,11 +357,36 @@
 **Link:** https://github.com/VOREStation/VOREStation/pull/10476 - https://github.com/TS-Rogue-Star/Rogue-Star/pull/702<br>
 **License:** Licensed for use by VOREStation, Rogue Star, and their downstreams; unlicensed for further use without permission of copyright holder<br>
 <br>
+**File**: `sound/screams` - `f1.ogg - f15.ogg`<br>
+**Creator:** Volonda<br>
+**Link:** https://freesound.org/people/Volonda/sounds/439517/<br>
+**License:** [Creative Commons 0](https://creativecommons.org/publicdomain/zero/1.0/)<br>
+<br>
+**File**: `sound/screams` - `m1.ogg - m6.ogg`<br>
+**Creator:** marc3122<br>
+**Link:** https://freesound.org/people/marc3122/sounds/556976/<br>
+**License:** [Creative Commons 0](https://creativecommons.org/publicdomain/zero/1.0/)<br>
+<br>
+**File**: `sound/screams` - `m7.ogg - m10.ogg`<br>
+**Creator:** JohnsonBrandEditing<br>
+**Link:** https://freesound.org/people/JohnsonBrandEditing/sounds/173944/<br>
+**License:** [Creative Commons 0](https://creativecommons.org/publicdomain/zero/1.0/)<br>
+<br>
+**File**: `sound/screams` - `m11.ogg - m14.ogg`<br>
+**Creator:** Moulaythami<br>
+**Link:** https://freesound.org/people/Moulaythami/sounds/548377/<br>
+**License:** [Attribution 4.0](https://creativecommons.org/licenses/by/4.0/)<br>
+<br>
+**File**: `sound/screams` - `m15.ogg - m17.ogg`<br>
+**Creator:** Mafon2<br>
+**Link:** https://freesound.org/people/Mafon2/sounds/635281/<br>
+**License:** [Creative Commons 0](https://creativecommons.org/publicdomain/zero/1.0/)<br>
+<br>
 digi-inner-thighs
 **File:** icons/mob/digi_inner-[r/l]_leg.dmi<br>
 **Creator:** SpringSkipper<br>
 **Link:** https://github.com/VOREStation/VOREStation/pull/16881<br>
-=======
+<br>
 **File:** `icons/obj/doc_printer_mod_[pre / _post / printing / ejecting].dmi`<br>
 **Creator:** spacemanjim (AKA: MAK) <br>
 **Link:** https://github.com/VOREStation/VOREStation/pull/15552<br>

code/modules/client/preference_setup/general/01_basic.dm

@@ -25,6 +25,7 @@
 	S["OOC_Notes"]				>> pref.metadata
 	S["OOC_Notes_Likes"]		>> pref.metadata_likes
 	S["OOC_Notes_Disikes"]		>> pref.metadata_dislikes
+	S["screamsound"]			>> pref.screamsound		//RS ADD
 
 /datum/category_item/player_setup_item/general/basic/save_character(var/savefile/S)
 	S["real_name"]				<< pref.real_name
@@ -41,6 +42,7 @@
 	S["OOC_Notes"]				<< pref.metadata
 	S["OOC_Notes_Likes"]		<< pref.metadata_likes
 	S["OOC_Notes_Disikes"]		<< pref.metadata_dislikes
+	S["screamsound"]			<< pref.screamsound		//RS ADD
 
 /datum/category_item/player_setup_item/general/basic/sanitize_character()
 	pref.age                = sanitize_integer(pref.age, get_min_age(), get_max_age(), initial(pref.age))

code/modules/client/preferences.dm

@@ -83,6 +83,7 @@ var/list/preferences_datums = list()
 	var/b_synth							//Same as above
 	var/synth_markings = 1				//Enable/disable markings on synth parts. //VOREStation Edit - 1 by default
 	var/digitigrade = 0
+	var/screamsound = 0					//RS ADD
 
 		//Some faction information.
 	var/home_system = "Unset"           //Current home or residence.
@@ -174,7 +175,6 @@ var/list/preferences_datums = list()
 	///If they are currently in the process of swapping slots, don't let them open 999 windows for it and get confused
 	var/selecting_slots = FALSE
 
-
 /datum/preferences/New(client/C)
 	player_setup = new(src)
 	set_biological_gender(pick(MALE, FEMALE))

code/modules/emotes/definitions/audible_emotes_RS.dm

@@ -1,4 +1,14 @@
-/decl/emote/audible/yip
+/decl/emote/audible/multisound
+	key = "0000000000000"
+
+	var/list/soundlist = list()
+
+/decl/emote/audible/multisound/get_emote_sound(var/mob/living/user)
+	emote_sound = pick(soundlist)
+
+	. = ..()
+
+/decl/emote/audible/multisound/yip
 	key = "yip"
 	emote_message_1p = "You yip! Yip!"
 	emote_message_3p = "yips!"
@@ -9,15 +19,10 @@
 	emote_message_3p_target = "yips at TARGET!"
 
 	emote_sound = null
-	var/list/soundlist = list('sound/rogue-star/yip/yip1.ogg', 'sound/rogue-star/yip/yip2.ogg', 'sound/rogue-star/yip/yip3.ogg', 'sound/rogue-star/yip/yip4.ogg', 'sound/rogue-star/yip/yip5.ogg', 'sound/rogue-star/yip/yip6.ogg', 'sound/rogue-star/yip/yip7.ogg', 'sound/rogue-star/yip/yip8.ogg', 'sound/rogue-star/yip/yip9.ogg', 'sound/rogue-star/yip/yip10.ogg', 'sound/rogue-star/yip/yip11.ogg', 'sound/rogue-star/yip/yip12.ogg', 'sound/rogue-star/yip/yip13.ogg', 'sound/rogue-star/yip/yip14.ogg', 'sound/rogue-star/yip/yip15.ogg')
+	soundlist = list('sound/rogue-star/yip/yip1.ogg', 'sound/rogue-star/yip/yip2.ogg', 'sound/rogue-star/yip/yip3.ogg', 'sound/rogue-star/yip/yip4.ogg', 'sound/rogue-star/yip/yip5.ogg', 'sound/rogue-star/yip/yip6.ogg', 'sound/rogue-star/yip/yip7.ogg', 'sound/rogue-star/yip/yip8.ogg', 'sound/rogue-star/yip/yip9.ogg', 'sound/rogue-star/yip/yip10.ogg', 'sound/rogue-star/yip/yip11.ogg', 'sound/rogue-star/yip/yip12.ogg', 'sound/rogue-star/yip/yip13.ogg', 'sound/rogue-star/yip/yip14.ogg', 'sound/rogue-star/yip/yip15.ogg')
 	sound_vary = TRUE
 
-/decl/emote/audible/yip/get_emote_sound(var/mob/living/user)
-	emote_sound = pick(soundlist)
-
-	. = ..()
-
-/decl/emote/audible/yip/yap
+/decl/emote/audible/multisound/yap
 	key = "yap"
 	emote_message_1p = "You yap! Yap yap!"
 	emote_message_3p = "yaps!"
@@ -28,7 +33,7 @@
 	emote_message_3p_target = "yaps at TARGET!"
 	soundlist = list('sound/rogue-star/yap/yap1.ogg', 'sound/rogue-star/yap/yap2.ogg', 'sound/rogue-star/yap/yap4.ogg', 'sound/rogue-star/yap/yap5.ogg', 'sound/rogue-star/yap/yap6.ogg', 'sound/rogue-star/yap/yap7.ogg', 'sound/rogue-star/yap/yap8.ogg', 'sound/rogue-star/yap/yap9.ogg', 'sound/rogue-star/yap/yap10.ogg', 'sound/rogue-star/yap/yap11.ogg', 'sound/rogue-star/yap/yap12.ogg', 'sound/rogue-star/yap/yap13.ogg', 'sound/rogue-star/yap/yap14.ogg')
 
-/decl/emote/audible/awawa
+/decl/emote/audible/multisound/awawa
 	key = "awawa"
 	emote_message_1p = "You awawa!"
 	emote_message_3p = "awawas!"
@@ -39,17 +44,13 @@
 	emote_message_3p_target = "awawas at TARGET."
 
 	emote_sound = null
-	var/list/soundlist = list(
+	soundlist = list(
 			'sound/voice/awawa1.ogg',
 			'sound/voice/awawa2.ogg',
 			'sound/voice/awawa3.ogg'
 			)
 	sound_vary = TRUE
 
-/decl/emote/audible/awawa/get_emote_sound(var/mob/living/user)
-	emote_sound = pick(soundlist)
-	. = ..()
-
 /decl/emote/audible/glub
 	key = "glub"
 	emote_message_1p = "You glub."
@@ -60,12 +61,59 @@
 	emote_message_1p_target = "You glub at TARGET."
 	emote_message_3p_target = "glubs at TARGET."
 
+	emote_sound = 'sound/voice/glub.ogg'
+	sound_vary = TRUE
+
+/decl/emote/audible/multisound/poyo
+	key = "poyo"
+	emote_message_1p = "You go poyo!"
+	emote_message_3p = "poyos!"
+
+	emote_message_impaired = "makes a sound but you can't hear it."
+
+	emote_message_1p_target = "You poyo at TARGET!!!"
+	emote_message_3p_target = "poyos at TARGET!"
+
 	emote_sound = null
-	var/list/soundlist = list(
-			'sound/voice/glub.ogg',
-			)
+	soundlist = list(
+		'sound/rogue-star/poyo/poyo1.ogg', 'sound/rogue-star/poyo/poyo2.ogg', 'sound/rogue-star/poyo/poyo3.ogg', 'sound/rogue-star/poyo/poyo4.ogg',
+		'sound/rogue-star/poyo/poyo5.ogg', 'sound/rogue-star/poyo/poyo6.ogg', 'sound/rogue-star/poyo/poyo7.ogg', 'sound/rogue-star/poyo/poyo8.ogg',
+		'sound/rogue-star/poyo/poyo9.ogg', 'sound/rogue-star/poyo/poyo10.ogg', 'sound/rogue-star/poyo/poyo11.ogg', 'sound/rogue-star/poyo/poyo12.ogg',
+		'sound/rogue-star/poyo/poyo13.ogg', 'sound/rogue-star/poyo/poyo14.ogg', 'sound/rogue-star/poyo/poyo15.ogg', 'sound/rogue-star/poyo/poyo16.ogg',
+		'sound/rogue-star/poyo/poyo17.ogg', 'sound/rogue-star/poyo/poyo18.ogg', 'sound/rogue-star/poyo/poyo19.ogg', 'sound/rogue-star/poyo/poyo20.ogg',
+		'sound/rogue-star/poyo/poyo21.ogg', 'sound/rogue-star/poyo/poyo22.ogg', 'sound/rogue-star/poyo/poyo23.ogg')
 	sound_vary = TRUE
 
-/decl/emote/audible/glub/get_emote_sound(var/mob/living/user)
-	emote_sound = pick(soundlist)
-	. = ..()
+/decl/emote/audible/multisound/a
+	key = "a"
+	emote_message_1p = "You go A!"
+	emote_message_3p = "makes a sharp A!"
+
+	emote_message_impaired = "makes a sound but you can't hear it."
+
+	emote_message_1p_target = "You A sharply at TARGET!!!"
+	emote_message_3p_target = "makes a sharp A at TARGET!"
+
+	emote_sound = null
+	soundlist = list(
+		'sound/rogue-star/a/a1.ogg', 'sound/rogue-star/a/a2.ogg', 'sound/rogue-star/a/a3.ogg', 'sound/rogue-star/a/a4.ogg',
+		'sound/rogue-star/a/a5.ogg', 'sound/rogue-star/a/a6.ogg', 'sound/rogue-star/a/a7.ogg', 'sound/rogue-star/a/a8.ogg')
+	sound_vary = TRUE
+
+/decl/emote/audible/multisound/wawa
+	key = "wawa"
+	emote_message_1p = "You wawa!"
+	emote_message_3p = "wawas!"
+
+	emote_message_impaired = "makes a sound but you can't hear it."
+
+	emote_message_1p_target = "You wawa at TARGET!!!"
+	emote_message_3p_target = "wawas at TARGET!"
+
+	emote_sound = null
+	soundlist = list(
+		'sound/rogue-star/wawa/wawa1.ogg', 'sound/rogue-star/wawa/wawa2.ogg', 'sound/rogue-star/wawa/wawa3.ogg', 'sound/rogue-star/wawa/wawa4.ogg',
+		'sound/rogue-star/wawa/wawa5.ogg', 'sound/rogue-star/wawa/wawa6.ogg', 'sound/rogue-star/wawa/wawa7.ogg', 'sound/rogue-star/wawa/wawa8.ogg',
+		'sound/rogue-star/wawa/wawa9.ogg', 'sound/rogue-star/wawa/wawa10.ogg', 'sound/rogue-star/wawa/wawa11.ogg', 'sound/rogue-star/wawa/wawa12.ogg',
+		'sound/rogue-star/wawa/wawa13.ogg', 'sound/rogue-star/wawa/wawa14.ogg', 'sound/rogue-star/wawa/wawa15.ogg','sound/rogue-star/wawa/wawa16.ogg')
+	sound_vary = TRUE

code/modules/emotes/definitions/audible_scream_vr.dm

@@ -1,13 +1,31 @@
 /decl/emote/audible/scream/get_emote_sound(var/atom/user)
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(H.get_gender() == FEMALE)
-			return list(
-				"sound" = H.species.female_scream_sound,
-				"vol" = emote_volume
-			)
-		else
-			return list(
-				"sound" = H.species.male_scream_sound,
-				"vol" = emote_volume
-			)
+	if(!ishuman(user))	//RS EDIT START
+		return ..()
+
+	var/mob/living/carbon/human/H = user
+	if(H.client)
+		switch(H.client.prefs.screamsound)
+			if(1)
+				return list(
+					"sound" = pick("sound/screams/f1.ogg","sound/screams/f2.ogg","sound/screams/f3.ogg","sound/screams/f4.ogg","sound/screams/f5.ogg","sound/screams/f6.ogg","sound/screams/f7.ogg","sound/screams/f8.ogg","sound/screams/f9.ogg","sound/screams/f10.ogg","sound/screams/f11.ogg","sound/screams/f12.ogg","sound/screams/f13.ogg","sound/screams/f14.ogg","sound/screams/f15.ogg"),
+					"vol" = emote_volume
+				)
+			if(2)
+				return list(
+					"sound" = pick("sound/screams/m1.ogg","sound/screams/m2.ogg","sound/screams/m3.ogg","sound/screams/m4.ogg","sound/screams/m5.ogg","sound/screams/m6.ogg","sound/screams/m7.ogg","sound/screams/m8.ogg","sound/screams/m9.ogg","sound/screams/m10.ogg","sound/screams/m11.ogg","sound/screams/m12.ogg","sound/screams/m13.ogg","sound/screams/m14.ogg","sound/screams/m15.ogg","sound/screams/m16.ogg","sound/screams/m17.ogg"),
+					"vol" = emote_volume
+				)
+			if(3)
+				return
+
+	if(H.get_gender() == FEMALE)
+		return list(
+			"sound" = pick("sound/screams/f1.ogg","sound/screams/f2.ogg","sound/screams/f3.ogg","sound/screams/f4.ogg","sound/screams/f5.ogg","sound/screams/f6.ogg","sound/screams/f7.ogg","sound/screams/f8.ogg","sound/screams/f9.ogg","sound/screams/f10.ogg","sound/screams/f11.ogg","sound/screams/f12.ogg","sound/screams/f13.ogg","sound/screams/f14.ogg","sound/screams/f15.ogg"),
+			"vol" = emote_volume
+		)
+	else
+		return list(
+			"sound" = pick("sound/screams/m1.ogg","sound/screams/m2.ogg","sound/screams/m3.ogg","sound/screams/m4.ogg","sound/screams/m5.ogg","sound/screams/m6.ogg","sound/screams/m7.ogg","sound/screams/m8.ogg","sound/screams/m9.ogg","sound/screams/m10.ogg","sound/screams/m11.ogg","sound/screams/m12.ogg","sound/screams/m13.ogg","sound/screams/m14.ogg","sound/screams/m15.ogg","sound/screams/m16.ogg","sound/screams/m17.ogg"),
+			"vol" = emote_volume
+		)
+	//RS EDIT END

code/modules/mob/living/carbon/human/emote.dm

@@ -175,11 +175,14 @@ var/list/_human_default_emotes = list(
 	/decl/emote/audible/dook,
 	//VOREStation Add End
 	//RS ADD START
-	/decl/emote/audible/yip,
-	/decl/emote/audible/yip/yap,
-	/decl/emote/audible/awawa,
+	/decl/emote/audible/multisound/yip,
+	/decl/emote/audible/multisound/yap,
+	/decl/emote/audible/multisound/awawa,
 	/decl/emote/audible/glub,
-	/decl/emote/audible/blowkiss
+	/decl/emote/audible/blowkiss,
+	/decl/emote/audible/multisound/poyo,
+	/decl/emote/audible/multisound/a,
+	/decl/emote/audible/multisound/wawa
 	//RS ADD END
 )
 
@@ -324,10 +327,13 @@ var/list/_simple_mob_default_emotes = list(
 	/decl/emote/audible/dook,
 	//VOREStation Add End
 	//RS ADD START
-	/decl/emote/audible/yip,
-	/decl/emote/audible/yip/yap,
-	/decl/emote/audible/awawa,
-	/decl/emote/audible/glub
+	/decl/emote/audible/multisound/yip,
+	/decl/emote/audible/multisound/yap,
+	/decl/emote/audible/multisound/awawa,
+	/decl/emote/audible/glub,
+	/decl/emote/audible/multisound/poyo,
+	/decl/emote/audible/multisound/a,
+	/decl/emote/audible/multisound/wawa
 	//RS ADD END
 	)
 

code/modules/mob/living/carbon/human/emote_vr.dm

@@ -42,6 +42,25 @@
 	change_gender_identity(new_gender_identity)
 	return 1
 
+//RS ADD START
+/mob/living/carbon/human/verb/set_screamsound()
+	set name = "Set Scream Sound"
+	set desc = "Sets the kind of sound used when screaming."
+	set category = "IC"
+	var/new_screamsound = tgui_input_list(usr, "Please select the kind of voice for screaming:", "Set Scream Sound", list(FEMALE, MALE, "No Sound", "Default"))
+	if(!new_screamsound)
+		return
+	if(new_screamsound == FEMALE)
+		client.prefs.screamsound = 1
+	if(new_screamsound == MALE)
+		client.prefs.screamsound = 2
+	if(new_screamsound == "No Sound")
+		client.prefs.screamsound = 3
+	if(new_screamsound == "Default")
+		client.prefs.screamsound = 0
+
+//RS ADD END
+
 /mob/living/carbon/human/verb/switch_tail_layer()
 	set name = "Switch tail layer"
 	set category = "IC"
@@ -83,4 +102,4 @@
 		message = "reveals their tail!"
 	else
 		message = "hides their tail."
-	visible_message("<span class='filter_notice'>[src] [message]</span>")
+	visible_message("<span class='filter_notice'>[src] [message]</span>")