Back up to date.

code/modules/client/asset_cache.dm

@@ -46,10 +46,10 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 
 	client << browse_rsc(asset_cache[asset_name], asset_name)
 	if(!verify || !winexists(client, "asset_cache_browser")) // Can't access the asset cache browser, rip.
-		if (client)
+		if(client)
 			client.cache += asset_name
 		return 1
-	if (!client)
+	if(!client)
 		return 0
 
 	client.sending |= asset_name
@@ -91,17 +91,17 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 	var/list/unreceived = asset_list - (client.cache + client.sending)
 	if(!unreceived || !unreceived.len)
 		return 0
-	if (unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT)
+	if(unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT)
 		to_chat(client, "Sending Resources...")
 	for(var/asset in unreceived)
-		if (asset in asset_cache)
+		if(asset in asset_cache)
 			client << browse_rsc(asset_cache[asset], asset)
 
 	if(!verify || !winexists(client, "asset_cache_browser")) // Can't access the asset cache browser, rip.
-		if (client)
+		if(client)
 			client.cache += unreceived
 		return 1
-	if (!client)
+	if(!client)
 		return 0
 	client.sending |= unreceived
 	var/job = ++client.last_asset_job
@@ -129,9 +129,9 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 //The proc calls procs that sleep for long times.
 proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 	for(var/file in files)
-		if (!client)
+		if(!client)
 			break
-		if (register_asset)
+		if(register_asset)
 			register_asset(file,files[file])
 		send_asset(client,file)
 		sleep(-1) //queuing calls like this too quickly can cause issues in some client versions
@@ -159,7 +159,7 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 
 //get a assetdatum or make a new one
 /proc/get_asset_datum(var/type)
-	if (!(type in asset_datums))
+	if(!(type in asset_datums))
 		return new type()
 	return asset_datums[type]
 
@@ -240,14 +240,14 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 
 /datum/asset/nanoui/register()
 	// Crawl the directories to find files.
-	for (var/path in common_dirs)
+	for(var/path in common_dirs)
 		var/list/filenames = flist(path)
 		for(var/filename in filenames)
 			if(copytext(filename, length(filename)) != "/") // Ignore directories.
 				if(fexists(path + filename))
 					common[filename] = fcopy_rsc(path + filename)
 					register_asset(filename, common[filename])
-	for (var/path in uncommon_dirs)
+	for(var/path in uncommon_dirs)
 		var/list/filenames = flist(path)
 		for(var/filename in filenames)
 			if(copytext(filename, length(filename)) != "/") // Ignore directories.
@@ -260,3 +260,18 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 
 	send_asset_list(client, uncommon)
 	send_asset_list(client, common)
+
+/datum/asset/chem_master
+	var/assets = list()
+	var/verify = FALSE
+
+/datum/asset/chem_master/register()
+	for(var/i = 1 to 20)
+		assets["pill[i].png"] = icon('icons/obj/chemical.dmi', "pill[i]")
+	for(var/i = 1 to 20)
+		assets["bottle[i].png"] = icon('icons/obj/chemical.dmi', "bottle[i]")
+	for(var/asset_name in assets)
+		register_asset(asset_name, assets[asset_name])
+
+/datum/asset/chem_master/send(client)
+	send_asset_list(client,assets,verify)

code/modules/client/client defines.dm

@@ -84,4 +84,8 @@
 	var/datum/click_intercept/click_intercept = null
 
 	//datum that controls the displaying and hiding of tooltips
-	var/datum/tooltip/tooltips
+	var/datum/tooltip/tooltips
+
+	// Their chat window, sort of important.
+	// See /goon/code/datums/browserOutput.dm
+	var/datum/chatOutput/chatOutput

code/modules/client/client procs.dm

@@ -8,6 +8,8 @@
 #define UPLOAD_LIMIT		10485760	//Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen?
 #define MIN_CLIENT_VERSION	0		//Just an ambiguously low version for now, I don't want to suddenly stop people playing.
 									//I would just like the code ready should it ever need to be used.
