Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/client/preference_setup/global/01_ui.dm

@@ -17,6 +17,8 @@
 	S["tgui_input_lock"]		>> pref.tgui_input_lock
 	S["tgui_large_buttons"]		>> pref.tgui_large_buttons
 	S["tgui_swapped_buttons"]	>> pref.tgui_swapped_buttons
+	S["chat_timestamp"]			>> pref.chat_timestamp
+	S["throwmode_loud"]			>> pref.throwmode_loud
 
 /datum/category_item/player_setup_item/player_global/ui/save_preferences(var/savefile/S)
 	S["UI_style"]				<< pref.UI_style
@@ -33,6 +35,8 @@
 	S["tgui_input_lock"]		<< pref.tgui_input_lock
 	S["tgui_large_buttons"]		<< pref.tgui_large_buttons
 	S["tgui_swapped_buttons"]	<< pref.tgui_swapped_buttons
+	S["chat_timestamp"]			<< pref.chat_timestamp
+	S["throwmode_loud"]			<< pref.throwmode_loud
 
 /datum/category_item/player_setup_item/player_global/ui/sanitize_preferences()
 	pref.UI_style			= sanitize_inlist(pref.UI_style, all_ui_styles, initial(pref.UI_style))
@@ -49,6 +53,8 @@
 	pref.tgui_input_lock	= sanitize_integer(pref.tgui_input_lock, 0, 1, initial(pref.tgui_input_lock))
 	pref.tgui_large_buttons	= sanitize_integer(pref.tgui_large_buttons, 0, 1, initial(pref.tgui_large_buttons))
 	pref.tgui_swapped_buttons	= sanitize_integer(pref.tgui_swapped_buttons, 0, 1, initial(pref.tgui_swapped_buttons))
+	pref.chat_timestamp		= sanitize_integer(pref.chat_timestamp, 0, 1, initial(pref.chat_timestamp))
+	pref.throwmode_loud		= sanitize_integer(pref.throwmode_loud, 0, 1, initial(pref.throwmode_loud))
 
 /datum/category_item/player_setup_item/player_global/ui/content(var/mob/user)
 	. = "<b>UI Style:</b> <a href='?src=\ref[src];select_style=1'><b>[pref.UI_style]</b></a><br>"
@@ -65,6 +71,8 @@
 	. += "<b>TGUI Input Lock:</b> <a href='?src=\ref[src];tgui_input_lock=1'><b>[(pref.tgui_input_lock) ? "Enabled" : "Disabled (default)"]</b></a><br>"
 	. += "<b>TGUI Large Buttons:</b> <a href='?src=\ref[src];tgui_large_buttons=1'><b>[(pref.tgui_large_buttons) ? "Enabled (default)" : "Disabled"]</b></a><br>"
 	. += "<b>TGUI Swapped Buttons:</b> <a href='?src=\ref[src];tgui_swapped_buttons=1'><b>[(pref.tgui_swapped_buttons) ? "Enabled" : "Disabled (default)"]</b></a><br>"
+	. += "<b>Chat Timestamps:</b> <a href='?src=\ref[src];chat_timestamps=1'><b>[(pref.chat_timestamp) ? "Enabled" : "Disabled (default)"]</b></a><br>"
+	. += "<b>Throw Mode Messages:</b> <a href='?src=\ref[src];throwmode_loudness=1'><b>[(pref.throwmode_loud) ? "Loud" : "Quiet (default)"]</b></a><br>"
 	if(can_select_ooc_color(user))
 		. += "<b>OOC Color:</b>"
 		if(pref.ooccolor == initial(pref.ooccolor))
@@ -150,6 +158,14 @@
 		pref.tgui_swapped_buttons = !pref.tgui_swapped_buttons
 		return TOPIC_REFRESH
 
