Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge

code/modules/client/preference_setup/general/04_equipment.dm

@@ -12,6 +12,7 @@
 	S["backbag"]	>> pref.backbag
 	S["pdachoice"]	>> pref.pdachoice
 	S["communicator_visibility"]	>> pref.communicator_visibility
+	S["ttone"]	>> pref.ttone //YW Edit
 
 /datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
 	S["all_underwear"] << pref.all_underwear
@@ -19,6 +20,7 @@
 	S["backbag"]	<< pref.backbag
 	S["pdachoice"]	<< pref.pdachoice
 	S["communicator_visibility"]	<< pref.communicator_visibility
+	S["ttone"]	<< pref.ttone // YW EDIT
 
 // Moved from /datum/preferences/proc/copy_to()
 /datum/category_item/player_setup_item/general/equipment/copy_to_mob(var/mob/living/carbon/human/character)
@@ -73,6 +75,7 @@
 			pref.all_underwear_metadata -= underwear_metadata
 	pref.backbag	= sanitize_integer(pref.backbag, 1, backbaglist.len, initial(pref.backbag))
 	pref.pdachoice	= sanitize_integer(pref.pdachoice, 1, pdachoicelist.len, initial(pref.pdachoice))
+	pref.ttone	= sanitize(pref.ttone, 20)//YW Edit
 
 /datum/category_item/player_setup_item/general/equipment/content()
 	. = list()
@@ -89,6 +92,7 @@
 	. += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
 	. += "PDA Type: <a href='?src=\ref[src];change_pda=1'><b>[pdachoicelist[pref.pdachoice]]</b></a><br>"
 	. += "Communicator Visibility: <a href='?src=\ref[src];toggle_comm_visibility=1'><b>[(pref.communicator_visibility) ? "Yes" : "No"]</b></a><br>"
+	. += "Ringtone (leave blank for job default): <a href='?src=\ref[src];set_ttone=1'><b>[pref.ttone]</b></a><br>" //YW EDIT
 
 	return jointext(.,null)
 
@@ -146,6 +150,10 @@
 		if(CanUseTopic(user))
 			pref.communicator_visibility = !pref.communicator_visibility
 			return TOPIC_REFRESH
+	else if(href_list["set_ttone"]) //Start of YW EDIT
+		if(CanUseTopic(user))
+			pref.ttone = sanitize(input(user, "Please enter a new ringtone.", "Character Preference") as null|text, 20)
+			return TOPIC_REFRESH //End of YW EDIT
 
 
 	return ..()

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

@@ -273,10 +273,12 @@ var/list/gear_datums = list()
 /datum/gear/proc/spawn_item(var/location, var/metadata)
 	var/datum/gear_data/gd = new(path, location)
 	for(var/datum/gear_tweak/gt in gear_tweaks)
-		gt.tweak_gear_data(metadata["[gt]"], gd)
+		if(gear_tweaks.len)
+			gt.tweak_gear_data(metadata["[gt]"], gd)
 	var/item = new gd.path(gd.location)
 	for(var/datum/gear_tweak/gt in gear_tweaks)
-		gt.tweak_item(item, metadata["[gt]"])
+		if(gear_tweaks.len)
+			gt.tweak_item(item, metadata["[gt]"])
 	var/mob/M = location
 	if(istype(M) && exploitable) //Update exploitable info records for the mob without creating a duplicate object at their feet.
 		M.amend_exploitable(item)

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

@@ -74,7 +74,7 @@
 	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
 
 /datum/gear/accessory/khcrystal
-	display_name = "KH Life Crystal"
+	display_name = "Life Crystal"
 	path = /obj/item/weapon/storage/box/khcrystal
 	description = "A small necklace device that will notify an offsite cloning facility should you expire after activating it."
 

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

@@ -346,6 +346,22 @@
 
 //  F CKEYS
 
+//Foxicide
+//Kaith
+/datum/gear/fluff/kaith_modkit
+	path = /obj/item/device/modkit_conversion/fluff/kaith_knife_kit
+	display_name = "Kaith's modkit"
+	description = "A kit containing all the needed tools and parts to modify a survival knife"
+	ckeywhitelist = list("foxicide")
+	character_name = list("Kaith")
+
+/datum/gear/fluff/kaith_bag
+	path = /obj/item/weapon/storage/backpack/fluff/kaith
+	display_name = "Light duffle bag"
+	description = "A compact duffle bag, meant for long hikes."
+	ckeywhitelist = list("foxicide")
+	character_name = list("Kaith")
+
 //  G CKEYS
 
 //generalpantsu
@@ -725,6 +741,14 @@
 	character_name = list("Mocha")
 	allowed_roles = list("Explorer", "Pathfinder")
 
+/datum/gear/fluff/mocha_cloak
+	path = /obj/item/clothing/accessory/poncho/cloak/fluff/mocha
+	display_name = "Warden Cloak"
+	description = "A cloak denoting the rank of a warden, the name \"Mocha\" is embroidered along the collar in red lettering"
+	ckeywhitelist = list("mocatheporg1")
+	character_name = list("Mocha")
+	allowed_roles = list("Warden")
+
 //  N CKEYS
 //NESgamer190
 /datum/gear/fluff/lucy_flask

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

@@ -0,0 +1,4 @@
+/datum/gear/head/beret/blueshield
+	display_name = "beret, blueshield"
+	path = /obj/item/clothing/head/beret/blueshield
+	allowed_roles = list("Blueshield Guard")

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

@@ -0,0 +1,4 @@
+/datum/gear/suit/roles/poncho/cloak/blueshield
+	display_name = "cloak, blueshield"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/blueshield
+	allowed_roles = list("Blueshield Guard")

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

@@ -183,7 +183,7 @@
 /datum/gear/uniform/job_turtle/medical
 	display_name = "turtleneck, medical"
 	path = /obj/item/clothing/under/rank/medical/turtleneck
-	allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychologist", "Search and Rescue", "Chemist")
+	allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Search and Rescue", "Chemist")
 
 /datum/gear/uniform/jeans_qm
 	display_name = "jeans, QM"