+#define SUGGESTED_CLIENT_VERSION	510		// only integers (e.g: 510, 511) useful here. Does not properly handle minor versions (e.g: 510.58, 511.848)
+
 	/*
 	When somebody clicks a link in game, this Topic is called first.
 	It does the stuff in this proc and  then is redirected to the Topic() proc for the src=[0xWhatever]
@@ -43,6 +45,9 @@
 		completed_asset_jobs += job
 		return
 
+	if(href_list["_src_"] == "chat")
+		return chatOutput.Topic(href, href_list)
+
 	//Reduces spamming of links by dropping calls that happen during the delay period
 	if(next_allowed_topic_time > world.time)
 		return
@@ -203,6 +208,11 @@
 		if("prefs")		return prefs.process_link(usr,href_list)
 		if("vars")		return view_var_Topic(href,href_list,hsrc)
 
+
+	switch(href_list["action"])
+		if("openLink")
+			src << link(href_list["link"])
+
 	..()	//redirect to hsrc.Topic()
 
 /client/proc/is_content_unlocked()
@@ -245,12 +255,15 @@
 	//CONNECT//
 	///////////
 /client/New(TopicData)
+	chatOutput = new /datum/chatOutput(src) // Right off the bat.
 	TopicData = null							//Prevent calls to client.Topic from connect
 
 	if(connection != "seeker")					//Invalid connection type.
 		return null
-	if(byond_version < MIN_CLIENT_VERSION)		//Out of date client.
+	if(byond_version < MIN_CLIENT_VERSION) // Too out of date to play at all. Unfortunately, we can't send them a message here.
 		return null
+	if(byond_version < SUGGESTED_CLIENT_VERSION) // Update is suggested, but not required.
+		to_chat(src,"<span class='userdanger'>Your BYOND client (v: [byond_version]) is out of date. This can cause glitches. We highly suggest you download the latest client from http://www.byond.com/ before playing. </span>")
 
 	if(IsGuestKey(key))
 		alert(src,"This server doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.","Guest","OK")
@@ -283,6 +296,7 @@
 	prefs.last_id = computer_id			//these are gonna be used for banning
 
 	. = ..()	//calls mob.Login()
+	chatOutput.start()
 
 	if(custom_event_msg && custom_event_msg != "")
 		to_chat(src, "<h1 class='alert'>Custom Event</h1>")
@@ -307,8 +321,8 @@
 
 	log_client_to_db()
 
-	if (ckey in clientmessages)
-		for (var/message in clientmessages[ckey])
+	if(ckey in clientmessages)
+		for(var/message in clientmessages[ckey])
 			to_chat(src, message)
 		clientmessages.Remove(ckey)
 
@@ -348,7 +362,7 @@
 
 /client/proc/log_client_to_db()
 
-	if ( IsGuestKey(src.key) )
+	if( IsGuestKey(src.key) )
 		return
 
 	establish_db_connection()

code/modules/client/message.dm

@@ -2,8 +2,8 @@ var/list/clientmessages = list()
 
 proc/addclientmessage(var/ckey, var/message)
 	ckey = ckey(ckey)
-	if (!ckey || !message)
+	if(!ckey || !message)
 		return
-	if (!(ckey in clientmessages))
+	if(!(ckey in clientmessages))
 		clientmessages[ckey] = list()
 	clientmessages[ckey] += message

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

@@ -0,0 +1,113 @@
+/datum/gear_tweak/proc/get_contents(var/metadata)
+	return
+
+/datum/gear_tweak/proc/get_metadata(var/user, var/metadata)
+	return
+
+/datum/gear_tweak/proc/get_default()
+	return
+
+/datum/gear_tweak/proc/tweak_gear_data(var/metadata, var/datum/gear_data)
+	return
+
+/datum/gear_tweak/proc/tweak_item(var/obj/item/I, var/metadata)
+	return
+
+/*
+* Color adjustment
+*/
+
+var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
+
+/datum/gear_tweak/color
+	var/list/valid_colors
+
+/datum/gear_tweak/color/New(var/list/colors)
+	valid_colors = colors
+	..()
+
+/datum/gear_tweak/color/get_contents(var/metadata)
+	return "Color: <font color='[metadata]'>&#9899;</font>"
+
+/datum/gear_tweak/color/get_default()
+	return valid_colors ? valid_colors[1] : COLOR_GRAY
+
+/datum/gear_tweak/color/get_metadata(var/user, var/metadata)
+	if(valid_colors)
+		return input(user, "Choose an item color.", "Character Preference", metadata) as null|anything in valid_colors
+	return input(user, "Choose an item color.", "Global Preference", metadata) as color|null
+
+/datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata)
+	if(valid_colors && !(metadata in valid_colors))
+		return
+	I.color = metadata
+
+/*
+* Path adjustment
+*/
+
+/datum/gear_tweak/path
+	var/list/valid_paths
+
+/datum/gear_tweak/path/New(var/list/paths)
+	valid_paths = paths
+	..()
+
+/datum/gear_tweak/path/get_contents(var/metadata)
+	return "Type: [metadata]"
+
+/datum/gear_tweak/path/get_default()
+	return valid_paths[1]
+
+/datum/gear_tweak/path/get_metadata(var/user, var/metadata)
+	return input(user, "Choose a type.", "Character Preference", metadata) as null|anything in valid_paths
+
+/datum/gear_tweak/path/tweak_gear_data(var/metadata, var/datum/gear_data/gear_data)
+	if(!(metadata in valid_paths))
+		return
+	gear_data.path = valid_paths[metadata]
+
+/*
+* Content adjustment
+*/
+
+/datum/gear_tweak/contents
+	var/list/valid_contents
+
+/datum/gear_tweak/contents/New()
+	valid_contents = args.Copy()
+	..()
+
+/datum/gear_tweak/contents/get_contents(var/metadata)
+	return "Contents: [english_list(metadata, and_text = ", ")]"
+
+/datum/gear_tweak/contents/get_default()
+	. = list()
+	for(var/i = 1 to valid_contents.len)
+		. += "Random"
+
+/datum/gear_tweak/contents/get_metadata(var/user, var/list/metadata)
+	. = list()
+	for(var/i = metadata.len to valid_contents.len)
+		metadata += "Random"
+	for(var/i = 1 to valid_contents.len)
+		var/entry = input(user, "Choose an entry.", "Character Preference", metadata[i]) as null|anything in (valid_contents[i] + list("Random", "None"))
+		if(entry)
+			. += entry
+		else
+			return metadata
+
+/datum/gear_tweak/contents/tweak_item(var/obj/item/I, var/list/metadata)
+	if(metadata.len != valid_contents.len)
+		return
+	for(var/i = 1 to valid_contents.len)
+		var/path
+		var/list/contents = valid_contents[i]
+		if(metadata[i] == "Random")
+			path = pick(contents)
+			path = contents[path]
+		else if(metadata[i] == "None")
+			continue
+		else
+			path = 	contents[metadata[i]]
+		new path(I)

code/modules/client/preference/loadout/loadout.dm

@@ -0,0 +1,79 @@
+var/list/loadout_categories = list()
+var/list/gear_datums = list()
+
+/datum/loadout_category
+	var/category = ""
+	var/list/gear = list()
+
+/datum/loadout_category/New(cat)
+	category = cat
+	..()
+
+/hook/startup/proc/populate_gear_list()
+	//create a list of gear datums to sort
+	for(var/geartype in subtypesof(/datum/gear))
+		var/datum/gear/G = geartype
+
+		var/use_name = initial(G.display_name)
+		var/use_category = initial(G.sort_category)
+
+		if(G == initial(G.subtype_path))
+			continue
+
+		if(!use_name)
+			error("Loadout - Missing display name: [G]")
+			continue
+		if(!initial(G.cost))
+			error("Loadout - Missing cost: [G]")
+			continue
+		if(!initial(G.path))
+			error("Loadout - Missing path definition: [G]")
+			continue
+
+		if(!loadout_categories[use_category])
+			loadout_categories[use_category] = new /datum/loadout_category(use_category)
+		var/datum/loadout_category/LC = loadout_categories[use_category]
+		gear_datums[use_name] = new geartype
+		LC.gear[use_name] = gear_datums[use_name]
+
+	loadout_categories = sortAssoc(loadout_categories)
+	for(var/loadout_category in loadout_categories)
+		var/datum/loadout_category/LC = loadout_categories[loadout_category]
+		LC.gear = sortAssoc(LC.gear)
+	return 1
+
+/datum/gear
+	var/display_name       //Name/index. Must be unique.
+	var/description        //Description of this gear. If left blank will default to the description of the pathed item.
+	var/path               //Path to item.
+	var/cost = 1           //Number of points used. Items in general cost 1 point, storage/armor/gloves/special use costs 2 points.
+	var/slot               //Slot to equip to.
+	var/list/allowed_roles //Roles that can spawn with this item.
+	var/whitelisted        //Term to check the whitelist for..
+	var/sort_category = "General"
+	var/list/gear_tweaks = list() //List of datums which will alter the item after it has been spawned.
+	var/subtype_path = /datum/gear //for skipping organizational subtypes (optional)
+	var/subtype_cost_overlap = TRUE //if subtypes can take points at the same time
+
+/datum/gear/New()
+	..()
+	if(!description)
+		var/obj/O = path
+		description = initial(O.desc)
+
+/datum/gear_data
+	var/path
+	var/location
+
+/datum/gear_data/New(npath, nlocation)
+	path = npath
+	location = nlocation
+
+/datum/gear/proc/spawn_item(location, 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)
+	var/item = new gd.path(gd.location)
+	for(var/datum/gear_tweak/gt in gear_tweaks)
+		gt.tweak_item(item, metadata["[gt]"])
+	return item

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

