Merge branch 'master' into kk-misc

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

@@ -336,7 +336,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	. += " Style: <a href='?src=\ref[src];hair_style_left=[pref.h_style]'><</a> <a href='?src=\ref[src];hair_style_right=[pref.h_style]''>></a> <a href='?src=\ref[src];hair_style=1'>[pref.h_style]</a><br>" //The <</a> & ></a> in this line is correct-- those extra characters are the arrows you click to switch between styles.
 
 	. += "<b>Gradient</b><br>"
-		. += "<a href='?src=\ref[src];grad_color=1'>Change Color</a> [color_square(pref.r_grad, pref.g_grad, pref.b_grad)] "
+	. += "<a href='?src=\ref[src];grad_color=1'>Change Color</a> [color_square(pref.r_grad, pref.g_grad, pref.b_grad)] "
 	. += " Style: <a href='?src=\ref[src];grad_style_left=[pref.grad_style]'><</a> <a href='?src=\ref[src];grad_style_right=[pref.grad_style]''>></a> <a href='?src=\ref[src];grad_style=1'>[pref.grad_style]</a><br>"
 
 	. += "<br><b>Facial</b><br>"

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

@@ -9,6 +9,10 @@
 	S["ooccolor"]		>> pref.ooccolor
 	S["tooltipstyle"]	>> pref.tooltipstyle
 	S["client_fps"]		>> pref.client_fps
+	S["ambience_freq"]	>> pref.ambience_freq
+	S["ambience_chance"] >> pref.ambience_chance
+	S["tgui_fancy"]		>> pref.tgui_fancy
+	S["tgui_lock"]		>> pref.tgui_lock
 
 /datum/category_item/player_setup_item/player_global/ui/save_preferences(var/savefile/S)
 	S["UI_style"]		<< pref.UI_style
@@ -17,28 +21,40 @@
 	S["ooccolor"]		<< pref.ooccolor
 	S["tooltipstyle"]	<< pref.tooltipstyle
 	S["client_fps"]		<< pref.client_fps
+	S["ambience_freq"]	<< pref.ambience_freq
+	S["ambience_chance"] << pref.ambience_freq
+	S["tgui_fancy"]		<< pref.tgui_fancy
+	S["tgui_lock"]		<< pref.tgui_lock
 
 /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))
-	pref.UI_style_color	= sanitize_hexcolor(pref.UI_style_color, initial(pref.UI_style_color))
-	pref.UI_style_alpha	= sanitize_integer(pref.UI_style_alpha, 0, 255, initial(pref.UI_style_alpha))
-	pref.ooccolor		= sanitize_hexcolor(pref.ooccolor, initial(pref.ooccolor))
-	pref.tooltipstyle	= sanitize_inlist(pref.tooltipstyle, all_tooltip_styles, initial(pref.tooltipstyle))
-	pref.client_fps		= sanitize_integer(pref.client_fps, 0, MAX_CLIENT_FPS, initial(pref.client_fps))
+	pref.UI_style			= sanitize_inlist(pref.UI_style, all_ui_styles, initial(pref.UI_style))
+	pref.UI_style_color		= sanitize_hexcolor(pref.UI_style_color, initial(pref.UI_style_color))
+	pref.UI_style_alpha		= sanitize_integer(pref.UI_style_alpha, 0, 255, initial(pref.UI_style_alpha))
+	pref.ooccolor			= sanitize_hexcolor(pref.ooccolor, initial(pref.ooccolor))
+	pref.tooltipstyle		= sanitize_inlist(pref.tooltipstyle, all_tooltip_styles, initial(pref.tooltipstyle))
+	pref.client_fps			= sanitize_integer(pref.client_fps, 0, MAX_CLIENT_FPS, initial(pref.client_fps))
+	pref.ambience_freq		= sanitize_integer(pref.ambience_freq, 0, 60, initial(pref.ambience_freq)) // No more than once per hour.
+	pref.ambience_chance 	= sanitize_integer(pref.ambience_chance, 0, 100, initial(pref.ambience_chance)) // 0-100 range.
+	pref.tgui_fancy			= sanitize_integer(pref.tgui_fancy, 0, 1, initial(pref.tgui_fancy))
+	pref.tgui_lock			= sanitize_integer(pref.tgui_lock, 0, 1, initial(pref.tgui_lock))
 
 /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>"
 	. += "<b>Custom UI</b> (recommended for White UI):<br>"