+	else if(href_list["chat_timestamps"])
+		pref.chat_timestamp = !pref.chat_timestamp
+		return TOPIC_REFRESH
+
+	else if(href_list["throwmode_loudness"])
+		pref.throwmode_loud = !pref.throwmode_loud
+		return TOPIC_REFRESH
+
 	else if(href_list["reset"])
 		switch(href_list["reset"])
 			if("ui")

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

@@ -113,6 +113,13 @@ var/list/_client_preferences_by_type
 	enabled_description = "Visible"
 	disabled_description = "Hidden"
 	enabled_by_default = FALSE
+
+/datum/client_preference/ghost_see_whisubtle
+	description = "See subtles/whispers as ghost"
+	key = "GHOST_SEE_WHISUBTLE"
+	enabled_description = "Visible"
+	disabled_description = "Hidden"
+	enabled_by_default = TRUE
 //VOREStation Add End
 /datum/client_preference/weather_sounds
 	description ="Weather sounds"
@@ -373,7 +380,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"

code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm

@@ -521,6 +521,12 @@
 	ckeywhitelist = list("hunterbirk")
 	character_name = list("Aria Blue")
 
+/datum/gear/fluff/elizabeth_conduct_medal
+	path = /obj/item/clothing/accessory/medal/conduct
+	display_name = "Elizabeth's Distinguished Conduct Medal"
+	ckeywhitelist = list("hunterbirk")
+	character_name = list("Elizabeth Bayou")
+
 /datum/gear/fluff/mercury_vopal_ring
 	path = /obj/item/clothing/gloves/ring/material/void_opal/fluff/mercury
 	display_name = "Mercury's Mate Ring"
@@ -1436,15 +1442,9 @@
 
 /datum/gear/fluff/harmony_id
 	path = /obj/item/weapon/card/id/event/polymorphic/itg
-	display_name = "Harmony's ITG-ID card"
+	display_name = "ITG-ID card"
 	ckeywhitelist = list("verysoft")
-	character_name = list("Harmony")
-
-/datum/gear/fluff/shinerunner_id
-	path = /obj/item/weapon/card/id/event/polymorphic/itg
-	display_name = "Shine-Runner's ITG-ID card"
-	ckeywhitelist = list("verysoft")
-	character_name = list("Shine-Runner")
+	character_name = null
 
 /datum/gear/fluff/dessa_hat
 	path = /obj/item/clothing/head/fluff/giantbow/dessa
@@ -1457,6 +1457,13 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
+/datum/gear/fluff/casey_glasses
+	path = /obj/item/clothing/glasses/big_round
+	display_name = "Big Round Glasses"
+	slot = slot_glasses
+	ckeywhitelist = list("verysoft")
+	character_name = null
+
 //  W CKEYS
 /datum/gear/fluff/sthasha_bracer
 	path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha

code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm

@@ -143,7 +143,7 @@ Talon jumpsuit
 
 //Altevian Uniforms
 /datum/gear/uniform/altevian
-	description = "An extremely comfortable set of clothing that's made to help people handle their day to day work around the fleets with little to no discomfort."
+	description = "A comfortable set of clothing for people to handle their day to day work around the fleets with little to no discomfort."
 	display_name = "altevian uniform selection"
 
 /datum/gear/uniform/altevian/New()

code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm

@@ -92,7 +92,7 @@
 	sort_category = "Xenowear"
 
 /datum/gear/uniform/altevian_outfit
-	description = "A uniform commonly seen from altevians during their work. The material on this uniform seems to be made of durable thread that can handle the stress of most matters of labor."
+	description = "A uniform commonly seen worn by altevians. The material on this uniform is made of a durable thread that can handle the stress of most forms of labor."
 	display_name = "altevian duty jumpsuit selection (Altevian)"
 	whitelisted = SPECIES_ALTEVIAN
 	sort_category = "Xenowear"
@@ -105,7 +105,7 @@
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants))
 
 /datum/gear/accessory/altevian_aquila