@@ -0,0 +1,95 @@
+/datum/gear/accessory
+	subtype_path = /datum/gear/accessory
+	slot = slot_tie
+	sort_category = "Accessories"
+
+/datum/gear/accessory/scarf
+	display_name = "scarf"
+	path = /obj/item/clothing/accessory/scarf
+
+/datum/gear/accessory/scarf/red
+	display_name = "scarf, red"
+	path = /obj/item/clothing/accessory/scarf/red
+
+/datum/gear/accessory/scarf/green
+	display_name = "scarf, green"
+	path = /obj/item/clothing/accessory/scarf/green
+
+/datum/gear/accessory/scarf/darkblue
+	display_name = "scarf, dark blue"
+	path = /obj/item/clothing/accessory/scarf/darkblue
+
+/datum/gear/accessory/scarf/purple
+	display_name = "scarf, purple"
+	path = /obj/item/clothing/accessory/scarf/purple
+
+/datum/gear/accessory/scarf/yellow
+	display_name = "scarf, yellow"
+	path = /obj/item/clothing/accessory/scarf/yellow
+
+/datum/gear/accessory/scarf/orange
+	display_name = "scarf, orange"
+	path = /obj/item/clothing/accessory/scarf/orange
+
+/datum/gear/accessory/scarf/lightblue
+	display_name = "scarf, light blue"
+	path = /obj/item/clothing/accessory/scarf/lightblue
+
+/datum/gear/accessory/scarf/white
+	display_name = "scarf, white"
+	path = /obj/item/clothing/accessory/scarf/white
+
+/datum/gear/accessory/scarf/black
+	display_name = "scarf, black"
+	path = /obj/item/clothing/accessory/scarf/black
+
+/datum/gear/accessory/scarf/zebra
+	display_name = "scarf, zebra"
+	path = /obj/item/clothing/accessory/scarf/zebra
+
+/datum/gear/accessory/scarf/christmas
+	display_name = "scarf, christmas"
+	path = /obj/item/clothing/accessory/scarf/christmas
+
+/datum/gear/accessory/scarf/stripedred
+	display_name = "scarf, striped red"
+	path = /obj/item/clothing/accessory/stripedredscarf
+
+/datum/gear/accessory/scarf/stripedgreen
+	display_name = "scarf, striped green"
+	path = /obj/item/clothing/accessory/stripedgreenscarf
+
+/datum/gear/accessory/scarf/stripedblue
+	display_name = "scarf, striped blue"
+	path = /obj/item/clothing/accessory/stripedbluescarf
+
+/datum/gear/accessory/holobadge
+	display_name = "holobadge, pin"
+	path = /obj/item/clothing/accessory/holobadge
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/accessory/holobadge_n
+	display_name = "holobadge, cord"
+	path = /obj/item/clothing/accessory/holobadge/cord
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/accessory/tieblue
+	display_name = "tie, blue"
+	path = /obj/item/clothing/accessory/blue
+
+/datum/gear/accessory/tiered
+	display_name = "tie, red"
+	path = /obj/item/clothing/accessory/red
+
+/datum/gear/accessory/tieblack
+	display_name = "tie, black"
+	path = /obj/item/clothing/accessory/black
+
+/datum/gear/accessory/tiehorrible
+	display_name = "tie, vomit green"
+	path = /obj/item/clothing/accessory/horrible
+
+/datum/gear/accessory/stethoscope
+	display_name = "stethoscope"
+	path = /obj/item/clothing/accessory/stethoscope
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Brig Physician")

code/modules/client/preference/loadout/loadout_cosmetics.dm

@@ -0,0 +1,20 @@
+/datum/gear/lipstick
+	display_name = "lipstick, black"
+	path = /obj/item/weapon/lipstick/black
+	sort_category = "Cosmetics"
+
+/datum/gear/lipstick/jade
+	display_name = "lipstick, jade"
+	path = /obj/item/weapon/lipstick/jade
+
+/datum/gear/lipstick/purple
+	display_name = "lipstick, purple"
+	path = /obj/item/weapon/lipstick/purple
+
+/datum/gear/lipstick/red
+	display_name = "lipstick, red"
+	path = /obj/item/weapon/lipstick
+
+/datum/gear/monocle
+	display_name = "monocle"
+	path = /obj/item/clothing/glasses/monocle

code/modules/client/preference/loadout/loadout_general.dm

@@ -0,0 +1,40 @@
+/datum/gear/dice
+	display_name = "a d20"
+	path = /obj/item/weapon/dice/d20
+
+/datum/gear/uplift
+	display_name = "a pack of Uplifts"
+	path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift
+
+/datum/gear/robust
+	display_name = "a pack of Robusts"
+	path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust
+
+/datum/gear/carp
+	display_name = "a pack of Carps"
+	path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp
+
+/datum/gear/midori
+	display_name = "a pack of Midoris"
+	path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori
+
+/datum/gear/lighter
+	display_name = "a cheap lighter"
+	path = /obj/item/weapon/lighter
+
+/datum/gear/rock
+	display_name = "a pet rock"
+	path = /obj/item/toy/pet_rock
+
+/datum/gear/sechud
+	display_name = "a classic security HUD"
+	path = /obj/item/clothing/glasses/hud/security
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/matches
+	display_name = "a box of matches"
+	path = /obj/item/weapon/storage/box/matches
+
+/datum/gear/cards
+	display_name = "a deck of cards"
+	path = /obj/item/toy/cards/deck

code/modules/client/preference/loadout/loadout_hat.dm

@@ -0,0 +1,114 @@
+/datum/gear/hat
+	subtype_path = /datum/gear/hat
+	slot = slot_head
+	sort_category = "Headwear"
+
+/datum/gear/hat/hhat_yellow
+	display_name = "hardhat, yellow"
+	path = /obj/item/clothing/head/hardhat
+	allowed_roles = list("Chief Engineer", "Engineer", "Mechanic", "Life Support Specialist")
+
+/datum/gear/hat/hhat_orange
+	display_name = "hardhat, orange"
+	path = /obj/item/clothing/head/hardhat/orange
+	allowed_roles = list("Chief Engineer", "Engineer", "Mechanic", "Life Support Specialist")
+
+/datum/gear/hat/hhat_blue
+	display_name = "hardhat, blue"
+	path = /obj/item/clothing/head/hardhat/dblue
+	allowed_roles = list("Chief Engineer", "Engineer", "Mechanic", "Life Support Specialist")
+
+/datum/gear/hat/that
+	display_name = "top hat"
+	path = /obj/item/clothing/head/that
+
+/datum/gear/hat/flatcap
+	display_name = "flat cap"
+	path = /obj/item/clothing/head/flatcap
+
+/datum/gear/hat/fez
+	display_name = "fez"
+	path = /obj/item/clothing/head/fez
+
+/datum/gear/hat/bfedora
+	display_name = "fedora, black"
+	path = /obj/item/clothing/head/fedora
+
+/datum/gear/hat/wfedora
+	display_name = "fedora, white"
+	path = /obj/item/clothing/head/fedora/whitefedora
+
+/datum/gear/hat/brfedora
+	display_name = "fedora, brown"
+	path = /obj/item/clothing/head/fedora/brownfedora
+
+/datum/gear/hat/beretsec
+	display_name = "security beret"
+	path = /obj/item/clothing/head/beret/sec
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/hat/capcsec
+	display_name = "security corporate cap"
+	path = /obj/item/clothing/head/soft/sec/corp
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/hat/capsec
+	display_name = "security cap"
+	path = /obj/item/clothing/head/soft/sec
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/hat/capred
+	display_name = "cap, red"
+	path = /obj/item/clothing/head/soft/red
+
+/datum/gear/hat/capblue
+	display_name = "cap, blue"
+	path = /obj/item/clothing/head/soft/blue
+
+/datum/gear/hat/capgreen
+	display_name = "cap, green"
+	path = /obj/item/clothing/head/soft/green
+
+/datum/gear/hat/capblack
+	display_name = "cap, black"
+	path = /obj/item/clothing/head/soft/black
+
+/datum/gear/hat/cappurple
+	display_name = "cap, purple"
+	path = /obj/item/clothing/head/soft/purple
+
+/datum/gear/hat/capwhite
+	display_name = "cap, white"
+	path = /obj/item/clothing/head/soft/mime
+
+/datum/gear/hat/caporange
+	display_name = "cap, orange"
+	path = /obj/item/clothing/head/soft/orange
+
+/datum/gear/hat/capgrey
+	display_name = "cap, grey"
+	path = /obj/item/clothing/head/soft/grey
+
+/datum/gear/hat/capyellow
+	display_name = "cap, yellow"
+	path = /obj/item/clothing/head/soft/yellow
+
+/datum/gear/hat/cowboyhat
+	display_name = "cowboy hat"
+	path = /obj/item/clothing/head/cowboyhat
+
+/datum/gear/hat/beret/purple
+	display_name = "beret, purple"
+	path = /obj/item/clothing/head/beret/purple_normal
+
+/datum/gear/hat/beret/black
+	display_name = "beret, black"
+	path = /obj/item/clothing/head/beret/black
+
+/datum/gear/hat/beret/blue
+	display_name = "beret, blue"
+	path = /obj/item/clothing/head/beret/blue
+
+/datum/gear/hat/beret/red
+	display_name = "beret, red"
+	path = /obj/item/clothing/head/beret

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

