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

code/modules/client/preference_setup/global/02_settings.dm

@@ -9,6 +9,7 @@
 /datum/category_item/player_setup_item/player_global/settings/load_preferences(var/savefile/S)
 	S["lastchangelog"]        >> pref.lastchangelog
 	S["lastnews"]             >> pref.lastnews
+	S["lastlorenews"]         >> pref.lastlorenews
 	S["default_slot"]	      >> pref.default_slot
 	S["preferences"]          >> pref.preferences_enabled
 	S["preferences_disabled"] >> pref.preferences_disabled
@@ -16,6 +17,7 @@
 /datum/category_item/player_setup_item/player_global/settings/save_preferences(var/savefile/S)
 	S["lastchangelog"]        << pref.lastchangelog
 	S["lastnews"]             << pref.lastnews
+	S["lastlorenews"]         << pref.lastlorenews
 	S["default_slot"]         << pref.default_slot
 	S["preferences"]          << pref.preferences_enabled
 	S["preferences_disabled"] << pref.preferences_disabled

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

@@ -287,6 +287,12 @@ var/list/_client_preferences_by_type
 	enabled_description = "Show"
 	disabled_description = "Hide"
 
+/datum/client_preference/radio_sounds
+	description = "Radio Sounds"
+	key = "RADIO_SOUNDS"
+	enabled_description = "On"
+	disabled_description = "Off"
+
 /datum/client_preference/runechat_mob
 	description = "Runechat (Mobs)"
 	key = "RUNECHAT_MOB"
@@ -319,6 +325,13 @@ var/list/_client_preferences_by_type
 		var/datum/plane_holder/PH = preference_mob.plane_holder
 		PH.set_vis(VIS_STATUS, enabled)
 
+/datum/client_preference/show_lore_news
+	description = "Lore News Popup"
+	key = "NEWS_POPUP"
+	enabled_by_default = TRUE
+	enabled_description = "Popup New On Login"
+	disabled_description = "Do Nothing"
+
 /********************
 * Staff Preferences *
 ********************/

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

@@ -172,7 +172,8 @@ var/datum/gear_tweak/custom_name/gear_tweak_free_name = new()
 		return
 	if(valid_custom_names)
 		return tgui_input_list(user, "Choose an item name.", "Character Preference", valid_custom_names, metadata)
-	return sanitize(input(user, "Choose the item's name. Leave it blank to use the default name.", "Item Name", metadata) as text|null, MAX_LNAME_LEN, extra = 0)
+	var/san_input = sanitize(input(user, "Choose the item's name. Leave it blank to use the default name.", "Item Name", metadata) as text|null, MAX_LNAME_LEN, extra = 0)
+	return san_input ? san_input : get_default()
 
 /datum/gear_tweak/custom_name/tweak_item(var/obj/item/I, var/metadata)
 	if(!metadata)
@@ -203,7 +204,8 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
 		return
 	if(valid_custom_desc)
 		return tgui_input_list(user, "Choose an item description.", "Character Preference",valid_custom_desc, metadata)
-	return sanitize(input(user, "Choose the item's description. Leave it blank to use the default description.", "Item Description", metadata) as message|null, extra = 0)
+	var/san_input = sanitize(input(user, "Choose the item's description. Leave it blank to use the default description.", "Item Description", metadata) as message|null, extra = 0)
+	return san_input ? san_input : get_default()
 
 /datum/gear_tweak/custom_desc/tweak_item(var/obj/item/I, var/metadata)
 	if(!metadata)
@@ -551,4 +553,4 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new()
 /datum/gear_tweak/implant_location/get_metadata(var/user, var/metadata)
 	return (tgui_input_list(user, "Select a bodypart for the implant to be implanted inside.", "Implant Location", bodypart_names_to_tokens || bodypart_tokens_to_names[BP_TORSO]))
 
-#undef LOADOUT_BAN_STRING
+#undef LOADOUT_BAN_STRING

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

@@ -190,19 +190,6 @@
 	display_name = "chaps, black"
 	path = /obj/item/clothing/accessory/chaps/black
 
-/datum/gear/accessory/hawaii
-	display_name = "hawaii shirt"
-	path = /obj/item/clothing/accessory/hawaii
-
-/datum/gear/accessory/hawaii/New()
-	..()
-	var/list/shirts = list()
-	shirts["blue hawaii shirt"] = /obj/item/clothing/accessory/hawaii
-	shirts["red hawaii shirt"] = /obj/item/clothing/accessory/hawaii/red
-	shirts["random colored hawaii shirt"] = /obj/item/clothing/accessory/hawaii/random
-	gear_tweaks += new/datum/gear_tweak/path(shirts)
-
-
 /datum/gear/accessory/sweater
 	display_name = "sweater selection"
 	path = /obj/item/clothing/accessory/sweater
@@ -284,3 +271,31 @@
 /datum/gear/accessory/asymovercoat
 	display_name = "orange asymmetrical overcoat"
 	path = /obj/item/clothing/accessory/asymovercoat
