Merge branch 'master' into shep-dev-barky-noises

code/modules/client/preference_setup/general/03_body.dm

@@ -2,6 +2,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 
 /datum/preferences
 	var/equip_preview_mob = EQUIP_PREVIEW_ALL
+	var/animations_toggle = FALSE
 
 	var/icon/bgstate = "000"
 	var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced")
@@ -569,6 +570,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	. += "<br><a href='?src=\ref[src];cycle_bg=1'>Cycle background</a>"
 	. += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_LOADOUT]'>[pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]</a>"
 	. += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_JOB]'>[pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]</a>"
+	. += "<br><a href='?src=\ref[src];toggle_animations=1'>[pref.animations_toggle ? "Stop animations" : "Show animations"]</a>"
 	. += "</td></tr></table>"
 
 	. += "<b>Hair</b><br>"
@@ -1154,6 +1156,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		pref.equip_preview_mob ^= text2num(href_list["toggle_preview_value"])
 		return TOPIC_REFRESH_UPDATE_PREVIEW
 
+	else if(href_list["toggle_animations"])
+		pref.animations_toggle = !pref.animations_toggle
+		return TOPIC_REFRESH_UPDATE_PREVIEW
+
 	else if(href_list["synth_color"])
 		pref.synth_color = !pref.synth_color
 		return TOPIC_REFRESH_UPDATE_PREVIEW

code/modules/client/preference_setup/general/05_background.dm

@@ -7,6 +7,7 @@
 	S["sec_record"]				>> pref.sec_record
 	S["gen_record"]				>> pref.gen_record
 	S["home_system"]			>> pref.home_system
+	S["birthplace"]				>> pref.birthplace
 	S["citizenship"]			>> pref.citizenship
 	S["faction"]				>> pref.faction
 	S["religion"]				>> pref.religion
@@ -17,6 +18,7 @@
 	S["sec_record"]				<< pref.sec_record
 	S["gen_record"]				<< pref.gen_record
 	S["home_system"]			<< pref.home_system
+	S["birthplace"]				<< pref.birthplace
 	S["citizenship"]			<< pref.citizenship
 	S["faction"]				<< pref.faction
 	S["religion"]				<< pref.religion
@@ -24,6 +26,7 @@
 
 /datum/category_item/player_setup_item/general/background/sanitize_character()
 	if(!pref.home_system) pref.home_system = "Unset"
+	if(!pref.birthplace)  pref.birthplace =  "Unset"
 	if(!pref.citizenship) pref.citizenship = "None"
 	if(!pref.faction)     pref.faction =     "None"
 	if(!pref.religion)    pref.religion =    "None"
@@ -36,6 +39,7 @@
 	character.sec_record		= pref.sec_record
 	character.gen_record		= pref.gen_record
 	character.home_system		= pref.home_system
+	character.birthplace		= pref.birthplace
 	character.citizenship		= pref.citizenship
 	character.personal_faction	= pref.faction
 	character.religion			= pref.religion
@@ -43,7 +47,8 @@
 /datum/category_item/player_setup_item/general/background/content(var/mob/user)
 	. += "<b>Background Information</b><br>"
 	. += "Economic Status: <a href='?src=\ref[src];econ_status=1'>[pref.economic_status]</a><br/>"
-	. += "Home System: <a href='?src=\ref[src];home_system=1'>[pref.home_system]</a><br/>"
+	. += "Home: <a href='?src=\ref[src];home_system=1'>[pref.home_system]</a><br/>"
+	. += "Birthplace: <a href='?src=\ref[src];birthplace=1'>[pref.birthplace]</a><br/>"
 	. += "Citizenship: <a href='?src=\ref[src];citizenship=1'>[pref.citizenship]</a><br/>"
 	. += "Faction: <a href='?src=\ref[src];faction=1'>[pref.faction]</a><br/>"
 	. += "Religion: <a href='?src=\ref[src];religion=1'>[pref.religion]</a><br/>"
@@ -67,7 +72,7 @@
 			return TOPIC_REFRESH
 
 	else if(href_list["home_system"])
-		var/choice = tgui_input_list(user, "Please choose a home system.", "Character Preference", home_system_choices + list("Unset","Other"), pref.home_system)
+		var/choice = tgui_input_list(user, "Please choose your home planet and/or system. This should be your current primary residence. Select \"Other\" to specify manually.", "Character Preference", home_system_choices + list("Unset","Other"), pref.home_system)
 		if(!choice || !CanUseTopic(user))
 			return TOPIC_NOACTION
 		if(choice == "Other")