-	description = "An emblem commonly seen worn by the altevians for their work operations."
+	description = "An emblem found across all altevian vessels. The specific metals and jewels denote ranks. Otherwise, it's just a pretty rat skull emblem with a set of crystals for their eyes and fangs."
 	display_name = "royal altevian navy emblem selection"
 	whitelisted = SPECIES_ALTEVIAN
 	sort_category = "Xenowear"

code/modules/client/preference_setup/vore/07_traits.dm

@@ -5,6 +5,8 @@
 #define ORGANICS	1
 #define SYNTHETICS	2
 
+var/global/list/valid_bloodreagents = list("iron","copper","phoron","silver","gold","slimejelly")	//allowlist-based so people don't make their blood restored by alcohol or something really silly. use reagent IDs!
+
 /datum/preferences
 	var/custom_species	// Custom species name, can't be changed due to it having been used in savefiles already.
 	var/custom_base		// What to base the custom species on
@@ -115,6 +117,7 @@
 	S["neu_traits"]		>> pref.neu_traits
 	S["neg_traits"]		>> pref.neg_traits
 	S["blood_color"]	>> pref.blood_color
+	S["blood_reagents"]		>> pref.blood_reagents
 
 	S["traits_cheating"]	>> pref.traits_cheating
 	S["max_traits"]		>> pref.max_traits
@@ -135,6 +138,7 @@
 	S["neu_traits"]		<< pref.neu_traits
 	S["neg_traits"]		<< pref.neg_traits
 	S["blood_color"]	<< pref.blood_color
+	S["blood_reagents"]		<< pref.blood_reagents
 
 	S["traits_cheating"]	<< pref.traits_cheating
 	S["max_traits"]		<< pref.max_traits
@@ -154,6 +158,7 @@
 	if(!pref.neg_traits) pref.neg_traits = list()
 
 	pref.blood_color = sanitize_hexcolor(pref.blood_color, default="#A10808")
+	pref.blood_reagents	= sanitize_text(pref.blood_reagents, initial(pref.blood_reagents))
 
 	if(!pref.traits_cheating)
 		var/datum/species/S = GLOB.all_species[pref.species]
@@ -253,6 +258,7 @@
 
 	//Any additional non-trait settings can be applied here
 	new_S.blood_color = pref.blood_color
+	new_S.blood_reagents = pref.blood_reagents
 
 	if(pref.species == SPECIES_CUSTOM)
 		//Statistics for this would be nice
@@ -305,6 +311,8 @@
 	. += "<b>Blood Color: </b>" //People that want to use a certain species to have that species traits (xenochimera/promethean/spider) should be able to set their own blood color.
 	. += "<a href='?src=\ref[src];blood_color=1'>Set Color</a>"
 	. += "<a href='?src=\ref[src];blood_reset=1'>R</a><br>"
+	. += "<b>Blood Reagent: </b>"	//Wanna be copper-based? Go ahead.
+	. += "<a href='?src=\ref[src];blood_reagents=1'>[pref.blood_reagents]</a><br>"
 	. += "<br>"
 
 	. += "<b>Custom Say: </b>"
@@ -362,6 +370,12 @@
 			pref.blood_color = "#A10808"
 		return TOPIC_REFRESH
 
+	else if(href_list["blood_reagents"])
+		var/new_blood_reagents = tgui_input_list(user, "Choose your character's blood restoration reagent:", "Character Preference", valid_bloodreagents)
+		if(new_blood_reagents && CanUseTopic(user))
+			pref.blood_reagents = new_blood_reagents
+			return TOPIC_REFRESH
+
 	else if(href_list["clicked_pos_trait"])
 		var/datum/trait/trait = text2path(href_list["clicked_pos_trait"])
 		var/choice = tgui_alert(usr, "Remove [initial(trait.name)] and regain [initial(trait.cost)] points?","Remove Trait",list("Remove","Cancel"))

code/modules/client/preferences.dm