+
+/datum/gear/accessory/hawaiian_shirt
+	display_name = "hawaiian shirt selection"
+	path = /obj/item/clothing/accessory/hawaiian
+
+/datum/gear/accessory/hawaiian_shirt/New()
+	..()
+	var/list/hawaiian_shirts = list(
+	"Cyan Hawaiian shirt" = /obj/item/clothing/accessory/hawaiian,
+	"Blue Hawaiian shirt" = /obj/item/clothing/accessory/hawaiian/blue,
+	"Pink Hawaiian shirt" = /obj/item/clothing/accessory/hawaiian/pink,
+	"Red Hawaiian shirt" = /obj/item/clothing/accessory/hawaiian/red,
+	"Yellow Hawaiian shirt" = /obj/item/clothing/accessory/hawaiian/yellow
+	)
+	gear_tweaks += new/datum/gear_tweak/path(hawaiian_shirts)
+
+/datum/gear/accessory/cowboy_vest
+	display_name = "cowboy selection"
+	path = /obj/item/clothing/accessory/cowboy_vest
+
+/datum/gear/accessory/cowboy_vest/New()
+	..()
+	var/list/cowboy_vests = list(
+	"Ranger Vest" = /obj/item/clothing/accessory/cowboy_vest,
+	"Brown Vest" = /obj/item/clothing/accessory/cowboy_vest/brown,
+	"Grey Vest" = /obj/item/clothing/accessory/cowboy_vest/grey
+	)
+	gear_tweaks += new/datum/gear_tweak/path(cowboy_vests)

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

@@ -135,24 +135,60 @@
 	path = /obj/item/clothing/head/soft/solgov
 
 /datum/gear/head/cowboy
-	display_name = "cowboy, rodeo"
-	path = /obj/item/clothing/head/cowboy_hat
+	display_name = "cowboy"
+	path = /obj/item/clothing/head/cowboy
+
+/datum/gear/head/cowboy/rattan
+	display_name = "cowboy, rattan"
+	path = /obj/item/clothing/head/cowboy/rattan
+
+/datum/gear/head/cowboy/dark
+	display_name = "cowboy, dark"
+	path = /obj/item/clothing/head/cowboy/dark
+
+/datum/gear/head/cowboy/ranger
+	display_name = "cowboy, ranger"
+	path = /obj/item/clothing/head/cowboy/ranger
 
 /datum/gear/head/cowboy/black
 	display_name = "cowboy, black"
-	path = /obj/item/clothing/head/cowboy_hat/black
+	path = /obj/item/clothing/head/cowboy/black
+
+/datum/gear/head/cowboy/fancy
+	display_name = "cowboy, fancy"
+	path = /obj/item/clothing/head/cowboy/fancy
+
+/datum/gear/head/cowboy/rustler
+	display_name = "cowboy, rustler"
+	path = /obj/item/clothing/head/cowboy/rustler
+
+/datum/gear/head/cowboy/black
+	display_name = "cowboy, bandit"
+	path = /obj/item/clothing/head/cowboy/bandit
 
 /datum/gear/head/cowboy/wide
 	display_name = "cowboy, wide"
-	path = /obj/item/clothing/head/cowboy_hat/wide
-
-/datum/gear/head/fedora
-	display_name = "fedora, brown"
-	path = /obj/item/clothing/head/fedora/brown
+	path = /obj/item/clothing/head/cowboy/wide
 
 /datum/gear/head/fedora/grey
 	display_name = "fedora, grey"
-	path = /obj/item/clothing/head/fedora/grey
+	path = /obj/item/clothing/head/fedora
+
+/datum/gear/head/fedora/brown
+	display_name = "fedora, brown"
+	path = /obj/item/clothing/head/fedora/brown
+
+/datum/gear/head/fedora/white
+	display_name = "fedora, white"
+	path = /obj/item/clothing/head/fedora/white
+
+/datum/gear/head/fedora/beige
+	display_name = "fedora, beige"
+	path = /obj/item/clothing/head/fedora/beige
+
+/datum/gear/head/fedora/panama
+	display_name = "fedora, panama"
+	path = /obj/item/clothing/head/fedora/panama
 
 /datum/gear/head/hairflower
 	display_name = "hair flower pin (colorable)"

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

@@ -5,6 +5,14 @@
 	slot = slot_shoes
 	sort_category = "Shoes and Footwear"
 
+/datum/gear/shoes/tourist_1
+	display_name = "tourist, black"
+	path = /obj/item/clothing/shoes/tourist_1
+
+/datum/gear/shoes/tourist_2
+	display_name = "tourist, green"
+	path = /obj/item/clothing/shoes/tourist_2
+
 /datum/gear/shoes/jackboots
 	display_name = "jackboots"
 	path = /obj/item/clothing/shoes/boots/jackboots
@@ -126,13 +134,37 @@
 	path = /obj/item/clothing/shoes/boots/cowboy
 
 /datum/gear/shoes/cowboy/classic
-	display_name = "classic cowboy boots"
+	display_name = "cowboy boots, classic"
 	path = /obj/item/clothing/shoes/boots/cowboy/classic
 