@@ -0,0 +1,146 @@
+/datum/gear/suit
+	subtype_path = /datum/gear/suit
+	slot = slot_wear_suit
+	sort_category = "External Wear"
+
+//WINTER COATS
+/datum/gear/suit/coat
+	subtype_path = /datum/gear/suit/coat
+	cost = 2
+
+/datum/gear/suit/coat/grey
+	display_name = "winter coat"
+	path = /obj/item/clothing/suit/hooded/wintercoat
+
+/datum/gear/suit/coat/job
+	subtype_path = /datum/gear/suit/coat
+	subtype_cost_overlap = FALSE
+
+/datum/gear/suit/coat/job/sec
+	display_name = "winter coat, security"
+	path = /obj/item/clothing/suit/hooded/wintercoat/security
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/suit/coat/job/captain
+	display_name = "winter coat, captain"
+	path = /obj/item/clothing/suit/hooded/wintercoat/captain
+	allowed_roles = list("Captain")
+
+/datum/gear/suit/coat/job/med
+	display_name = "winter coat, medical"
+	path = /obj/item/clothing/suit/hooded/wintercoat/medical
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Brig Physician")
+
+/datum/gear/suit/coat/job/sci
+	display_name = "winter coat, science"
+	path = /obj/item/clothing/suit/hooded/wintercoat/science
+	allowed_roles = list("Scientist", "Research Director")
+
+/datum/gear/suit/coat/job/engi
+	display_name = "winter coat, engineering"
+	path = /obj/item/clothing/suit/hooded/wintercoat/engineering
+	allowed_roles = list("Chief Engineer", "Engineer", "Mechanic")
+
+/datum/gear/suit/coat/job/atmos
+	display_name = "winter coat, atmospherics"
+	path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
+	allowed_roles = list("Chief Engineer", "Life Support Specialist")
+
+/datum/gear/suit/coat/job/hydro
+	display_name = "winter coat, hydroponics"
+	path = /obj/item/clothing/suit/hooded/wintercoat/hydro
+	allowed_roles = list("Botanist")
+
+/datum/gear/suit/coat/job/cargo
+	display_name = "winter coat, cargo"
+	path = /obj/item/clothing/suit/hooded/wintercoat/cargo
+	allowed_roles = list("Quartermaster", "Cargo Technician")
+
+/datum/gear/suit/coat/job/miner
+	display_name = "winter coat, miner"
+	path = /obj/item/clothing/suit/hooded/wintercoat/miner
+	allowed_roles = list("Miner")
+
+//LABCOATS
+/datum/gear/suit/labcoat_emt
+	display_name = "labcoat, paramedic"
+	path = /obj/item/clothing/suit/storage/labcoat/emt
+	allowed_roles = list("Chief Medical Officer", "Paramedic")
+
+//JACKETS
+/datum/gear/suit/leather_jacket
+	display_name = "leather jacket"
+	path = /obj/item/clothing/suit/jacket/leather
+
+/datum/gear/suit/br_tcoat
+	display_name = "trenchcoat, brown"
+	path = /obj/item/clothing/suit/browntrenchcoat
+
+/datum/gear/suit/bl_tcoat
+	display_name = "trenchcoat, black"
+	path = /obj/item/clothing/suit/blacktrenchcoat
+
+/datum/gear/suit/bomber_jacket
+	display_name = "bomber jacket"
+	path = /obj/item/clothing/suit/jacket
+
+/datum/gear/suit/ol_miljacket
+	display_name = "military jacket, olive"
+	path = /obj/item/clothing/suit/jacket/miljacket
+
+/datum/gear/suit/nv_miljacket
+	display_name = "military jacket, navy"
+	path = /obj/item/clothing/suit/jacket/miljacket/navy
+
+/datum/gear/suit/ds_miljacket
+	display_name = "military jacket, desert"
+	path = /obj/item/clothing/suit/jacket/miljacket/desert
+
+/datum/gear/suit/wh_miljacket
+	display_name = "military jacket, white"
+	path = /obj/item/clothing/suit/jacket/miljacket/white
+
+/datum/gear/suit/secjacket
+	display_name = "security jacket"
+	path = /obj/item/clothing/suit/armor/secjacket
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/suit/poncho
+	display_name = "poncho, classic"
+	path = /obj/item/clothing/suit/poncho
+
+/datum/gear/suit/grponcho
+	display_name = "poncho, green"
+	path = /obj/item/clothing/suit/poncho/green
+
+/datum/gear/suit/rdponcho
+	display_name = "poncho, red"
+	path = /obj/item/clothing/suit/poncho/red
+
+/datum/gear/suit/tphoodie
+	display_name = "hoodie, Tharsis Polytech"
+	path = /obj/item/clothing/suit/hooded/hoodie/tp
+
+/datum/gear/suit/nthoodie
+	display_name = "hoodie, Nanotrasen"
+	path = /obj/item/clothing/suit/hooded/hoodie/nt
+
+/datum/gear/suit/lamhoodie
+	display_name = "hoodie, Lunar Academy of Medicine"
+	path = /obj/item/clothing/suit/hooded/hoodie/lam
+
+/datum/gear/suit/cuthoodie
+	display_name = "hoodie, Canaan University of Technology"
+	path = /obj/item/clothing/suit/hooded/hoodie/cut
+
+/datum/gear/suit/mithoodie
+	display_name = "hoodie, Martian Institute of Technology"
+	path = /obj/item/clothing/suit/hooded/hoodie/mit
+
+/datum/gear/suit/bluehoodie
+	display_name = "hoodie, blue"
+	path = /obj/item/clothing/suit/hooded/hoodie/blue
+
+/datum/gear/suit/blackhoodie
+	display_name = "hoodie, black"
+	path = /obj/item/clothing/suit/hooded/hoodie

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