@@ -78,8 +83,20 @@
 			pref.home_system = choice
 		return TOPIC_REFRESH
 
+	else if(href_list["birthplace"])
+		var/choice = tgui_input_list(user, "Please choose the planet and/or system or other appropriate location that you were born/created. Select \"Other\" to specify manually.", "Character Preference", home_system_choices + list("Unset","Other"), pref.birthplace)
+		if(!choice || !CanUseTopic(user))
+			return TOPIC_NOACTION
+		if(choice == "Other")
+			var/raw_choice = sanitize(tgui_input_text(user, "Please enter a birthplace.", "Character Preference", null, MAX_NAME_LEN), MAX_NAME_LEN)
+			if(raw_choice && CanUseTopic(user))
+				pref.birthplace = raw_choice
+		else
+			pref.birthplace = choice
+		return TOPIC_REFRESH
+
 	else if(href_list["citizenship"])
-		var/choice = tgui_input_list(user, "Please choose your current citizenship.", "Character Preference", citizenship_choices + list("None","Other"), pref.citizenship)
+		var/choice = tgui_input_list(user, "Please select the faction or political entity with which you currently hold citizenship. Select \"Other\" to specify manually.", "Character Preference", citizenship_choices + list("None","Other"), pref.citizenship)
 		if(!choice || !CanUseTopic(user))
 			return TOPIC_NOACTION
 		if(choice == "Other")
@@ -91,7 +108,7 @@
 		return TOPIC_REFRESH
 
 	else if(href_list["faction"])
-		var/choice = tgui_input_list(user, "Please choose a faction to work for.", "Character Preference", faction_choices + list("None","Other"), pref.faction)
+		var/choice = tgui_input_list(user, "Please choose the faction you primarily work for, if you are not under the direct employ of NanoTrasen. Select \"Other\" to specify manually.", "Character Preference", faction_choices + list("None","Other"), pref.faction)
 		if(!choice || !CanUseTopic(user))
 			return TOPIC_NOACTION
 		if(choice == "Other")
@@ -103,7 +120,7 @@
 		return TOPIC_REFRESH
 
 	else if(href_list["religion"])
-		var/choice = tgui_input_list(user, "Please choose a religion.", "Character Preference", religion_choices + list("None","Other"), pref.religion)
+		var/choice = tgui_input_list(user, "Please choose a religion. Select \"Other\" to specify manually.", "Character Preference", religion_choices + list("None","Other"), pref.religion)
 		if(!choice || !CanUseTopic(user))
 			return TOPIC_NOACTION
 		if(choice == "Other")

code/modules/client/preference_setup/global/setting_datums.dm

@@ -381,7 +381,7 @@ var/list/_client_preferences_by_type
 	key = "RECEIVE_TIPS"
 	enabled_description = "Enabled"
 	disabled_description = "Disabled"
- 
+
 /datum/client_preference/pain_frequency
 	description = "Pain Messages Cooldown"
 	key = "PAIN_FREQUENCY"
@@ -389,6 +389,14 @@ var/list/_client_preferences_by_type
 	enabled_description = "Extended"
 	disabled_description = "Default"
 