+/datum/gear/shoes/cowboy/brown
+	display_name = "cowboy boots, brown"
+	path = /obj/item/clothing/shoes/boots/cowboy/brown
+
+/datum/gear/shoes/cowboy/black
+	display_name = "cowboy boots, black"
+	path = /obj/item/clothing/shoes/boots/cowboy/black
+
+/datum/gear/shoes/cowboy/white
+	display_name = "cowboy boots, white"
+	path = /obj/item/clothing/shoes/boots/cowboy/white
+
+/datum/gear/shoes/cowboy/fancy
+	display_name = "cowboy boots, fancy"
+	path = /obj/item/clothing/shoes/boots/cowboy/fancy
+
 /datum/gear/shoes/cowboy/snakeskin
-	display_name = "snakeskin cowboy boots"
+	display_name = "cowboy boots, snake skin"
 	path = /obj/item/clothing/shoes/boots/cowboy/snakeskin
 
+/datum/gear/shoes/cowboy/lizard
+	display_name = "cowboy boots, lizard skin"
+	path = /obj/item/clothing/shoes/boots/cowboy/lizard
+
+/datum/gear/shoes/cowboy/lizard/masterwork
+	display_name = "cowboy boots, lizard skin (masterwork)"
+	path = /obj/item/clothing/shoes/boots/cowboy/lizard/masterwork
+
 /datum/gear/shoes/jungle
 	display_name = "jungle boots"
 	path = /obj/item/clothing/shoes/boots/jungle

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

@@ -625,4 +625,4 @@
 /datum/gear/suit/cmddressjacket
 	display_name = "command dress jacket"
 	path = /obj/item/clothing/suit/storage/cmddressjacket
-	allowed_roles = list("Facility Director", "Head of Personnel", "Command Secretary")
+	allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")

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

@@ -54,6 +54,22 @@
 		jumpclothes[initial(jumps.name)] = jumps
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpclothes))
 
+/datum/gear/uniform/qipao_colorable
+	display_name = "qipao, colorable"
+	path = /obj/item/clothing/under/qipao_colorable
+
+/datum/gear/uniform/qipao_colorable/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/uniform/qipao2_colorable
+	display_name = "qipao, colorable, slim"
+	path = /obj/item/clothing/under/qipao2_colorable
+
+/datum/gear/uniform/qipao2_colorable/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/uniform/skirt
 	display_name = "skirt selection"
 	path = /obj/item/clothing/under/skirt
@@ -663,21 +679,43 @@
 	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/uniform/paramedunidark
-	display_name = "paramedic uniform - dark"
+	display_name = "paramedic uniform, dark"
 	path = /obj/item/clothing/under/rank/paramedunidark
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
 
 /datum/gear/uniform/parameduniskirtdark
-	display_name = "paramedic skirt - dark"
+	display_name = "paramedic skirt, dark"
 	path = /obj/item/clothing/under/rank/parameduniskirtdark
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
 
 /datum/gear/uniform/paramedunilight
-	display_name = "paramedic uniform - light"
+	display_name = "paramedic uniform, light"
 	path = /obj/item/clothing/under/rank/paramedunilight
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
 
 /datum/gear/uniform/parameduniskirtlight
-	display_name = "paramedic skirt - light"
+	display_name = "paramedic skirt, light"
 	path = /obj/item/clothing/under/rank/parameduniskirtlight
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
+
+/datum/gear/uniform/tourist_1
+	display_name = "tourist outfit, white"
+	path = /obj/item/clothing/under/tourist_1
+
+/datum/gear/uniform/tourist_2
+	display_name = "tourist outfit, blue"
+	path = /obj/item/clothing/under/tourist_2
+
+/datum/gear/uniform/cowboy_outfits
+	display_name = "cowboy outfit selection"
+	path = /obj/item/clothing/under/cowboy
+
+/datum/gear/uniform/cowboy_outfits/New()
+	..()
+	var/list/cowboy_outfits = list(
+	"Patterned Cowboy Outfit" = /obj/item/clothing/under/cowboy,
+	"Tan Cowboy Outfit" = /obj/item/clothing/under/cowboy/tan,
+	"Brown Cowboy Outfit" = /obj/item/clothing/under/cowboy/brown,
+	"Grey Cowboy Outfit" = /obj/item/clothing/under/cowboy/grey
+	)
+	gear_tweaks += new/datum/gear_tweak/path(cowboy_outfits)

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

@@ -196,17 +196,17 @@ Swimsuits
 /*
 Qipao
 */
-/datum/gear/uniform/qipao
+/datum/gear/uniform/qipao_black
 	display_name = "qipao, black"
-	path = /obj/item/clothing/under/dress/qipao
+	path = /obj/item/clothing/under/qipao
 
 /datum/gear/uniform/qipao_red
 	display_name = "qipao, red"
-	path = /obj/item/clothing/under/dress/qipao/red
+	path = /obj/item/clothing/under/qipao/red
 
 /datum/gear/uniform/qipao_white
 	display_name = "qipao, white"
-	path = /obj/item/clothing/under/dress/qipao/white
+	path = /obj/item/clothing/under/qipao/white
 
 /*
 Bluespace jumpsuit