-	. += "-Color: <a href='?src=\ref[src];select_color=1'><b>[pref.UI_style_color]</b></a><3E>[color_square(hex = pref.UI_style_color)]<5D><a href='?src=\ref[src];reset=ui'>reset</a><br>"
-	. += "-Alpha(transparency): <a href='?src=\ref[src];select_alpha=1'><b>[pref.UI_style_alpha]</b></a><3E><a href='?src=\ref[src];reset=alpha'>reset</a><br>"
+	. += "-Color: <a href='?src=\ref[src];select_color=1'><b>[pref.UI_style_color]</b></a><3E>[color_square(hex = pref.UI_style_color)]<5D><a href='?src=\ref[src];reset=ui'>reset</a><br>"
+	. += "-Alpha(transparency): <a href='?src=\ref[src];select_alpha=1'><b>[pref.UI_style_alpha]</b></a><3E><a href='?src=\ref[src];reset=alpha'>reset</a><br>"
 	. += "<b>Tooltip Style:</b> <a href='?src=\ref[src];select_tooltip_style=1'><b>[pref.tooltipstyle]</b></a><br>"
 	. += "<b>Client FPS:</b> <a href='?src=\ref[src];select_client_fps=1'><b>[pref.client_fps]</b></a><br>"
+	. += "<b>Random Ambience Frequency:</b> <a href='?src=\ref[src];select_ambience_freq=1'><b>[pref.ambience_freq]</b></a><br>"
+	. += "<b>Ambience Chance:</b> <a href='?src=\ref[src];select_ambience_chance=1'><b>[pref.ambience_chance]</b></a><br>"
+	. += "<b>tgui Window Mode:</b> <a href='?src=\ref[src];tgui_fancy=1'><b>[(pref.tgui_fancy) ? "Fancy (default)" : "Compatible (slower)"]</b></a><br>"
+	. += "<b>tgui Window Placement:</b> <a href='?src=\ref[src];tgui_lock=1'><b>[(pref.tgui_lock) ? "Primary Monitor" : "Free (default)"]</b></a><br>"
 	if(can_select_ooc_color(user))
-		. += "<b>OOC Color:</b><3E>"
+		. += "<b>OOC Color:</b><3E>"
 		if(pref.ooccolor == initial(pref.ooccolor))
 			. += "<a href='?src=\ref[src];select_ooc_color=1'><b>Using Default</b></a><br>"
 		else
-			. += "<a href='?src=\ref[src];select_ooc_color=1'><b>[pref.ooccolor]</b></a> [color_square(hex = pref.ooccolor)]<5D><a href='?src=\ref[src];reset=ooc'>reset</a><br>"
+			. += "<a href='?src=\ref[src];select_ooc_color=1'><b>[pref.ooccolor]</b></a> [color_square(hex = pref.ooccolor)]<5D><a href='?src=\ref[src];reset=ooc'>reset</a><br>"
 
 /datum/category_item/player_setup_item/player_global/ui/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["select_style"])
@@ -79,6 +95,28 @@
 		if(pref.client)
 			pref.client.fps = fps_new
 		return TOPIC_REFRESH