+// CHOMPAdd
+/datum/client_preference/sleep_music
+	description = "Sleeping Music"
+	key = "SLEEP_MUSIC"
+	enabled_description = "Audible"
+	disabled_description = "Silent"
+// CHOMPAdd End
+
 
 /********************
 * Staff Preferences *

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

@@ -247,7 +247,7 @@
 		return TOPIC_REFRESH
 
 	else if(href_list["voice_test"])
-		var/sound/S = pick(pref.voice_sound)
+		var/sound/S
 		switch(pref.voice_sound)
 			if("beep-boop")
 				S = sound(pick(talk_sound))
@@ -277,10 +277,10 @@
 				S = sound(pick(goon_speak_roach_sound))
 			if("goon speak skelly")
 				S = sound(pick(goon_speak_skelly_sound))
-		S.frequency = pick(pref.voice_freq)
-		S.volume = 50
-		SEND_SOUND(user, S)
-		return TOPIC_REFRESH  // CHOMPEdit
+		if(S)
+			S.frequency = pick(pref.voice_freq)
+			S.volume = 50
+			SEND_SOUND(user, S)
 	// CHOMPEdit Start: Pain/Scream/Death sounds
 	else if(href_list["species_sound_options"]) // You shouldn't be able to see this option if you don't have the option to select a custom icon base, so we don't need to re-check for safety here.
 		var/list/possible_species_sound_types = species_sound_map

code/modules/client/preference_setup/vore/09_misc.dm

@@ -11,6 +11,7 @@
 	S["directory_ad"]			>> pref.directory_ad
 	S["sensorpref"]				>> pref.sensorpref
 	S["capture_crystal"]		>> pref.capture_crystal
+	S["auto_backup_implant"]	>> pref.auto_backup_implant
 
 /datum/category_item/player_setup_item/vore/misc/save_character(var/savefile/S)
 	S["show_in_directory"]		<< pref.show_in_directory
@@ -21,7 +22,7 @@
 	S["directory_ad"]			<< pref.directory_ad
 	S["sensorpref"]				<< pref.sensorpref
 	S["capture_crystal"]		<< pref.capture_crystal
-
+	S["auto_backup_implant"]	<< pref.auto_backup_implant
 
 /datum/category_item/player_setup_item/vore/misc/copy_to_mob(var/mob/living/carbon/human/character)
 	if(pref.sensorpref > 5 || pref.sensorpref < 1)
@@ -37,6 +38,7 @@
 	pref.directory_erptag		= sanitize_inlist(pref.directory_erptag, GLOB.char_directory_erptags, initial(pref.directory_erptag))
 	pref.sensorpref				= sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref))
 	pref.capture_crystal		= sanitize_integer(pref.capture_crystal, 0, 1, initial(pref.capture_crystal))
+	pref.auto_backup_implant		= sanitize_integer(pref.auto_backup_implant, 0, 1, initial(pref.auto_backup_implant))
 
 /datum/category_item/player_setup_item/vore/misc/content(var/mob/user)
 	. += "<br>"
@@ -47,7 +49,8 @@
 	. += "<b>Character Directory ERP Tag:</b> <a href='?src=\ref[src];directory_erptag=1'><b>[pref.directory_erptag]</b></a><br>"
 	. += "<b>Character Directory Advertisement:</b> <a href='?src=\ref[src];directory_ad=1'><b>Set Directory Ad</b></a><br>"
 	. += "<b>Suit Sensors Preference:</b> <a [pref.sensorpref ? "" : ""] href='?src=\ref[src];toggle_sensor_setting=1'><b>[sensorpreflist[pref.sensorpref]]</b></a><br>"
-	. += "<b>Capture Crystal Preference</b> <a [pref.capture_crystal ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_capture_crystal=1'><b>[pref.capture_crystal ? "Yes" : "No"]</b></a><br>"
+	. += "<b>Capture Crystal Preference:</b> <a [pref.capture_crystal ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_capture_crystal=1'><b>[pref.capture_crystal ? "Yes" : "No"]</b></a><br>"
+	. += "<b>Spawn With Backup Implant:</b> <a [pref.auto_backup_implant ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_implant=1'><b>[pref.auto_backup_implant ? "Yes" : "No"]</b></a><br>"
 
 /datum/category_item/player_setup_item/vore/misc/OnTopic(var/href, var/list/href_list, var/mob/user)
 	if(href_list["toggle_show_in_directory"])
@@ -93,5 +96,7 @@
 	else if(href_list["toggle_capture_crystal"])
 		pref.capture_crystal = pref.capture_crystal ? 0 : 1;
 		return TOPIC_REFRESH
-
+	else if(href_list["toggle_implant"])
+		pref.auto_backup_implant = pref.auto_backup_implant ? 0 : 1;
+		return TOPIC_REFRESH
 	return ..();

code/modules/client/preferences.dm

@@ -76,8 +76,9 @@ var/list/preferences_datums = list()
 	var/synth_markings = 1				//Enable/disable markings on synth parts. //VOREStation Edit - 1 by default
 
 		//Some faction information.
-	var/home_system = "Unset"           //System of birth.
-	var/citizenship = "None"            //Current home system.
+	var/home_system = "Unset"           //Current home or residence.
+	var/birthplace = "Unset"           //Location of birth.
+	var/citizenship = "None"            //Government or similar entity with which you hold citizenship.
 	var/faction = "None"                //General associated faction.
 	var/religion = "None"               //Religious association.
 	var/antag_faction = "None"			//Antag associated faction.

code/modules/client/preferences_ch.dm

@@ -12,3 +12,18 @@
 	SScharacter_setup.queue_preferences_save(prefs)
 
 	feedback_add_details("admin_verb","TAlarmLoops") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_sleep_music()
+	set name = "Toggle Sleeping Music"
+	set category = "Preferences"
+	set desc = "When enabled, you will hear cozy music played during surgery, cryo, and sleeper pod usage."
+
+	var/pref_path = /datum/client_preference/sleep_music
+
+	toggle_preference(pref_path)
+
+	to_chat(src, "You are [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hearing sleeping music while in cryo/surgery/sleeper.")
+
+	SScharacter_setup.queue_preferences_save(prefs)
+
+	feedback_add_details("admin_verb", "TSleepMusic")

code/modules/client/preferences_factions.dm

@@ -24,29 +24,66 @@ var/global/list/citizenship_choices = list(
 	)
 
 var/global/list/home_system_choices = list(
-	"Sol",
-	"Vir",
-	"Nyx",
-	"Tau Ceti",
-	"Qerr'valis",
+	"Earth, Sol",
+	"Luna, Sol",
+	"Mars, Sol",
+	"Venus, Sol",
+	"Titan, Sol",
+	"Kara, Vir",
+	"Sif, Vir",
+	"Brinkburn, Nyx",
+	"Binma, Tau Ceti",
+	"Qerr'balak, Qerr'valis",
 	"Epsilon Ursae Minoris",
-	"Rarkajar"
+	"Meralar, Rarkajar",
+	"Tal, Vilous",
+	"Menhir, Alat-Hahr",
+	"Altam, Vazzend",
+	"Uh'Zata, Kelezakata",
+	"Moghes, Uuoea-Esa",
+	"Xohok, Uuoea-Esa",
+	"Varilak, Antares",
+	"Sanctorum, Sanctum",
+	"Infernum, Sanctum",
+	"Abundance in All Things Serene, Beta-Carnelium Ventrum",
+	"Jorhul, Barkalis",
+	"Shelf Flotilla",
+	"Ue-Orsi Flotilla"
 	)
 
 var/global/list/faction_choices = list(
 	"Sol Central",
-	"Vey Med",
-	"Einstein Engines",
+	"NanoTrasen Incorporated",
+	"Hephaestus Industries",
+	"Vey-Medical",
+	"Zeng-Hu Pharmaceuticals",
+	"Ward-Takahashi GMC",
+	"Bishop Cybernetics",
+	"Morpheus Cyberkinetics",
+	"Xion Manufacturing Group",
 	"Free Trade Union",
-	"NanoTrasen",
-	"Ward-Takahashi GMB",
-	"Gilthari Exports",
+	"Major Bill's Transportation",
+	"Ironcrest Transport Group",
 	"Grayson Manufactories Ltd.",
 	"Aether Atmospherics",
-	"Zeng-Hu Pharmaceuticals",
-	"Hephaestus Industries",
-	"Morpheus Cyberkinetics",
-	"Xion Manufacturing Group"
+	"Focal Point Energistics",
+	"StarFlight Inc.",
+	"Oculum Broadcasting Network",
+	"Periphery Post",
+	"Free Anur Tribune",
+	"Centauri Provisions",
+	"Einstein Engines",
+	"Wulf Aeronautics",
+	"Gilthari Exports",
+	"Coyote Salvage Corp.",
+	"Chimera Genetics Corp.",
+	"Kitsuhana Heavy Industries",
+	"Independent Pilots Association",
+	"Local System Defense Force",
+	"United Solar Defense Force",
+	"Proxima Centauri Risk Control",
+	"HIVE Security",
+	"Stealth Assault Enterprises"
 	)
 
 var/global/list/antag_faction_choices = list()	//Should be populated after brainstorming. Leaving as blank in case brainstorming does not occur.
@@ -76,4 +113,4 @@ var/global/list/religion_choices = list(
 	"Tajr-kii Rarkajar",
 	"Agnosticism",
 	"Deism"
-	)
+	)

code/modules/client/preferences_vr.dm

@@ -9,6 +9,7 @@
 	var/directory_ad = ""		//Advertisement stuff to show in character directory.
 	var/sensorpref = 5			//Set character's suit sensor level
 	var/capture_crystal = 1	//Whether or not someone is able to be caught with capture crystals
+	var/auto_backup_implant = FALSE //Whether someone starts with a backup implant or not.
 
 	var/job_talon_high = 0
 	var/job_talon_med = 0

code/modules/client/verbs/who.dm

@@ -44,7 +44,7 @@
 			var/seconds = C.last_activity_seconds()
 			entry += " (AFK - [round(seconds / 60)] minutes, [seconds % 60] seconds)"
 
-		entry += " (<A HREF='?_src_=holder;[HrefToken()];adminmoreinfo=\ref[C.mob]'>?</A>)"
+		entry += " [ADMIN_QUE(C.mob)]"
 		Lines += entry
 
 	for(var/line in sortList(Lines))