@@ -32,6 +32,8 @@ var/list/preferences_datums = list()
 	var/tgui_input_lock = FALSE
 	var/tgui_large_buttons = TRUE
 	var/tgui_swapped_buttons = FALSE
+	var/chat_timestamp = FALSE
+	var/throwmode_loud = FALSE
 
 	//character preferences
 	var/real_name						//our character's name
@@ -44,6 +46,7 @@ var/list/preferences_datums = list()
 	var/bday_announce = FALSE			//Public announcement for birthdays
 	var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2).
 	var/b_type = "A+"					//blood type (not-chooseable)
+	var/blood_reagents = "iron"				//blood restoration reagents
 	var/backbag = 2						//backpack type
 	var/pdachoice = 1					//PDA type
 	var/h_style = "Bald"				//Hair type

code/modules/client/preferences_factions.dm

@@ -62,7 +62,10 @@ var/global/list/home_system_choices = list(
 	"Abundance in All Things Serene, Beta-Carnelium Ventrum",
 	"Jorhul, Barkalis",
 	"Shelf Flotilla",
-	"Ue-Orsi Flotilla"
+	"Ue-Orsi Flotilla",
+	"AH-CV Prosperity",
+	"AH-CV Migrant",
+	"Altevian Colony Ship"
 	)
 
 var/global/list/faction_choices = list(

code/modules/client/preferences_toggle_procs.dm

@@ -390,6 +390,26 @@
 	to_chat(src, span_notice("You have toggled TGUI input lock: [prefs.tgui_input_lock ? "ON" : "OFF"] \n \
 	This setting determines whether pressing enter on TGUI input sends the input, or creates a newline."))
 
+/client/verb/toggle_chat_timestamps()
+	set name = "Toggle Chat Timestamps"
+	set category = "Preferences"
+	set desc = "Toggles whether or not messages in chat will display timestamps. Enabling this will not add timestamps to messages that have already been sent."
+
+	prefs.chat_timestamp = !prefs.chat_timestamp	//There is no preference datum for tgui input lock, nor for any TGUI prefs.
+	SScharacter_setup.queue_preferences_save(prefs)
+
+	to_chat(src, span_notice("You have toggled chat timestamps: [prefs.chat_timestamp ? "ON" : "OFF"]."))
+
+/client/verb/toggle_throwmode_messages()
+	set name = "Toggle Throw Mode Messages"
+	set category = "Preferences"
+	set desc = "Toggles whether or not activating throw mode (hotkey: R) will announce you're preparing to throw your current handheld item, or catch an incoming item if your hand is empty."
+
+	prefs.throwmode_loud = !prefs.throwmode_loud	//There is no preference datum for tgui input lock, nor for any TGUI prefs.
+	SScharacter_setup.queue_preferences_save(prefs)
+
+	to_chat(src, span_notice("You have toggled throw mode messages: [prefs.throwmode_loud ? "ON" : "OFF"]."))
+
 /client/verb/toggle_status_indicators()
 	set name = "Toggle Status Indicators"
 	set category = "Preferences"

code/modules/client/preferences_vr.dm

@@ -88,6 +88,21 @@
 
 	feedback_add_details("admin_verb","TWhisubtleVis") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/verb/toggle_ghost_privacyvision()
+	set name = "Toggle Ghost Private Eyes/ears"
+	set category = "Preferences"
+	set desc = "Toggles your ability to see subtles/whispers. Overrides admin status. Respects Ghost Privacy"
+
+	var/pref_path = /datum/client_preference/ghost_see_whisubtle
+
+	toggle_preference(pref_path)
+
+	to_chat(src, "As a ghost, you will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear subtles/whispers made by players.")
+
+	SScharacter_setup.queue_preferences_save(prefs)
+
+	feedback_add_details("admin_verb","TGhostSeeWhisSubtle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /client/verb/toggle_capture_crystal()
 	set name = "Toggle Catchable"
 	set category = "Preferences"