+		
+	else if(href_list["select_ambience_freq"])
+		var/ambience_new = input(user, "Input how often you wish to hear ambience repeated! (1-60 MINUTES, 0 for disabled)", "Global Preference", pref.ambience_freq) as null|num
+		if(isnull(ambience_new) || !CanUseTopic(user)) return TOPIC_NOACTION
+		if(ambience_new < 0 || ambience_new > 60) return TOPIC_NOACTION
+		pref.ambience_freq = ambience_new
+		return TOPIC_REFRESH
+		
+	else if(href_list["select_ambience_chance"])
+		var/ambience_chance_new = input(user, "Input the chance you'd like to hear ambience played to you (On area change, or by random ambience). 35 means a 35% chance to play ambience. This is a range from 0-100. 0 disables ambience playing entirely. This is also affected by Ambience Frequency.", "Global Preference", pref.ambience_freq) as null|num
+		if(isnull(ambience_chance_new) || !CanUseTopic(user)) return TOPIC_NOACTION
+		if(ambience_chance_new < 0 || ambience_chance_new > 100) return TOPIC_NOACTION
+		pref.ambience_chance = ambience_chance_new
+		return TOPIC_REFRESH
+
+	else if(href_list["tgui_fancy"])
+		pref.tgui_fancy = !pref.tgui_fancy
+		return TOPIC_REFRESH
+		
+	else if(href_list["tgui_lock"])
+		pref.tgui_lock = !pref.tgui_lock
+		return TOPIC_REFRESH
 
 	else if(href_list["reset"])
 		switch(href_list["reset"])

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

@@ -266,6 +266,18 @@ var/list/_client_preferences_by_type
 	enabled_description =  "Enabled"
 	disabled_description = "Disabled"
 
+/datum/client_preference/status_indicators
+	description = "Status Indicators"
+	key = "SHOW_STATUS"
+	enabled_description = "Show"
+	disabled_description = "Hide"
+
+/datum/client_preference/status_indicators/toggled(mob/preference_mob, enabled)
+	. = ..()
+	if(preference_mob && preference_mob.plane_holder)
+		var/datum/plane_holder/PH = preference_mob.plane_holder
+		PH.set_vis(VIS_STATUS, enabled)
+
 /********************
 * Staff Preferences *
 ********************/

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

@@ -115,6 +115,15 @@
 		scarfs[initial(scarf_type.name)] = scarf_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(scarfs))
 
+/datum/gear/accessory/scarfcolor
+	display_name = "scarf (recolorable)"
+	path = /obj/item/clothing/accessory/scarf/white
+	cost = 1
+
+/datum/gear/accessory/scarfcolor/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
 /datum/gear/accessory/jacket
 	display_name = "suit jacket selection"
 	path = /obj/item/clothing/accessory/jacket
@@ -279,3 +288,7 @@
 /datum/gear/accessory/cowledvest
 	display_name = "cowled vest"
 	path = /obj/item/clothing/accessory/cowledvest
+
+/datum/gear/accessory/asymovercoat
+	display_name = "orange asymmetrical overcoat"
+	path = /obj/item/clothing/accessory/asymovercoat

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

@@ -183,12 +183,6 @@
 	ckeywhitelist = list("cockatricexl")
 	character_name = list("James Holder")
 
-/datum/gear/fluff/jasmine_implant
-	path = /obj/item/weapon/implanter/reagent_generator/jasmine
-	display_name = "Jasmine's Implant"
-	ckeywhitelist = list("cameron653")
-	character_name = list("Jasmine Lizden")
-
 /datum/gear/fluff/diana_robe
 	path = /obj/item/clothing/suit/fluff/purp_robes
 	display_name = "Diana's Robes"
@@ -310,11 +304,6 @@
 	allowed_roles = list("Explorer")
 
 //  G CKEYS
-/datum/gear/fluff/eldi_implant
-	path = /obj/item/weapon/implanter/reagent_generator/eldi
-	display_name = "Eldi's Implant"
-	ckeywhitelist = list("gowst")
-	character_name = list("Eldi Moljir")
 
 //  H CKEYS
 /datum/gear/fluff/lauren_medal