@@ -0,0 +1,191 @@
+// Uniform slot
+/datum/gear/uniform
+	subtype_path = /datum/gear/uniform
+	slot = slot_w_uniform
+	sort_category = "Uniforms and Casual Dress"
+
+/datum/gear/uniform/skirt
+	subtype_path = /datum/gear/uniform/skirt
+
+/datum/gear/uniform/skirt/blue
+	display_name = "plaid skirt, blue"
+	path = /obj/item/clothing/under/dress/plaid_blue
+
+/datum/gear/uniform/skirt/purple
+	display_name = "plaid skirt, purple"
+	path = /obj/item/clothing/under/dress/plaid_purple
+
+/datum/gear/uniform/skirt/red
+	display_name = "plaid skirt, red"
+	path = /obj/item/clothing/under/dress/plaid_red
+
+/datum/gear/uniform/skirt/black
+	display_name = "skirt, black"
+	path = /obj/item/clothing/under/blackskirt
+
+/datum/gear/uniform/skirt/job
+	cost = 2
+	subtype_path = /datum/gear/uniform/skirt/job
+	subtype_cost_overlap = FALSE
+
+/datum/gear/uniform/skirt/job/ce
+	display_name = "skirt, ce"
+	path = /obj/item/clothing/under/rank/chief_engineer/skirt
+	allowed_roles = list("Chief Engineer")
+
+/datum/gear/uniform/skirt/job/atmos
+	display_name = "skirt, atmos"
+	path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
+	allowed_roles = list("Chief Engineer","Atmospheric Technician")
+
+/datum/gear/uniform/skirt/job/eng
+	display_name = "skirt, engineer"
+	path = /obj/item/clothing/under/rank/engineer/skirt
+	allowed_roles = list("Chief Engineer","Station Engineer")
+
+/datum/gear/uniform/skirt/job/roboticist
+	display_name = "skirt, roboticist"
+	path = /obj/item/clothing/under/rank/roboticist/skirt
+	allowed_roles = list("Research Director","Roboticist")
+
+/datum/gear/uniform/skirt/job/cmo
+	display_name = "skirt, cmo"
+	path = /obj/item/clothing/under/rank/chief_medical_officer
+	allowed_roles = list("Chief Medical Officer")
+
+/datum/gear/uniform/skirt/job/chem
+	display_name = "skirt, chemist"
+	path = /obj/item/clothing/under/rank/chemist/skirt
+	allowed_roles = list("Chief Medical Officer","Chemist")
+
+/datum/gear/uniform/skirt/job/viro
+	display_name = "skirt, virologist"
+	path = /obj/item/clothing/under/rank/virologist/skirt
+	allowed_roles = list("Chief Medical Officer","Medical Doctor")
+
+/datum/gear/uniform/skirt/job/med
+	display_name = "skirt, medical"
+	path = /obj/item/clothing/under/rank/medical/skirt
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
+
+/datum/gear/uniform/skirt/job/sci
+	display_name = "skirt, scientist"
+	path = /obj/item/clothing/under/rank/scientist/skirt
+	allowed_roles = list("Research Director","Scientist")
+
+/datum/gear/uniform/skirt/job/cargo
+	display_name = "skirt, cargo"
+	path = /obj/item/clothing/under/rank/cargotech/skirt
+	allowed_roles = list("Quartermaster","Cargo Technician")
+
+/datum/gear/uniform/skirt/job/qm
+	display_name = "skirt, QM"
+	path = /obj/item/clothing/under/rank/cargo/skirt
+	allowed_roles = list("Quartermaster")
+
+/datum/gear/uniform/skirt/job/warden
+	display_name = "skirt, warden"
+	path = /obj/item/clothing/under/rank/warden/skirt
+	allowed_roles = list("Head of Security", "Warden")
+
+/datum/gear/uniform/skirt/job/security
+	display_name = "skirt, security"
+	path = /obj/item/clothing/under/rank/security/skirt
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
+
+/datum/gear/uniform/skirt/job/head_of_security
+	display_name = "skirt, hos"
+	path = /obj/item/clothing/under/rank/head_of_security/skirt
+	allowed_roles = list("Head of Security")
+
+/datum/gear/uniform/sec
+	subtype_path = /datum/gear/uniform/sec
+	cost = 2
+
+/datum/gear/uniform/sec/formal
+	display_name = "security uniform, formal"
+	path = /obj/item/clothing/under/rank/security/formal
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+
+datum/gear/uniform/secorporate
+	display_name = "security uniform, corporate "
+	path = /obj/item/clothing/under/rank/security/corp
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/uniform/sec/dispatch
+	display_name = "security uniform, dispatch"
+	path = /obj/item/clothing/under/rank/dispatch
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/uniform/sec/casual
+	display_name = "security uniform, casual"
+	path = /obj/item/clothing/under/rank/security2
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Detective", "Security Pod Pilot")
+
+/datum/gear/uniform/shorts/red
+	display_name = "shorts, red"
+	path = /obj/item/clothing/under/shorts/red
+
+/datum/gear/uniform/shorts/green
+	display_name = "shorts, green"
+	path = /obj/item/clothing/under/shorts/green
+
+/datum/gear/uniform/shorts/blue
+	display_name = "shorts, blue"
+	path = /obj/item/clothing/under/shorts/blue
+
+/datum/gear/uniform/shorts/black
+	display_name = "shorts, black"
+	path = /obj/item/clothing/under/shorts/black
+
+/datum/gear/uniform/shorts/grey
+	display_name = "shorts, grey"
+	path = /obj/item/clothing/under/shorts/grey
+
+/datum/gear/uniform/pants/jeans
+	display_name = "jeans, classic"
+	path = /obj/item/clothing/under/pants/classicjeans
+
+/datum/gear/uniform/pants/mjeans
+	display_name = "jeans, mustang"
+	path = /obj/item/clothing/under/pants/mustangjeans
+
+/datum/gear/uniform/pants/bljeans
+	display_name = "jeans, black"
+	path = /obj/item/clothing/under/pants/blackjeans
+
+/datum/gear/uniform/pants/yfjeans
+	display_name = "jeans, Young Folks"
+	path = /obj/item/clothing/under/pants/youngfolksjeans
+
+/datum/gear/uniform/pants/whitepants
+	display_name = "pants, white"
+	path = /obj/item/clothing/under/pants/white
+
+/datum/gear/uniform/pants/redpants
+	display_name = "pants, red"
+	path = /obj/item/clothing/under/pants/red
+
+/datum/gear/uniform/pants/blackpants
+	display_name = "pants, black"
+	path = /obj/item/clothing/under/pants/black
+
+/datum/gear/uniform/pants/tanpants
+	display_name = "pants, tan"
+	path = /obj/item/clothing/under/pants/tan
+
+/datum/gear/uniform/pants/bluepants
+	display_name = "pants, blue"
+	path = /obj/item/clothing/under/pants/blue
+
+/datum/gear/uniform/pants/trackpants
+	display_name = "trackpants"
+	path = /obj/item/clothing/under/pants/track
+
+/datum/gear/uniform/pants/khakipants
+	display_name = "pants, khaki"
+	path = /obj/item/clothing/under/pants/khaki
+
+/datum/gear/uniform/pants/caopants
+	display_name = "pants, camo"
+	path = /obj/item/clothing/under/pants/camo

