Merge branch 'master' into upstream-merge-14570

code/modules/client/preference_setup/vore/02_size.dm

@@ -17,6 +17,7 @@
 	var/offset_override = FALSE //CHOMPEdit
 	var/voice_freq = 42500	//CHOMPEdit - Why was the default 0
 	var/voice_sound = "goon speak 1"	//CHOMPEdit - Changed the default voice to one less jarring
+	var/custom_speech_bubble = "default"
 
 // Definition of the stuff for Sizing
 /datum/category_item/player_setup_item/vore/size
@@ -32,6 +33,7 @@
 	S["offset_override"]	>> pref.offset_override //CHOMPEdit
 	S["voice_freq"]			>> pref.voice_freq
 	S["voice_sound"]		>> pref.voice_sound
+	S["custom_speech_bubble"]		>> pref.custom_speech_bubble
 
 /datum/category_item/player_setup_item/vore/size/save_character(var/savefile/S)
 	S["size_multiplier"]	<< pref.size_multiplier
@@ -42,6 +44,7 @@
 	S["offset_override"]	<< pref.offset_override //CHOMPEdit
 	S["voice_freq"]			<< pref.voice_freq
 	S["voice_sound"]		<< pref.voice_sound
+	S["custom_speech_bubble"]		<< pref.custom_speech_bubble
 
 
 /datum/category_item/player_setup_item/vore/size/sanitize_character()
@@ -54,6 +57,8 @@
 		pref.voice_freq			= sanitize_integer(pref.voice_freq, MIN_VOICE_FREQ, MAX_VOICE_FREQ, initial(pref.fuzzy))
 	if(pref.size_multiplier == null || pref.size_multiplier < RESIZE_TINY || pref.size_multiplier > RESIZE_HUGE)
 		pref.size_multiplier = initial(pref.size_multiplier)
+	if(!(pref.custom_speech_bubble in selectable_speech_bubbles))
+		pref.custom_speech_bubble = "default"
 
 /datum/category_item/player_setup_item/vore/size/copy_to_mob(var/mob/living/carbon/human/character)
 	character.weight			= pref.weight_vr
@@ -95,6 +100,7 @@
 				character.voice_sounds_list = goon_speak_roach_sound
 			if("goon speak skelly")
 				character.voice_sounds_list = goon_speak_skelly_sound
+	character.custom_speech_bubble = pref.custom_speech_bubble
 
 /datum/category_item/player_setup_item/vore/size/content(var/mob/user)
 	. += "<br>"
@@ -103,12 +109,8 @@
 	. += "<b>Scaling Center:</b> <a [pref.offset_override ? "" : ""] href='?src=\ref[src];toggle_offset_override=1'><b>[pref.offset_override ? "Odd" : "Even"]</b></a><br>" //CHOMPEdit
 	. += "<b>Voice Frequency:</b> <a href='?src=\ref[src];voice_freq=1'>[pref.voice_freq]</a><br>"
 	. += "<b>Voice Sounds:</b> <a href='?src=\ref[src];voice_sounds_list=1'>[pref.voice_sound]</a><br>"
-<<<<<<< HEAD
-	. += "<a href='?src=\ref[src];voice_test=1'><b>Test Selected Voice</b></a><br>" // CHOMPEdit: Enables testing voices
-=======
 	. += "<a href='?src=\ref[src];voice_test=1'><b>Test Selected Voice</b></a><br>"
 	. += "<b>Custom Speech Bubble:</b> <a href='?src=\ref[src];customize_speech_bubble=1'>[pref.custom_speech_bubble]</a><br>"
->>>>>>> afd540e7a9... Merge pull request #14570 from Rykka-Stormheart/shep-dev-voice-testing
 	. += "<br>"
 	. += "<b>Relative Weight:</b>  <a href='?src=\ref[src];weight=1'>[pref.weight_vr]</a><br>"
 	. += "<b>Weight Gain Rate:</b> <a href='?src=\ref[src];weight_gain=1'>[pref.weight_gain]</a><br>"
@@ -205,9 +207,6 @@
 			pref.voice_sound = "goon speak 1"	//CHOMPEdit - Defaults voice to a less jarring sound
 		else
 			pref.voice_sound = choice
-<<<<<<< HEAD
-	// CHOMPEdit: Enable testing voice sounds
-=======
 		return TOPIC_REFRESH
 	else if(href_list["customize_speech_bubble"])
 		var/choice = tgui_input_list(usr, "What speech bubble style do you want to use? (default for automatic selection)", "Custom Speech Bubble", selectable_speech_bubbles)
@@ -217,7 +216,6 @@
 			pref.custom_speech_bubble = choice
 		return TOPIC_REFRESH
 
->>>>>>> afd540e7a9... Merge pull request #14570 from Rykka-Stormheart/shep-dev-voice-testing
 	else if(href_list["voice_test"])
 		var/sound/S = pick(pref.voice_sound)
 		switch(pref.voice_sound)
@@ -252,9 +250,5 @@
 		S.frequency = pick(pref.voice_freq)
 		S.volume = 50
 		SEND_SOUND(user, S)
-<<<<<<< HEAD
-	// CHOMPEdit End
-=======
 
->>>>>>> afd540e7a9... Merge pull request #14570 from Rykka-Stormheart/shep-dev-voice-testing
-	return ..();
+	return ..();