@@ -335,12 +324,6 @@
 	ckeywhitelist = list("hottokeeki")
 	character_name = list("Belle Day")
 
-/datum/gear/fluff/belle_implant
-	path = /obj/item/weapon/implanter/reagent_generator/belle
-	display_name = "Belle's Implant"
-	ckeywhitelist = list("hottokeeki")
-	character_name = list("Belle Day")
-
 //  I CKEYS
 /datum/gear/fluff/ruda_badge
 	path = /obj/item/clothing/accessory/badge/holo/detective/ruda
@@ -553,12 +536,6 @@
 	ckeywhitelist = list("kiwidaninja")
 	character_name = list("Chakat Taiga")
 
-/datum/gear/fluff/rischi_implant
-	path = /obj/item/weapon/implanter/reagent_generator/rischi
-	display_name = "Rischi's Implant"
-	ckeywhitelist = list("konabird")
-	character_name = list("Rischi")
-
 /datum/gear/fluff/ashley_medal
 	path = /obj/item/clothing/accessory/medal/nobel_science/fluff/ashley
 	display_name = "Ashley's Medal"
@@ -580,12 +557,6 @@
 	ckeywhitelist = list("luminescentring")
 	character_name = list("Briana Moore")
 
-/datum/gear/fluff/savannah_implant
-	path = /obj/item/weapon/implanter/reagent_generator/savannah
-	display_name = "Savannah's Implant"
-	ckeywhitelist = list("lycanthorph")
-	character_name = list("Savannah Dixon")
-
 //  M CKEYS
 /datum/gear/fluff/phi_box
 	path = /obj/item/weapon/storage/box/fluff/phi
@@ -842,12 +813,6 @@
 	ckeywhitelist = list("silvertalismen")
 	character_name = list("Tasy Ruffles")
 
-/datum/gear/fluff/evian_implant
-	path = /obj/item/weapon/implanter/reagent_generator/evian
-	display_name = "Evian's Implant"
-	ckeywhitelist = list("silvertalismen")
-	character_name = list("Evian")
-
 /datum/gear/fluff/fortune_backpack
 	path = /obj/item/weapon/storage/backpack/satchel/fluff/swat43bag
 	display_name = "Fortune's Backpack"
@@ -861,12 +826,6 @@
 	ckeywhitelist = list("stobarico")
 	character_name = list("Alexis Bloise")
 
-/datum/gear/fluff/roiz_implant
-	path = /obj/item/weapon/implanter/reagent_generator/roiz
-	display_name = "Roiz's Implant"
-	ckeywhitelist = list("spoopylizz")
-	character_name = list("Roiz Lizden")
-
 /datum/gear/fluff/roiz_coat
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/roiz
 	display_name = "Roiz's Coat"
@@ -1020,12 +979,6 @@
 	ckeywhitelist = list("vorrarkul")
 	character_name = list("Theodora Lindt")
 
-/datum/gear/fluff/theodora_implant
-	path = /obj/item/weapon/implanter/reagent_generator/vorrarkul
-	display_name = "Theodora's Implant"
-	ckeywhitelist = list("vorrarkul")
-	character_name = list("Theodora Lindt")
-
 /datum/gear/fluff/kaitlyn_plush
 	path = /obj/item/toy/plushie/mouse/fluff
 	display_name = "Kaitlyn's Mouse Plush"
@@ -1102,12 +1055,6 @@
 	ckeywhitelist = list("wickedtemp")
 	character_name = list("Chakat Tempest Venosare")
 
-/datum/gear/fluff/tempest_implant
-	path = /obj/item/weapon/implanter/reagent_generator/tempest
-	display_name = "Tempest's Implant"
-	ckeywhitelist = list("wickedtemp")
-	character_name = list("Chakat Tempest Venosare")
-
 //  X CKEYS
 /datum/gear/fluff/penelope_box
 	path = /obj/item/weapon/storage/box/fluff/penelope

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