code/modules/client/preference/preferences_mysql.dm

@@ -59,7 +59,7 @@
 /datum/preferences/proc/save_preferences(client/C)
 
 	// Might as well scrub out any malformed be_special list entries while we're here
-	for (var/role in be_special)
+	for(var/role in be_special)
 		if(!(role in special_roles))
 			log_to_dd("[C.key] had a malformed role entry: '[role]'. Removing!")
 			be_special -= role
@@ -156,7 +156,8 @@
 					nanotrasen_relation,
 					speciesprefs,
 					socks,
-					body_accessory
+					body_accessory,
+					gear
 				 	FROM [format_table_name("characters")] WHERE ckey='[C.ckey]' AND slot='[slot]'"})
 	if(!query.Execute())
 		var/err = query.ErrorMsg()
@@ -232,6 +233,7 @@
 		//socks
 		socks = query.item[56]
 		body_accessory = query.item[57]
+		gear = params2list(query.item[58])
 
 	//Sanitize
 	metadata		= sanitize_text(metadata, initial(metadata))
@@ -292,6 +294,7 @@
 	if(!rlimb_data) src.rlimb_data = list()
 	if(!m_colours) m_colours = initial(m_colours)
 	if(!m_styles) m_styles = initial(m_styles)
+	if(!gear) gear = list()
 
 	return 1
 
@@ -299,12 +302,15 @@
 	var/organlist
 	var/rlimblist
 	var/playertitlelist
+	var/gearlist
 	if(!isemptylist(organ_data))
 		organlist = list2params(organ_data)
 	if(!isemptylist(rlimb_data))
 		rlimblist = list2params(rlimb_data)
 	if(!isemptylist(player_alt_titles))
 		playertitlelist = list2params(player_alt_titles)
+	if(!isemptylist(gear))
+		gearlist = list2params(gear)
 
 	var/DBQuery/firstquery = dbcon.NewQuery("SELECT slot FROM [format_table_name("characters")] WHERE ckey='[C.ckey]' ORDER BY slot")
 	firstquery.Execute()
@@ -366,7 +372,8 @@
 												nanotrasen_relation='[nanotrasen_relation]',
 												speciesprefs='[speciesprefs]',
 												socks='[socks]',
-												body_accessory='[body_accessory]'
+												body_accessory='[body_accessory]',
+												gear='[gearlist]'
 												WHERE ckey='[C.ckey]'
 												AND slot='[default_slot]'"}
 												)
@@ -397,7 +404,7 @@
 											flavor_text, med_record, sec_record, gen_record,
 											player_alt_titles,
 											disabilities, organ_data, rlimb_data, nanotrasen_relation, speciesprefs,
-											socks, body_accessory)
+											socks, body_accessory, gear)
 
 					VALUES
 											('[C.ckey]', '[default_slot]', '[sql_sanitize_text(metadata)]', '[sql_sanitize_text(real_name)]', '[be_random_name]','[gender]',
@@ -418,7 +425,7 @@
 											'[sql_sanitize_text(html_encode(flavor_text))]', '[sql_sanitize_text(html_encode(med_record))]', '[sql_sanitize_text(html_encode(sec_record))]', '[sql_sanitize_text(html_encode(gen_record))]',
 											'[playertitlelist]',
 											'[disabilities]', '[organlist]', '[rlimblist]', '[nanotrasen_relation]', '[speciesprefs]',
-											'[socks]', '[body_accessory]')
+											'[socks]', '[body_accessory]', '[gearlist]')
 
 "}
 )

code/modules/client/preference/preferences_toggles.dm

@@ -1,216 +1,216 @@
-//toggles
-/client/verb/toggle_ghost_ears()
-	set name = "Show/Hide GhostEars"
-	set category = "Preferences"
-	set desc = ".Toggle Between seeing all mob speech, and only speech of nearby mobs"
-	prefs.toggles ^= CHAT_GHOSTEARS
-	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].")
-	prefs.save_preferences(src)
-	feedback_add_details("admin_verb","TGE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggle_ghost_sight()
-	set name = "Show/Hide GhostSight"
-	set category = "Preferences"
-	set desc = ".Toggle Between seeing all mob emotes, and only emotes of nearby mobs"
-	prefs.toggles ^= CHAT_GHOSTSIGHT
-	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].")
-	prefs.save_preferences(src)
-	feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggle_ghost_radio()
-	set name = "Enable/Disable GhostRadio"
-	set category = "Preferences"
-	set desc = ".Toggle between hearing all radio chatter, or only from nearby speakers"
-	prefs.toggles ^= CHAT_GHOSTRADIO
-	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"].")
-	prefs.save_preferences(src)
-	feedback_add_details("admin_verb","TGR")
-
-/client/proc/toggle_hear_radio()
-	set name = "Show/Hide RadioChatter"
-	set category = "Preferences"
-	set desc = "Toggle seeing radiochatter from radios and speakers"
-	if(!holder) return
-	prefs.toggles ^= CHAT_RADIO
-	prefs.save_preferences(src)
-	to_chat(usr, "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers")
-	feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggleadminhelpsound()
-	set name = "Hear/Silence Adminhelps"
-	set category = "Preferences"
-	set desc = "Toggle hearing a notification when admin PMs are recieved"
-	if(!holder)	return
-	prefs.sound ^= SOUND_ADMINHELP
-	prefs.save_preferences(src)
-	to_chat(usr, "You will [(prefs.sound & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.")
-	feedback_add_details("admin_verb","AHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/deadchat() // Deadchat toggle is usable by anyone.
-	set name = "Show/Hide Deadchat"
-	set category = "Preferences"
-	set desc ="Toggles seeing deadchat"
-	prefs.toggles ^= CHAT_DEAD
-	prefs.save_preferences(src)
-
-	if(src.holder)
-		to_chat(src, "You will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.")
-	else
-		to_chat(src, "As a ghost, you will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.")
-
-	feedback_add_details("admin_verb","TDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/proc/toggleprayers()
-	set name = "Show/Hide Prayers"
-	set category = "Preferences"
-	set desc = "Toggles seeing prayers"
-	prefs.toggles ^= CHAT_PRAYER
-	prefs.save_preferences(src)
-	to_chat(src, "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.")
-	feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/togglescoreboard()
-	set name = "Hide/Display End Round Scoreboard"
-	set category = "Preferences"
-	set desc = "Toggles displaying end of round scoreboard"
-	prefs.toggles ^= DISABLE_SCOREBOARD
-	prefs.save_preferences(src)
-	to_chat(src, "You will [(prefs.toggles & DISABLE_SCOREBOARD) ? "no longer" : "now"] see the end of round scoreboard.")
-	feedback_add_details("admin_verb","TScoreboard") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/togglekarmareminder()
-	set name = "Hide/Display End Round Karma Reminder"
-	set category = "Preferences"
-	set desc = "Toggles displaying end of round karma reminder"
-	prefs.toggles ^= DISABLE_KARMA_REMINDER
-	prefs.save_preferences(src)
-	to_chat(src, "You will [(prefs.toggles & DISABLE_KARMA_REMINDER) ? "no longer" : "now"] see the end of round karma reminder.")
-	feedback_add_details("admin_verb","TKarmabugger") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggletitlemusic()
-	set name = "Hear/Silence LobbyMusic"
-	set category = "Preferences"
-	set desc = "Toggles hearing the GameLobby music"
-	prefs.sound ^= SOUND_LOBBY
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_LOBBY)
-		to_chat(src, "You will now hear music in the game lobby.")
-		if(istype(mob, /mob/new_player))
-			playtitlemusic()
-	else
-		to_chat(src, "You will no longer hear music in the game lobby.")
-		if(istype(mob, /mob/new_player))
-			to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// stop the jamsz
-
-	feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/togglemidis()
-	set name = "Hear/Silence Midis"
-	set category = "Preferences"
-	set desc = "Toggles hearing sounds uploaded by admins"
-	prefs.sound ^= SOUND_MIDI
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_MIDI)
-		to_chat(src, "You will now hear any sounds uploaded by admins.")
-	else
-		var/sound/break_sound = sound(null, repeat = 0, wait = 0, channel = 777)
-		break_sound.priority = 250
-		to_chat(src, break_sound)//breaks the client's sound output on channel 777
-
-		to_chat(src, "You will no longer hear sounds uploaded by admins; any currently playing midis have been disabled.")
-	feedback_add_details("admin_verb","TMidi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/listen_ooc()
-	set name = "Show/Hide OOC"
-	set category = "Preferences"
-	set desc = "Toggles seeing OutOfCharacter chat"
-	prefs.toggles ^= CHAT_OOC
-	prefs.save_preferences(src)
-	to_chat(src, "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.")
-	feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/client/verb/listen_looc()
-	set name = "Show/Hide LOOC"
-	set category = "Preferences"
-	set desc = "Toggles seeing Local OutOfCharacter chat"
-	prefs.toggles ^= CHAT_LOOC
-	prefs.save_preferences(src)
-	to_chat(src, "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.")
-	feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/client/verb/Toggle_Soundscape() //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful
-	set name = "Hear/Silence Ambience"
-	set category = "Preferences"
-	set desc = "Toggles hearing ambient sound effects"
-	prefs.sound ^= SOUND_AMBIENCE
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_AMBIENCE)
-		to_chat(src, "You will now hear ambient sounds.")
-	else
-		to_chat(src, "You will no longer hear ambient sounds.")
-		to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 1))
-	feedback_add_details("admin_verb","TAmbi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/Toggle_Buzz() //No more headaches because headphones bump up shipambience.ogg to insanity levels.
-	set name = "Hear/Silence White Noise"
-	set category = "Preferences"
-	set desc = "Toggles hearing ambient white noise"
-	prefs.sound ^= SOUND_BUZZ
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_BUZZ)
-		to_chat(src, "You will now hear ambient white noise.")
-	else
-		to_chat(src, "You will no longer hear ambient white noise.")
-		to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 2))
-	feedback_add_details("admin_verb","TBuzz") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/client/verb/Toggle_Heartbeat() //to toggle off heartbeat sounds, in case they get too annoying
-	set name = "Hear/Silence Heartbeat"
-	set category = "Preferences"
-	set desc = "Toggles hearing heart beating sound effects"
-	prefs.sound ^= SOUND_HEARTBEAT
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_HEARTBEAT)
-		to_chat(src, "You will now hear heartbeat sounds.")
-	else
-		to_chat(src, "You will no longer hear heartbeat sounds.")
-		to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 1))
-		to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 2))
-	feedback_add_details("admin_verb","Thb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-// This needs a toggle because you people are awful and spammed terrible music
-/client/verb/toggle_instruments()
-	set name = "Hear/Silence Instruments"
-	set category = "Preferences"
-	set desc = "Toggles hearing musical instruments like the violin and piano"
-	prefs.toggles ^= SOUND_INSTRUMENTS
-	prefs.save_preferences(src)
-	if(prefs.toggles & SOUND_INSTRUMENTS)
-		to_chat(src, "You will now hear people playing musical instruments.")
-	else
-		to_chat(src, "You will no longer hear musical instruments.")
-	feedback_add_details("admin_verb","TInstru") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggle_media()
-	set name = "Hear/Silence Streaming"
-	set category = "Preferences"
-	set desc = "Toggle hearing streaming media (radios, jukeboxes, etc)"
-
-	prefs.sound ^= SOUND_STREAMING
-	prefs.save_preferences(src)
-	to_chat(usr, "You will [(prefs.sound & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media.")
-	if(!media) return
-	if(prefs.sound & SOUND_STREAMING)
-		media.update_music()
-	else
-		media.stop_music()
-
-/client/verb/setup_character()
-	set name = "Game Preferences"
-	set category = "Preferences"
-	set desc = "Allows you to access the Setup Character screen. Changes to your character won't take effect until next round, but other changes will."
-	prefs.current_tab = 1
+//toggles
+/client/verb/toggle_ghost_ears()
+	set name = "Show/Hide GhostEars"
+	set category = "Preferences"
+	set desc = ".Toggle Between seeing all mob speech, and only speech of nearby mobs"
+	prefs.toggles ^= CHAT_GHOSTEARS
+	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].")
+	prefs.save_preferences(src)
+	feedback_add_details("admin_verb","TGE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_ghost_sight()
+	set name = "Show/Hide GhostSight"
+	set category = "Preferences"
+	set desc = ".Toggle Between seeing all mob emotes, and only emotes of nearby mobs"
+	prefs.toggles ^= CHAT_GHOSTSIGHT
+	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].")
+	prefs.save_preferences(src)
+	feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_ghost_radio()
+	set name = "Enable/Disable GhostRadio"
+	set category = "Preferences"
+	set desc = ".Toggle between hearing all radio chatter, or only from nearby speakers"
+	prefs.toggles ^= CHAT_GHOSTRADIO
+	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"].")
+	prefs.save_preferences(src)
+	feedback_add_details("admin_verb","TGR")
+
+/client/proc/toggle_hear_radio()
+	set name = "Show/Hide RadioChatter"
+	set category = "Preferences"
+	set desc = "Toggle seeing radiochatter from radios and speakers"
+	if(!holder) return
+	prefs.toggles ^= CHAT_RADIO
+	prefs.save_preferences(src)
+	to_chat(usr, "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers")
+	feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggleadminhelpsound()
+	set name = "Hear/Silence Adminhelps"
+	set category = "Preferences"
+	set desc = "Toggle hearing a notification when admin PMs are recieved"
+	if(!holder)	return
+	prefs.sound ^= SOUND_ADMINHELP
+	prefs.save_preferences(src)
+	to_chat(usr, "You will [(prefs.sound & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.")
+	feedback_add_details("admin_verb","AHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/deadchat() // Deadchat toggle is usable by anyone.
+	set name = "Show/Hide Deadchat"
+	set category = "Preferences"
+	set desc ="Toggles seeing deadchat"
+	prefs.toggles ^= CHAT_DEAD
+	prefs.save_preferences(src)
+
+	if(src.holder)
+		to_chat(src, "You will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.")
+	else
+		to_chat(src, "As a ghost, you will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.")
+
+	feedback_add_details("admin_verb","TDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/toggleprayers()
+	set name = "Show/Hide Prayers"
+	set category = "Preferences"
+	set desc = "Toggles seeing prayers"
+	prefs.toggles ^= CHAT_PRAYER
+	prefs.save_preferences(src)
+	to_chat(src, "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.")
+	feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/togglescoreboard()
+	set name = "Hide/Display End Round Scoreboard"
+	set category = "Preferences"
+	set desc = "Toggles displaying end of round scoreboard"
+	prefs.toggles ^= DISABLE_SCOREBOARD
+	prefs.save_preferences(src)
+	to_chat(src, "You will [(prefs.toggles & DISABLE_SCOREBOARD) ? "no longer" : "now"] see the end of round scoreboard.")
+	feedback_add_details("admin_verb","TScoreboard") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/togglekarmareminder()
+	set name = "Hide/Display End Round Karma Reminder"
+	set category = "Preferences"
+	set desc = "Toggles displaying end of round karma reminder"
+	prefs.toggles ^= DISABLE_KARMA_REMINDER
+	prefs.save_preferences(src)
+	to_chat(src, "You will [(prefs.toggles & DISABLE_KARMA_REMINDER) ? "no longer" : "now"] see the end of round karma reminder.")
+	feedback_add_details("admin_verb","TKarmabugger") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggletitlemusic()
+	set name = "Hear/Silence LobbyMusic"
+	set category = "Preferences"
+	set desc = "Toggles hearing the GameLobby music"
+	prefs.sound ^= SOUND_LOBBY
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_LOBBY)
+		to_chat(src, "You will now hear music in the game lobby.")
+		if(istype(mob, /mob/new_player))
+			playtitlemusic()
+	else
+		to_chat(src, "You will no longer hear music in the game lobby.")
+		if(istype(mob, /mob/new_player))
+			src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)// stop the jamsz
+
+	feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/togglemidis()
+	set name = "Hear/Silence Midis"
+	set category = "Preferences"
+	set desc = "Toggles hearing sounds uploaded by admins"
+	prefs.sound ^= SOUND_MIDI
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_MIDI)
+		to_chat(src, "You will now hear any sounds uploaded by admins.")
+	else
+		var/sound/break_sound = sound(null, repeat = 0, wait = 0, channel = 777)
+		break_sound.priority = 250
+		src << break_sound //breaks the client's sound output on channel 777
+
+		to_chat(src, "You will no longer hear sounds uploaded by admins; any currently playing midis have been disabled.")
+	feedback_add_details("admin_verb","TMidi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/listen_ooc()
+	set name = "Show/Hide OOC"
+	set category = "Preferences"
+	set desc = "Toggles seeing OutOfCharacter chat"
+	prefs.toggles ^= CHAT_OOC
+	prefs.save_preferences(src)
+	to_chat(src, "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.")
+	feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
+/client/verb/listen_looc()
+	set name = "Show/Hide LOOC"
+	set category = "Preferences"
+	set desc = "Toggles seeing Local OutOfCharacter chat"
+	prefs.toggles ^= CHAT_LOOC
+	prefs.save_preferences(src)
+	to_chat(src, "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.")
+	feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
+/client/verb/Toggle_Soundscape() //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful
+	set name = "Hear/Silence Ambience"
+	set category = "Preferences"
+	set desc = "Toggles hearing ambient sound effects"
+	prefs.sound ^= SOUND_AMBIENCE
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_AMBIENCE)
+		to_chat(src, "You will now hear ambient sounds.")
+	else
+		to_chat(src, "You will no longer hear ambient sounds.")
+		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)
+	feedback_add_details("admin_verb","TAmbi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/Toggle_Buzz() //No more headaches because headphones bump up shipambience.ogg to insanity levels.
+	set name = "Hear/Silence White Noise"
+	set category = "Preferences"
+	set desc = "Toggles hearing ambient white noise"
+	prefs.sound ^= SOUND_BUZZ
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_BUZZ)
+		to_chat(src, "You will now hear ambient white noise.")
+	else
+		to_chat(src, "You will no longer hear ambient white noise.")
+		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)
+	feedback_add_details("admin_verb","TBuzz") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
+/client/verb/Toggle_Heartbeat() //to toggle off heartbeat sounds, in case they get too annoying
+	set name = "Hear/Silence Heartbeat"
+	set category = "Preferences"
+	set desc = "Toggles hearing heart beating sound effects"
+	prefs.sound ^= SOUND_HEARTBEAT
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_HEARTBEAT)
+		to_chat(src, "You will now hear heartbeat sounds.")
+	else
+		to_chat(src, "You will no longer hear heartbeat sounds.")
+		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)
+		src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)
+	feedback_add_details("admin_verb","Thb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+// This needs a toggle because you people are awful and spammed terrible music
+/client/verb/toggle_instruments()
+	set name = "Hear/Silence Instruments"
+	set category = "Preferences"
+	set desc = "Toggles hearing musical instruments like the violin and piano"
+	prefs.sound ^= SOUND_INSTRUMENTS
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_INSTRUMENTS)
+		to_chat(src, "You will now hear people playing musical instruments.")
+	else
+		to_chat(src, "You will no longer hear musical instruments.")
+	feedback_add_details("admin_verb","TInstru") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_media()
+	set name = "Hear/Silence Streaming"
+	set category = "Preferences"
+	set desc = "Toggle hearing streaming media (radios, jukeboxes, etc)"
+
+	prefs.sound ^= SOUND_STREAMING
+	prefs.save_preferences(src)
+	to_chat(usr, "You will [(prefs.sound & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media.")
+	if(!media) return
+	if(prefs.sound & SOUND_STREAMING)
+		media.update_music()
+	else
+		media.stop_music()
+
+/client/verb/setup_character()
+	set name = "Game Preferences"
+	set category = "Preferences"
+	set desc = "Allows you to access the Setup Character screen. Changes to your character won't take effect until next round, but other changes will."
+	prefs.current_tab = 1
 	prefs.ShowChoices(usr)