@@ -0,0 +1,12 @@
+/datum/gear/ball
+	display_name = "tennis ball selection"
+	description = "Choose from a num- BALL!"
+	path = /obj/item/toy/tennis
+
+/datum/gear/ball/New()
+	..()
+	var/list/balls = list()
+	for(var/ball in typesof(/obj/item/toy/tennis/))
+		var/obj/item/toy/tennis/ball_type = ball
+		balls[initial(ball_type.name)] = ball_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(balls))

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

@@ -366,4 +366,20 @@
 
 /datum/gear/head/jingasa
 	display_name = "jingasa"
-	path = /obj/item/clothing/head/jingasa
+	path = /obj/item/clothing/head/jingasa
+
+/datum/gear/head/sunflower_crown
+	display_name = "sunflower crown"
+	path = /obj/item/clothing/head/sunflower_crown
+
+/datum/gear/head/lavender_crown
+	display_name = "lavender crown"
+	path = /obj/item/clothing/head/lavender_crown
+
+/datum/gear/head/poppy_crown
+	display_name = "poppy crown"
+	path = /obj/item/clothing/head/poppy_crown
+
+/datum/gear/head/rose_crown
+	display_name = "rose crown"
+	path = /obj/item/clothing/head/rose_crown

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

@@ -20,4 +20,8 @@
 /datum/gear/mask/sterile
 	display_name = "sterile mask"
 	path = /obj/item/clothing/mask/surgical
-	cost = 2
+	cost = 2
+
+/datum/gear/mask/veil
+	display_name = "black veil"
+	path = /obj/item/clothing/mask/veil

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

@@ -77,7 +77,7 @@
 /datum/gear/suit/mil
 	display_name = "military jacket selection"
 	path = /obj/item/clothing/suit/storage/miljacket
-	
+
 /datum/gear/suit/mil/New()
 	..()
 	var/list/mil_jackets = list()

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

@@ -556,4 +556,36 @@
 
 /datum/gear/uniform/haltertop
 	display_name = "halter top"
-	path = /obj/item/clothing/under/haltertop
+	path = /obj/item/clothing/under/haltertop
+
+/datum/gear/uniform/revealingdress
+	display_name = "revealing dress"
+	path = /obj/item/clothing/under/dress/revealingdress
+
+/datum/gear/uniform/rippedpunk
+	display_name = "ripped punk jeans"
+	path = /obj/item/clothing/under/rippedpunk
+
+/datum/gear/uniform/gothic
+	display_name = "gothic dress"
+	path = /obj/item/clothing/under/dress/gothic
+
+/datum/gear/uniform/formalred
+	display_name = "formal red dress"
+	path = /obj/item/clothing/under/dress/formalred
+
+/datum/gear/uniform/pentagram
+	display_name = "pentagram dress"
+	path = /obj/item/clothing/under/dress/pentagram
+
+/datum/gear/uniform/yellowswoop
+	display_name = "yellow swooped dress"
+	path = /obj/item/clothing/under/dress/yellowswoop
+
+/datum/gear/uniform/greenasym
+	display_name = "green asymmetrical jumpsuit"
+	path = /obj/item/clothing/under/greenasym
+
+/datum/gear/uniform/cyberpunkharness
+	display_name = "cyberpunk strapped harness"
+	path = /obj/item/clothing/under/cyberpunkharness

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

@@ -411,5 +411,15 @@
 	sort_category = "Xenowear"
 
 /datum/gear/suit/teshcoatwhite/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/accessory/teshneckscarf
+	display_name = "neckscarf, recolorable (Teshari)"
+	path = /obj/item/clothing/accessory/scarf/teshari/neckscarf
+	whitelisted = SPECIES_TESHARI
+	sort_category = "Xenowear"
+
+/datum/gear/accessory/teshneckscarf/New()
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)