Merge branch 'master' into development

# Conflicts: # code/modules/client/preference_setup/loadout/loadout_xeno.dm # code/modules/customitems/item_defines.dm
2025-12-21 07:32:02 +00:00 · 2017-09-09 21:38:02 +03:00
parent 0d8fe2e6a4 4199d3a2d8
commit 16d33365c2
79 changed files with 1476 additions and 907 deletions
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -170,6 +170,7 @@
 #include "code\controllers\subsystems\overlays.dm"
 #include "code\controllers\subsystems\pai.dm"
 #include "code\controllers\subsystems\parallax.dm"
+#include "code\controllers\subsystems\plants.dm"
 #include "code\controllers\subsystems\power.dm"
 #include "code\controllers\subsystems\radio.dm"
 #include "code\controllers\subsystems\statistics.dm"
@@ -194,7 +195,6 @@
 #include "code\controllers\subsystems\processing\modifiers.dm"
 #include "code\controllers\subsystems\processing\nanoui.dm"
 #include "code\controllers\subsystems\processing\pipenet.dm"
-#include "code\controllers\subsystems\processing\plants.dm"
 #include "code\controllers\subsystems\processing\processing.dm"
 #include "code\controllers\subsystems\processing\shuttle.dm"
 #include "code\datums\ai_law_sets.dm"
--- a/code/controllers/subsystems/garbage.dm
+++ b/code/controllers/subsystems/garbage.dm
@@ -3,7 +3,7 @@ var/datum/controller/subsystem/garbage_collector/SSgarbage
 /datum/controller/subsystem/garbage_collector
 	name = "Garbage"
 	priority = SS_PRIORITY_GARBAGE
-	wait = 5
+	wait = 2 SECONDS
 	flags = SS_FIRE_IN_LOBBY|SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT

 	var/collection_timeout = 3000// deciseconds to wait to let running procs finish before we just say fuck it and force del() the object
--- a/code/controllers/subsystems/icon_cache.dm
+++ b/code/controllers/subsystems/icon_cache.dm
@@ -58,6 +58,9 @@
 	var/list/collar_states
 	var/list/uniform_states

+	// This is for the kitty ears item.
+	var/list/kitty_ear_cache = list()
+
 /datum/controller/subsystem/icon_cache/New()
 	NEW_SS_GLOBAL(SSicon_cache)

--- a/code/controllers/subsystems/processing/plants.dm
+++ b/code/controllers/subsystems/processing/plants.dm
@@ -1,6 +1,6 @@
-/var/datum/controller/subsystem/processing/plants/SSplants
+/var/datum/controller/subsystem/plants/SSplants

-/datum/controller/subsystem/processing/plants
+/datum/controller/subsystem/plants
 	name = "Seeds & Plants"
 	flags = 0	// Override parent's flags.
 	wait = 75
@@ -14,10 +14,15 @@
 	var/list/plant_sprites = list()         // List of all harvested product sprites.
 	var/list/plant_product_sprites = list() // List of all growth sprites plus number of growth stages.

-/datum/controller/subsystem/processing/plants/New()
+	var/list/processing = list()
+
+/datum/controller/subsystem/plants/New()
 	NEW_SS_GLOBAL(SSplants)

-/datum/controller/subsystem/processing/plants/Initialize(timeofday)
+/datum/controller/subsystem/plants/stat_entry()
+	..("P:[processing.len]")
+
+/datum/controller/subsystem/plants/Initialize(timeofday)
 	// Build the icon lists.
 	for(var/icostate in icon_states('icons/obj/hydroponics_growing.dmi'))
 		var/split = findtext(icostate,"-")
@@ -63,7 +68,7 @@
 	
 	..()

-/datum/controller/subsystem/processing/plants/Recover()
+/datum/controller/subsystem/plants/Recover()
 	if (istype(SSplants))
 		src.product_descs = SSplants.product_descs
 		src.seeds = SSplants.seeds
@@ -72,8 +77,26 @@
 		src.plant_sprites = SSplants.plant_sprites
 		src.plant_product_sprites = SSplants.plant_product_sprites

+/datum/controller/subsystem/plants/fire(resumed = 0)
+	var/list/queue = processing
+	while (queue.len)
+		var/obj/effect/plant/P = queue[queue.len]
+		queue.len--
+
+		if (!QDELETED(P))
+			P.process()
+
+		if (MC_TICK_CHECK)
+			return
+
+/datum/controller/subsystem/plants/proc/add_plant(obj/effect/plant/plant)
+	processing[plant] = TRUE
+
+/datum/controller/subsystem/plants/proc/remove_plant(obj/effect/plant/plant)
+	processing -= plant
+
 // Proc for creating a random seed type.
-/datum/controller/subsystem/processing/plants/proc/create_random_seed(var/survive_on_station)
+/datum/controller/subsystem/plants/proc/create_random_seed(var/survive_on_station)
 	var/datum/seed/seed = new()
 	seed.randomize()
 	seed.uid = seeds.len + 1
--- a/code/controllers/subsystems/statistics.dm
+++ b/code/controllers/subsystems/statistics.dm
@@ -125,8 +125,9 @@
 	feedback_add_details("radio_usage","PDA-[pda_msg_amt]")
 	feedback_add_details("radio_usage","RC-[rc_msg_amt]")

-	for (var/datum/statistic/S in simple_statistics)
-		if (S.write_to_database && S.key)
+	for (var/key in simple_statistics)
+		var/datum/statistic/S = simple_statistics[key]
+		if (S.write_to_db && S.key)
 			S.write_to_database()

 	feedback_set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set.
--- a/code/datums/statistic.dm
+++ b/code/datums/statistic.dm
@@ -1,7 +1,7 @@
 /datum/statistic
 	var/name
 	var/key
-	var/write_to_database = FALSE
+	var/write_to_db = FALSE
 	var/broadcast_at_roundend = TRUE

 /datum/statistic/proc/set_value()
@@ -58,20 +58,22 @@
 /datum/statistic/numeric/openturf_falls
 	name = "Human Open Space Falls"
 	key = "openturf_human_falls"
-	write_to_database = TRUE
+	write_to_db = TRUE

 /datum/statistic/numeric/openturf_deaths
 	name = "Human Open Space Fatalities"
 	key = "openturf_human_deaths"
-	write_to_database = TRUE
+	write_to_db = TRUE

 /datum/statistic/numeric/gibbings
 	name = "Gibbings"
 	key = "gibs"
+	write_to_db = TRUE

 /datum/statistic/numeric/clonings
 	name = "Clones Produced"
 	key = "clones"
+	write_to_db = TRUE

 /datum/statistic/grouped/most_deaths
 	name = "Most Overall Deaths (by ckey)"
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -74,9 +74,11 @@
 			if(COMPANY_OPPOSED)      loyalty = 0.70

 	//give them an account in the station database
-	var/species_modifier = (H.species ? economic_species_modifier[H.species.type] : 2)
+	var/species_modifier = (H.species ? H.species.economic_modifier : null)
 	if (!species_modifier)
-		species_modifier = economic_species_modifier[/datum/species/human]
+		var/datum/species/human_species = global.all_species["Human"]
+		species_modifier = human_species.economic_modifier
+		PROCLOG_WEIRD("species [H.species || "NULL"] did not have a set economic_modifier!")

 	var/money_amount = (rand(5,50) + rand(5, 50)) * loyalty * economic_modifier * species_modifier
 	var/datum/money_account/M = create_account(H.real_name, money_amount, null)
@@ -144,18 +146,7 @@
 			if(COMPANY_OPPOSED)      loyalty = -3

 	//give them an account in the station database
-	var/species_modifier = 0
-	if(economic_species_modifier[H.species.type])
-		switch(economic_species_modifier[H.species.type])
-			if(/datum/species/human)		species_modifier = 0
-			if(/datum/species/skrell)		species_modifier = 0
-			if(/datum/species/tajaran)		species_modifier = -2
-			if(/datum/species/unathi)		species_modifier = -2
-			if(/datum/species/diona)		species_modifier = -4
-			if(/datum/species/machine)		species_modifier = -4
-			if(/datum/species/bug)			species_modifier = -6
-			else							species_modifier = -3
-
+	var/species_modifier = min((H.species ? H.species.economic_modifier : 0) - 9, 0)

 	var/wealth = (loyalty + economic_modifier + species_modifier)

--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -78,7 +78,7 @@ var/list/medical_positions = list(
 	"Psychiatrist",
 	"Chemist",
 	"Paramedic",
-	"Nursing Intern"
+	"Medical Resident"
 )


--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -156,7 +156,7 @@
 				else
 					assembly.state = 1
 					user << "<span class='notice'>You cut \the [src] free from the wall.</span>"
-					new /obj/item/stack/cable_coil(src.loc, length=2)
+					new /obj/item/stack/cable_coil(loc, 2)
 				assembly = null //so qdel doesn't eat it.
 			qdel(src)

--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -142,7 +142,17 @@
 		jump_to = locate() in A
 	else if(isturf(A))
 		var/best_dist = INFINITY
-		for(var/obj/machinery/camera/camera in get_area(A))
+		var/check_area = get_area(A)
+
+		if (!check_area)
+			return
+
+		for(var/cc in SSmachinery.all_cameras)
+			var/obj/machinery/camera/camera = cc
+			if(!camera.loc)
+				continue
+			if (camera.loc.loc != check_area)
+				continue
 			if(!camera.can_use())
 				continue
 			if(!can_access_camera(camera))
--- a/code/game/machinery/kitchen/smartfridge.dm
+++ b/code/game/machinery/kitchen/smartfridge.dm
@@ -22,6 +22,7 @@
 	var/scan_id = 1
 	var/is_secure = 0
 	var/datum/wires/smartfridge/wires = null
+	atmos_canpass = CANPASS_NEVER

 /obj/machinery/smartfridge/secure
 	is_secure = 1
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -152,6 +152,7 @@

 	if(wreckage)
 		var/obj/effect/decal/mecha_wreckage/WR = new wreckage(loc)
+		WR.icon_state = "[icon_state]-broken"
 		for(var/obj/item/mecha_parts/mecha_equipment/E in equipment)
 			if(E.salvageable && prob(30))
 				WR.crowbar_salvage += E
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -211,9 +211,10 @@
 							continue

 						success = TRUE
-						S.handle_item_insertion(I, 1)	//The 1 stops the "You put the [src] into [S]" insertion message from being displayed.
+						S.handle_item_insertion_deferred(I, user)	//The 1 stops the "You put the [src] into [S]" insertion message from being displayed.
 						CHECK_TICK	// Because people insist on picking up huge-ass piles of stuff.

+					S.handle_storage_deferred(user)
 					if(success && !failure)
 						user << "<span class='notice'>You put everything in [S].</span>"
 					else if(success)
--- a/code/game/objects/items/devices/holowarrant.dm
+++ b/code/game/objects/items/devices/holowarrant.dm
@@ -40,8 +40,8 @@

 //hit other people with it
 /obj/item/device/holowarrant/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	user.visible_message("<span class='notice'>You show the warrant to [M]. </span>", \
-			"<span class='notice'>[user] holds up a warrant projector and shows the contents to [M]. </span>")
+	user.visible_message("<span class='notice'>[user] holds up a warrant projector and shows the contents to [M]. </span>", \
+			"<span class='notice'>You show the warrant to [M]. </span>")
 	M.examinate(src)

 //sync with database
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -22,6 +22,7 @@
 	display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients
 	use_to_pickup = 1
 	slot_flags = SLOT_BELT
+	var/use_deferred = TRUE

 // -----------------------------
 //          Trash bag
@@ -58,7 +59,13 @@
 					bagfull = 1
 					break
 				count++
-				handle_item_insertion(L, 1)//value of 1 suppresses confirmation messages from this one
+				if (use_deferred)
+					handle_item_insertion_deferred(L, user)
+				else
+					handle_item_insertion(L, TRUE)
+
+			if (use_deferred)
+				handle_storage_deferred(user)

 			if (count)
 				user << "<span class='notice'>You empty [count] broken bulbs into the trashbag.</span>"
@@ -135,12 +142,9 @@
 	storage_slots = 7

 	allow_quick_empty = 1 // this function is superceded
-	New()
-		..()
-		//verbs -= /obj/item/weapon/storage/verb/quick_empty
-		//verbs += /obj/item/weapon/storage/bag/sheetsnatcher/quick_empty
+	use_deferred = FALSE

-	can_be_inserted(obj/item/W as obj, stop_messages = 0)
+/obj/item/weapon/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W as obj, stop_messages = 0)
 	if(!istype(W,/obj/item/stack/material))
 		if(!stop_messages)
 			usr << "The snatcher does not accept [W]."
@@ -156,7 +160,7 @@


 // Modified handle_item_insertion.  Would prefer not to, but...
-	handle_item_insertion(obj/item/W as obj, prevent_warning = 0)
+/obj/item/weapon/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W as obj, prevent_warning = 0)
 	var/obj/item/stack/material/S = W
 	if(!istype(S)) return 0

@@ -197,7 +201,7 @@

 // Sets up numbered display to show the stack size of each stored mineral
 // NOTE: numbered display is turned off currently because it's broken
-	orient2hud(mob/user as mob)
+/obj/item/weapon/storage/bag/sheetsnatcher/orient2hud(mob/user as mob)
 	var/adjusted_contents = contents.len

 	//Numbered contents display
@@ -220,7 +224,7 @@


 // Modified quick_empty verb drops appropriate sized stacks
-	quick_empty()
+/obj/item/weapon/storage/bag/sheetsnatcher/quick_empty()
 	var/location = get_turf(src)
 	for(var/obj/item/stack/material/S in contents)
 		while(S.amount)
@@ -236,7 +240,7 @@
 	update_icon()

 // Instead of removing
-	remove_from_storage(obj/item/W as obj, atom/new_location)
+/obj/item/weapon/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W as obj, atom/new_location)
 	var/obj/item/stack/material/S = W
 	if(!istype(S)) return 0

--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -356,34 +356,52 @@
 //This proc handles items being inserted. It does not perform any checks of whether an item can or can't be inserted. That's done by can_be_inserted()
 //The stop_warning parameter will stop the insertion message from being displayed. It is intended for cases where you are inserting multiple items at once,
 //such as when picking up all the items on a tile with one click.
-/obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj, prevent_warning = 0)
+/obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj, prevent_warning = 0, mob/user = usr)
 	if(!istype(W)) return 0
-	if(usr)
-		usr.prepare_for_slotmove(W)
-		usr.update_icons()	//update our overlays
+	if(user)
+		user.prepare_for_slotmove(W)
 	W.forceMove(src)
 	W.on_enter_storage(src)
-	if(usr)
-		if (usr.client && usr.s_active != src)
-			usr.client.screen -= W
-		W.dropped(usr)
-		add_fingerprint(usr)
+	if(user)
+		W.dropped(user)
+		add_fingerprint(user)

 		if(!prevent_warning)
-			for(var/mob/M in viewers(usr, null))
+			for(var/mob/M in viewers(user, null))
 				if (M == usr)
 					usr << "<span class='notice'>You put \the [W] into [src].</span>"
 				else if (M in range(1)) //If someone is standing close enough, they can tell what it is...
-					M.show_message("<span class='notice'>\The [usr] puts [W] into [src].</span>")
+					M.show_message("<span class='notice'>\The [user] puts [W] into [src].</span>")
 				else if (W && W.w_class >= 3) //Otherwise they can only see large or normal items from a distance...
-					M.show_message("<span class='notice'>\The [usr] puts [W] into [src].</span>")
+					M.show_message("<span class='notice'>\The [user] puts [W] into [src].</span>")

-		src.orient2hud(usr)
-		if(usr.s_active)
-			usr.s_active.show_to(usr)
-	update_icon()
+		orient2hud(user)
+		if(user.s_active)
+			user.s_active.show_to(user)
+	queue_icon_update()
 	return 1

+// This is for inserting more than one thing at a time, you should call handle_storage_deferred after all the items have been inserted.
+/obj/item/weapon/storage/proc/handle_item_insertion_deferred(obj/item/W, mob/user)
+	if (!istype(W))
+		return FALSE
+
+	if (user)
+		user.prepare_for_slotmove(W)
+
+	W.forceMove(src)
+	W.on_enter_storage(src)
+	if (user)
+		W.dropped(user)
+
+/obj/item/weapon/storage/proc/handle_storage_deferred(mob/user)
+	add_fingerprint(user)
+	user.update_icons()
+	orient2hud(user)
+	if (user.s_active)
+		user.s_active.show_to(user)
+	queue_icon_update()
+
 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target
 /obj/item/weapon/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location)
 	if(!istype(W)) return 0
@@ -418,6 +436,45 @@
 	update_icon()
 	return 1

+/obj/item/weapon/storage/proc/remove_from_storage_deferred(obj/item/W, atom/new_location, mob/user)
+	if (!istype(W))
+		return FALSE
+
+	// fuck if I know.
+	for(var/mob/M in range(1, src.loc))
+		if (M.s_active == src)
+			if (M.client)
+				M.client.screen -= W
+
+	if (new_location)
+		if (ismob(loc))
+			W.dropped(user)
+		if (ismob(new_location))
+			W.layer = 20
+		else
+			W.layer = initial(W.layer)
+
+		W.forceMove(new_location)
+	else
+		W.forceMove(get_turf(src))
+
+	if (W.maptext)
+		W.maptext = ""
+
+	W.on_exit_storage(src)
+
+	return TRUE
+
+/obj/item/weapon/storage/proc/post_remove_from_storage_deferred(atom/oldloc, mob/user)
+	orient2hud(user)
+	if (user.s_active)
+		user.s_active.show_to(user)
+
+	// who knows what the fuck this does
+	if (istype(src, /obj/item/weapon/storage/fancy))
+		update_icon(1)
+	else
+		update_icon()

 //This proc is called when you want to place an item into the storage item.
 //Its a safe proc for adding things to the storage that does the necessary checks. Object will not be moved if it fails
@@ -509,10 +566,12 @@
 	var/turf/T = get_turf(src)
 	hide_from(usr)
 	for(var/obj/item/I in contents)
-		remove_from_storage(I, T)
+		remove_from_storage_deferred(I, T, usr)

 		CHECK_TICK

+	post_remove_from_storage_deferred(loc, usr)
+
 // Override this to fill the storage object with stuff.
 /obj/item/weapon/storage/proc/fill()
 	return
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -287,7 +287,7 @@
 		if(!(S.status & ORGAN_ROBOT) || user.a_intent != I_HELP)
 			return ..()

-		if(M.isSynthetic() && M == user)
+		if(M.isSynthetic() && M == user && !(M.get_species() == "Hunter-Killer"))
 			user << "<span class='warning'>You can't repair damage to your own body - it's against OH&S.</span>"
 			return
 		if(S.brute_dam == 0)
--- a/code/game/objects/items/weapons/trays.dm
+++ b/code/game/objects/items/weapons/trays.dm
@@ -23,13 +23,15 @@

 	var/safedrop = 0//Used to tell when we should or shouldn't spill if the tray is dropped.
 	//Safedrop is set true when throwing, because it will spill on impact. And when placing on a table
-	var/list/valid = list( /obj/item/weapon/reagent_containers,
+	var/list/valid = list(
+		/obj/item/weapon/reagent_containers,
 		/obj/item/weapon/material/kitchen/utensil,
 		/obj/item/weapon/storage/fancy/cigarettes,
 		/obj/item/clothing/mask/smokable,
 		/obj/item/weapon/storage/box/matches,
 		/obj/item/weapon/flame/match,
-		/obj/item/weapon/material/ashtray)
+		/obj/item/weapon/material/ashtray
+	)

 /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob, var/target_zone)

@@ -38,7 +40,6 @@
 	// Drop all the things. All of them.
 	spill(user, M.loc)

-
 	//Note: Added a robot check to all stun/weaken procs, beccause weakening a robot causes its active modules to bug out
 	if((CLUMSY in user.mutations) && prob(50))              //What if he's a clown?
 		M << "<span class='warning'>You accidentally slam yourself with the [src]!</span>"
@@ -236,10 +237,12 @@

 /obj/item/weapon/tray/proc/load_item(var/obj/item/I, var/mob/user)
 	user.remove_from_mob(I)
-	I.loc = src
+	I.forceMove(src)
 	current_weight += I.w_class
 	carrying += I
-	add_overlay(image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer, "pixel_x" = I.pixel_x, "pixel_y" = I.pixel_y))
+	var/mutable_appearance/MA = new(I)
+	MA.layer = FLOAT_LAYER
+	add_overlay(MA)
 	//rand(0, (max_offset_y*2)-3)-(max_offset_y)-3

 /obj/item/weapon/tray/verb/unload()
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -7,6 +7,7 @@
 	w_class = 5
 	var/icon_closed = "closed"
 	var/icon_opened = "open"
+	var/welded_overlay_state = "welded"
 	var/opened = 0
 	var/welded = 0
 	var/wall_mounted = 0 //never solid (You can always pass over it)
@@ -355,7 +356,7 @@
 	if(!opened)
 		icon_state = icon_closed
 		if(welded)
-			add_overlay("welded")
+			add_overlay(welded_overlay_state)
 	else
 		icon_state = icon_opened

--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -185,6 +185,7 @@
 	icon_state = "hydrant"
 	icon_closed = "hydrant"
 	icon_opened = "hydrant_open"
+	welded_overlay_state = "welded_wallcloset"
 	anchored = 1
 	density = 0
 	wall_mounted = 1
@@ -209,6 +210,7 @@
 	icon_state = "medical_wall"
 	icon_closed = "medical_wall"
 	icon_opened = "medical_wall_open"
+	welded_overlay_state = "welded_wallcloset"
 	anchored = 1
 	density = 0
 	wall_mounted = 1
--- a/code/modules/client/preference_setup/antagonism/01_candidacy.dm
+++ b/code/modules/client/preference_setup/antagonism/01_candidacy.dm
@@ -37,22 +37,24 @@
 			pref.be_special_role -= role

 /datum/category_item/player_setup_item/antagonism/candidacy/content(var/mob/user)
-	. += "<b>Special Role Availability:</b><br>"
-	. += "<table>"
+	var/list/dat = list(
+		"<b>Special Role Availability:</b><br>",
+		"<table>"
+	)
 	var/is_global_banned = jobban_isbanned(preference_mob(), "Antagonist")
 	for(var/antag_type in all_antag_types)
 		var/datum/antagonist/antag = all_antag_types[antag_type]
-		. += "<tr><td>[antag.role_text]: </td><td>"
+		dat += "<tr><td>[antag.role_text]: </td><td>"
 		var/ban_reason = jobban_isbanned(preference_mob(), antag.bantype)
 		if(ban_reason == "AGE WHITELISTED")
-			. += "<span class='danger'>\[IN [player_old_enough_for_role(preference_mob(), antag.bantype)] DAYS\]</span><br>"
+			dat += "<span class='danger'>\[IN [player_old_enough_for_role(preference_mob(), antag.bantype)] DAYS\]</span><br>"
 		else if(is_global_banned || ban_reason)
-			. += "<span class='danger'>\[<a href='?src=\ref[user.client];view_jobban=[is_global_banned ? "Antagonist" : "[antag.bantype]"];'>BANNED</a>\]</span><br>"
+			dat += "<span class='danger'>\[<a href='?src=\ref[user.client];view_jobban=[is_global_banned ? "Antagonist" : "[antag.bantype]"];'>BANNED</a>\]</span><br>"
 		else if(antag.role_type in pref.be_special_role)
-			. += "<b>Yes</b> / <a href='?src=\ref[src];del_special=[antag.role_type]'>No</a></br>"
+			dat += "<b>Yes</b> / <a href='?src=\ref[src];del_special=[antag.role_type]'>No</a></br>"
 		else
-			. += "<a href='?src=\ref[src];add_special=[antag.role_type]'>Yes</a> / <b>No</b></br>"
-		. += "</td></tr>"
+			dat += "<a href='?src=\ref[src];add_special=[antag.role_type]'>Yes</a> / <b>No</b></br>"
+		dat += "</td></tr>"

 	var/list/ghost_traps = get_ghost_traps()
 	for(var/ghost_trap_key in ghost_traps)
@@ -60,7 +62,7 @@
 		if(!ghost_trap.list_as_special_role)
 			continue

-		. += "<tr><td>[(ghost_trap.ghost_trap_role)]: </td><td>"
+		dat += "<tr><td>[(ghost_trap.ghost_trap_role)]: </td><td>"
 		var/ban_state = banned_from_ghost_role(preference_mob(), ghost_trap)
 		if(ban_state == AGEBAN)
 			var/age_to_beat = 0
@@ -68,15 +70,17 @@
 				age_to_beat = player_old_enough_for_role(preference_mob(), A)
 				if (age_to_beat)
 					break
-			. += "<span class='danger'>\[IN [age_to_beat] DAYS\]</span><br>"
+			dat += "<span class='danger'>\[IN [age_to_beat] DAYS\]</span><br>"
 		else if (ban_state == RANBAN)
-			. += "<span class='danger'>\[<a href='?src=\ref[user.client];view_jobban=[ghost_trap];'>BANNED</a>\]</span><br>"
+			dat += "<span class='danger'>\[<a href='?src=\ref[user.client];view_jobban=[ghost_trap];'>BANNED</a>\]</span><br>"
 		else if(ghost_trap.pref_check in pref.be_special_role)
-			. += "<b>Yes</b> / <a href='?src=\ref[src];del_special=[ghost_trap.pref_check]'>No</a></br>"
+			dat += "<b>Yes</b> / <a href='?src=\ref[src];del_special=[ghost_trap.pref_check]'>No</a></br>"
 		else
-			. += "<a href='?src=\ref[src];add_special=[ghost_trap.pref_check]'>Yes</a> / <b>No</b></br>"
-		. += "</td></tr>"
-	. += "</table>"
+			dat += "<a href='?src=\ref[src];add_special=[ghost_trap.pref_check]'>Yes</a> / <b>No</b></br>"
+		dat += "</td></tr>"
+	dat += "</table>"
+
+	. = dat.Join()

 /datum/category_item/player_setup_item/proc/banned_from_ghost_role(var/mob, var/datum/ghosttrap/ghost_trap)
 	for(var/ban_type in ghost_trap.ban_checks)
--- a/code/modules/client/preference_setup/antagonism/02_setup.dm
+++ b/code/modules/client/preference_setup/antagonism/02_setup.dm
@@ -13,15 +13,39 @@ var/global/list/uplink_locations = list("PDA", "Headset", "None")
 	S["exploit_record"] << pref.exploit_record

 /datum/category_item/player_setup_item/antagonism/basic/gather_load_query()
-	return list("ss13_characters_flavour" = list("vars" = list("records_exploit" = "exploit_record"), "args" = list("char_id")),
-				"ss13_characters" = list("vars" = list("uplink_location" = "uplinklocation"), "args" = list("id")))
+	return list(
+		"ss13_characters_flavour" = list(
+			"vars" = list(
+				"records_exploit" = "exploit_record"
+			), 
+			"args" = list("char_id")
+		),
+		"ss13_characters" = list(
+			"vars" = list(
+				"uplink_location" = "uplinklocation"
+			), 
+			"args" = list("id")
+		)
+	)

 /datum/category_item/player_setup_item/antagonism/basic/gather_load_parameters()
-	return list("char_id" = pref.current_character, "id" = pref.current_character)
+	return list(
+		"char_id" = pref.current_character,
+		"id" = pref.current_character
+	)

 /datum/category_item/player_setup_item/antagonism/basic/gather_save_query()
-	return list("ss13_characters_flavour" = list("records_exploit", "char_id" = 1),
-				"ss13_characters" = list("uplink_location", "id" = 1, "ckey" = 1))
+	return list(
+		"ss13_characters_flavour" = list(
+			"records_exploit", 
+			"char_id" = 1
+		),
+		"ss13_characters" = list(
+			"uplink_location",
+			"id" = 1,
+			"ckey" = 1
+		)
+	)

 /datum/category_item/player_setup_item/antagonism/basic/gather_save_parameters()
 	return list("records_exploit" = pref.exploit_record, "char_id" = pref.current_character, "uplink_location" = pref.uplinklocation, "id" = pref.current_character, "ckey" = pref.client.ckey)
@@ -30,13 +54,17 @@ var/global/list/uplink_locations = list("PDA", "Headset", "None")
 	pref.uplinklocation	= sanitize_inlist(pref.uplinklocation, uplink_locations, initial(pref.uplinklocation))

 /datum/category_item/player_setup_item/antagonism/basic/content(var/mob/user)
-	. +="<b>Antag Setup:</b><br>"
-	. +="Uplink Type: <a href='?src=\ref[src];antagtask=1'>[pref.uplinklocation]</a><br>"
-	. +="Exploitable information:<br>"
+	var/list/dat = list(
+		"<b>Antag Setup:</b><br>",
+		"Uplink Type: <a href='?src=\ref[src];antagtask=1'>[pref.uplinklocation]</a><br>",
+		"Exploitable information:<br>"
+	)
 	if(jobban_isbanned(user, "Records"))
-		. += "<b>You are banned from using character records.</b><br>"
+		dat += "<b>You are banned from using character records.</b><br>"
 	else
-		. +="<a href='?src=\ref[src];exploitable_record=1'>[TextPreview(pref.exploit_record,40)]</a><br>"
+		dat +="<a href='?src=\ref[src];exploitable_record=1'>[TextPreview(pref.exploit_record,40)]</a><br>"
+
+	. = dat.Join()

 /datum/category_item/player_setup_item/antagonism/basic/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if (href_list["antagtask"])
--- a/code/modules/client/preference_setup/general/01_basic.dm
+++ b/code/modules/client/preference_setup/general/01_basic.dm
@@ -20,36 +20,48 @@
 	S["OOC_Notes"]  << pref.metadata

 /datum/category_item/player_setup_item/general/basic/gather_load_query()
-	return list("ss13_characters" = list("vars" = list("name" = "real_name",
+	return list(
+		"ss13_characters" = list(
+			"vars" = list(
+				"name" = "real_name",
 				"gender",
 				"age",
 				"metadata",
 				"spawnpoint",
-													"species"),
-										"args" = list("id")))
+				"species"
+			),
+			"args" = list("id")
+		)
+	)

 /datum/category_item/player_setup_item/general/basic/gather_load_parameters()
 	return list("id" = pref.current_character)

 /datum/category_item/player_setup_item/general/basic/gather_save_query()
-	return list("ss13_characters" = list("name",
+	return list(
+		"ss13_characters" = list(
+			"name",
 			"gender",
 			"age",
 			"metadata",
 			"spawnpoint",
 			"species",
 			"id" = 1,
-										 "ckey" = 1))
+			"ckey" = 1
+		)
+	)

 /datum/category_item/player_setup_item/general/basic/gather_save_parameters()
-	return list("name" = pref.real_name,
+	return list(
+		"name" = pref.real_name,
 		"gender" = pref.gender,
 		"age" = pref.age,
 		"metadata" = pref.metadata,
 		"spawnpoint" = pref.spawnpoint,
 		"species" = pref.species,
 		"id" = pref.current_character,
-				"ckey" = pref.client.ckey)
+		"ckey" = pref.client.ckey
+	)

 /datum/category_item/player_setup_item/general/basic/load_special()
 	pref.can_edit_name = 1
@@ -82,19 +94,21 @@
 	pref.spawnpoint    = sanitize_inlist(pref.spawnpoint, spawntypes, initial(pref.spawnpoint))

 /datum/category_item/player_setup_item/general/basic/content()
-	. = "<b>Name:</b> "
+	var/list/dat = list("<b>Name:</b> ")
 	if (pref.can_edit_name)
-		. += "<a href='?src=\ref[src];rename=1'><b>[pref.real_name]</b></a><br>"
+		dat += "<a href='?src=\ref[src];rename=1'><b>[pref.real_name]</b></a><br>"
 	else
-		. += "<b>[pref.real_name]</b><br> (<a href='?src=\ref[src];namehelp=1'>?</a>)"
+		dat += "<b>[pref.real_name]</b><br> (<a href='?src=\ref[src];namehelp=1'>?</a>)"
 	if (pref.can_edit_name)
-		. += "(<a href='?src=\ref[src];random_name=1'>Random Name</A>)"
-	. += "<br>"
-	. += "<b>Gender:</b> <a href='?src=\ref[src];gender=1'><b>[capitalize(lowertext(pref.gender))]</b></a><br>"
-	. += "<b>Age:</b> <a href='?src=\ref[src];age=1'>[pref.age]</a><br>"
-	. += "<b>Spawn Point</b>: <a href='?src=\ref[src];spawnpoint=1'>[pref.spawnpoint]</a><br>"
+		dat += "(<a href='?src=\ref[src];random_name=1'>Random Name</A>)"
+	dat += "<br>"
+	dat += "<b>Gender:</b> <a href='?src=\ref[src];gender=1'><b>[capitalize(lowertext(pref.gender))]</b></a><br>"
+	dat += "<b>Age:</b> <a href='?src=\ref[src];age=1'>[pref.age]</a><br>"
+	dat += "<b>Spawn Point</b>: <a href='?src=\ref[src];spawnpoint=1'>[pref.spawnpoint]</a><br>"
 	if(config.allow_Metadata)
-		. += "<b>OOC Notes:</b> <a href='?src=\ref[src];metadata=1'> Edit </a><br>"
+		dat += "<b>OOC Notes:</b> <a href='?src=\ref[src];metadata=1'> Edit </a><br>"
+
+	. = dat.Join()

 /datum/category_item/player_setup_item/general/basic/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["rename"])
--- a/code/modules/client/preference_setup/general/02_language.dm
+++ b/code/modules/client/preference_setup/general/02_language.dm
@@ -9,20 +9,33 @@
 	S["language"] << pref.alternate_languages

 /datum/category_item/player_setup_item/general/language/gather_load_query()
-	return list("ss13_characters" = list("vars" = list("language" = "alternate_languages"), "args" = list("id")))
+	return list(
+		"ss13_characters" = list(
+			"vars" = list(
+				"language" = "alternate_languages"
+			), 
+			"args" = list("id")
+		)
+	)

 /datum/category_item/player_setup_item/general/language/gather_load_parameters()
 	return list("id" = pref.current_character)

 /datum/category_item/player_setup_item/general/language/gather_save_query()
-	return list("ss13_characters" = list("id" = 1,
+	return list(
+		"ss13_characters" = list(
+			"id" = 1,
 			"ckey" = 1,
-										 "language"))
+			"language"
+		)
+	)

 /datum/category_item/player_setup_item/general/language/gather_save_parameters()
-	return list("language" = list2params(pref.alternate_languages),
+	return list(
+		"language" = list2params(pref.alternate_languages),
 		"id" = pref.current_character,
-				"ckey" = pref.client.ckey)
+		"ckey" = pref.client.ckey
+	)

 /datum/category_item/player_setup_item/general/language/sanitize_character(var/sql_load = 0)
 	if (sql_load)
@@ -58,22 +71,24 @@
 		cat.modified = TRUE

 /datum/category_item/player_setup_item/general/language/content()
-	. += "<b>Languages</b><br>"
+	var/list/dat = list("<b>Languages</b><br>")
 	var/datum/species/S = all_species[pref.species]
 	if(S.language)
-		. += "- [S.language]<br>"
+		dat += "- [S.language]<br>"
 	if(S.default_language && S.default_language != S.language)
-		. += "- [S.default_language]<br>"
+		dat += "- [S.default_language]<br>"
 	if(S.num_alternate_languages)
 		if(pref.alternate_languages.len)
 			for(var/i = 1 to pref.alternate_languages.len)
 				var/lang = pref.alternate_languages[i]
-				. += "- [lang] - <a href='?src=\ref[src];remove_language=[i]'>remove</a><br>"
+				dat += "- [lang] - <a href='?src=\ref[src];remove_language=[i]'>remove</a><br>"

 		if(pref.alternate_languages.len < S.num_alternate_languages)
-			. += "- <a href='?src=\ref[src];add_language=1'>add</a> ([S.num_alternate_languages - pref.alternate_languages.len] remaining)<br>"
+			dat += "- <a href='?src=\ref[src];add_language=1'>add</a> ([S.num_alternate_languages - pref.alternate_languages.len] remaining)<br>"
 	else
-		. += "- [pref.species] cannot choose secondary languages.<br>"
+		dat += "- [pref.species] cannot choose secondary languages.<br>"
+
+	. = dat.Join()

 /datum/category_item/player_setup_item/general/language/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["remove_language"])
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -50,7 +50,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	S["body_markings"]     << pref.body_markings

 /datum/category_item/player_setup_item/general/body/gather_load_query()
-	return list("ss13_characters" = list("vars" = list("hair_colour",
+	return list(
+		"ss13_characters" = list(
+			"vars" = list(
+				"hair_colour",
 				"facial_colour",
 				"skin_tone" = "s_tone",
 				"skin_colour",
@@ -61,14 +64,19 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 				"disabilities",
 				"organs_data" = "organ_data",
 				"organs_robotic" = "rlimb_data",
-													   "body_markings"),
-										"args" = list("id")))
+				"body_markings"
+			),
+			"args" = list("id")
+		)
+	)

 /datum/category_item/player_setup_item/general/body/gather_load_parameters()
 	return list("id" = pref.current_character)

 /datum/category_item/player_setup_item/general/body/gather_save_query()
-	return list("ss13_characters" = list("hair_colour",
+	return list(
+		"ss13_characters" = list(
+			"hair_colour",
 			"facial_colour",
 			"skin_tone",
 			"skin_colour",
@@ -81,23 +89,27 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 			"organs_robotic",
 			"body_markings",
 			"id" = 1,
-										 "ckey" = 1))
+			"ckey" = 1
+		)
+	)

 /datum/category_item/player_setup_item/general/body/gather_save_parameters()
-	return list("hair_colour" = "#" + num2hex(pref.r_hair, 2) + num2hex(pref.g_hair, 2) + num2hex(pref.b_hair, 2),
-				"facial_colour" = "#" + num2hex(pref.r_facial, 2) + num2hex(pref.g_facial, 2) + num2hex(pref.b_facial, 2),
+	return list(
+		"hair_colour"   = rgb(pref.r_hair, pref.g_hair, pref.b_hair),
+		"facial_colour" = rgb(pref.r_facial, pref.g_facial, pref.b_facial),
 		"skin_tone"     = pref.s_tone,
-				"skin_colour" = "#" + num2hex(pref.r_skin, 2) + num2hex(pref.g_skin, 2) + num2hex(pref.b_skin, 2),
+		"skin_colour"   = rgb(pref.r_skin, pref.g_skin, pref.b_skin) ,
 		"hair_style"    = pref.h_style,
 		"facial_style"  = pref.f_style,
-				"eyes_colour" = "#" + num2hex(pref.r_eyes, 2) + num2hex(pref.g_eyes, 2) + num2hex(pref.b_eyes, 2),
+		"eyes_colour"   = rgb(pref.r_eyes, pref.g_eyes, pref.b_eyes),
 		"b_type"        = pref.b_type,
 		"disabilities"  = pref.disabilities,
 		"organs_data"   = list2params(pref.organ_data),
 		"organs_robotic"= list2params(pref.rlimb_data),
 		"body_markings" = json_encode(pref.body_markings),
 		"id"            = pref.current_character,
-				"ckey" = pref.client.ckey)
+		"ckey"          = pref.client.ckey
+	)

 /datum/category_item/player_setup_item/general/body/sanitize_character(var/sql_load = 0)
 	if (sql_load)
@@ -163,25 +175,25 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		pref.body_markings = list()

 /datum/category_item/player_setup_item/general/body/content(var/mob/user)
+	var/list/out = list()
 	pref.update_preview_icon()
 	if(!pref.preview_icon)
 		pref.update_preview_icon()
 	user << browse_rsc(pref.preview_icon, "previewicon.png")

 	var/datum/species/mob_species = all_species[pref.species]
-	. += "<table><tr style='vertical-align:top'><td><b>Body</b> "
-	. += "(<a href='?src=\ref[src];random=1'>&reg;</A>)"
-	. += "<br>"
-	. += "Species: <a href='?src=\ref[src];show_species=1'>[pref.species]</a><br>"
-	. += "Blood Type: <a href='?src=\ref[src];blood_type=1'>[pref.b_type]</a><br>"
+	out += "<table><tr style='vertical-align:top'><td><b>Body</b> "
+	out += "(<a href='?src=\ref[src];random=1'>&reg;</A>)"
+	out += "<br>"
+	out += "Species: <a href='?src=\ref[src];show_species=1'>[pref.species]</a><br>"
+	out += "Blood Type: <a href='?src=\ref[src];blood_type=1'>[pref.b_type]</a><br>"
 	if(has_flag(mob_species, HAS_SKIN_TONE))
-		. += "Skin Tone: <a href='?src=\ref[src];skin_tone=1'>[-pref.s_tone + 35]/220</a><br>"
-	. += "Needs Glasses: <a href='?src=\ref[src];disabilities=[NEARSIGHTED]'><b>[pref.disabilities & NEARSIGHTED ? "Yes" : "No"]</b></a><br>"
+		out += "Skin Tone: <a href='?src=\ref[src];skin_tone=1'>[-pref.s_tone + 35]/220</a><br>"
+	out += "Needs Glasses: <a href='?src=\ref[src];disabilities=[NEARSIGHTED]'><b>[pref.disabilities & NEARSIGHTED ? "Yes" : "No"]</b></a><br>"
 	if(!(has_flag(mob_species, HAS_FBP)))
-		. += "Limbs: <a href='?src=\ref[src];limbs=1'>Adjust</a><br>"
-		. += "Internal Organs: <a href='?src=\ref[src];organs=1'>Adjust</a><br>"
-		. += "Prosthesis/Amputations: <a href='?src=\ref[src];reset_organs=1'>Reset</a><br>"
-
+		out += "Limbs: <a href='?src=\ref[src];limbs=1'>Adjust</a><br>"
+		out += "Internal Organs: <a href='?src=\ref[src];organs=1'>Adjust</a><br>"
+		out += "Prosthesis/Amputations: <a href='?src=\ref[src];reset_organs=1'>Reset</a><br>"

 	//display limbs below
 	var/ind = 0
@@ -220,69 +232,71 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 			if(status == "cyborg")
 				++ind
 				if(ind > 1)
-					. += ", "
+					out += ", "
 				var/datum/robolimb/R
 				if(pref.rlimb_data[name] && all_robolimbs[pref.rlimb_data[name]])
 					R = all_robolimbs[pref.rlimb_data[name]]
 				else
 					R = basic_robolimb
-				. += "\t[R.company] [organ_name] prosthesis"
+				out += "\t[R.company] [organ_name] prosthesis"
 			else if(status == "amputated")
 				++ind
 				if(ind > 1)
-					. += ", "
-				. += "\tAmputated [organ_name]"
+					out += ", "
+				out += "\tAmputated [organ_name]"
 			else if(status == "mechanical")
 				++ind
 				if(ind > 1)
-					. += ", "
-				. += "\tMechanical [organ_name]"
+					out += ", "
+				out += "\tMechanical [organ_name]"
 			else if(status == "assisted")
 				++ind
 				if(ind > 1)
-					. += ", "
+					out += ", "
 				switch(organ_name)
 					if("heart")
-						. += "\tPacemaker-assisted [organ_name]"
+						out += "\tPacemaker-assisted [organ_name]"
 					if("voicebox") //on adding voiceboxes for speaking skrell/similar replacements
-						. += "\tSurgically altered [organ_name]"
+						out += "\tSurgically altered [organ_name]"
 					if("eyes")
-						. += "\tRetinal overlayed [organ_name]"
+						out += "\tRetinal overlayed [organ_name]"
 					else
-						. += "\tMechanically assisted [organ_name]"
+						out += "\tMechanically assisted [organ_name]"
 	if(!ind)
-		. += "\[...\]<br><br>"
+		out += "\[...\]<br><br>"
 	else
-		. += "<br><br>"
+		out += "<br><br>"

-	. += "</td><td><b>Preview</b><br>"
-	. += "<div class='statusDisplay'><center><img src=previewicon.png width=[pref.preview_icon.Width()] height=[pref.preview_icon.Height()]></center></div>"
-	. += "<br><a href='?src=\ref[src];toggle_clothing=1'>[pref.dress_mob ? "Hide equipment" : "Show equipment"]</a>"
-	. += "</td></tr></table>"
+	out += "</td><td><b>Preview</b><br>"
+	out += "<div class='statusDisplay'><center><img src=previewicon.png width=[pref.preview_icon.Width()] height=[pref.preview_icon.Height()]></center></div>"
+	out += "<br><a href='?src=\ref[src];toggle_clothing=1'>[pref.dress_mob ? "Hide equipment" : "Show equipment"]</a>"
+	out += "</td></tr></table>"

-	. += "<b>Hair</b><br>"
+	out += "<b>Hair</b><br>"
 	if(has_flag(mob_species, HAS_HAIR_COLOR))
-		. += "<a href='?src=\ref[src];hair_color=1'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(pref.r_hair, 2)][num2hex(pref.g_hair, 2)][num2hex(pref.b_hair, 2)]'><table style='display:inline;' bgcolor='#[num2hex(pref.r_hair, 2)][num2hex(pref.g_hair, 2)][num2hex(pref.b_hair, 2)]'><tr><td>__</td></tr></table></font> "
-	. += " Style: <a href='?src=\ref[src];hair_style=1'>[pref.h_style]</a><br>"
+		out += "<a href='?src=\ref[src];hair_color=1'>Change Color</a> [HTML_RECT(rgb(pref.r_hair, pref.g_hair, pref.b_hair))] "
+	out += " Style: <a href='?src=\ref[src];hair_style=1'>[pref.h_style]</a><br>"

-	. += "<br><b>Facial</b><br>"
+	out += "<br><b>Facial</b><br>"
 	if(has_flag(mob_species, HAS_HAIR_COLOR))
-		. += "<a href='?src=\ref[src];facial_color=1'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(pref.r_facial, 2)][num2hex(pref.g_facial, 2)][num2hex(pref.b_facial, 2)]'><table  style='display:inline;' bgcolor='#[num2hex(pref.r_facial, 2)][num2hex(pref.g_facial, 2)][num2hex(pref.b_facial, 2)]'><tr><td>__</td></tr></table></font> "
-	. += " Style: <a href='?src=\ref[src];facial_style=1'>[pref.f_style]</a><br>"
+		out += "<a href='?src=\ref[src];facial_color=1'>Change Color</a> [HTML_RECT(rgb(pref.r_facial, pref.g_facial, pref.b_facial))] "
+	out += " Style: <a href='?src=\ref[src];facial_style=1'>[pref.f_style]</a><br>"

 	if(has_flag(mob_species, HAS_EYE_COLOR))
-		. += "<br><b>Eyes</b><br>"
-		. += "<a href='?src=\ref[src];eye_color=1'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(pref.r_eyes, 2)][num2hex(pref.g_eyes, 2)][num2hex(pref.b_eyes, 2)]'><table  style='display:inline;' bgcolor='#[num2hex(pref.r_eyes, 2)][num2hex(pref.g_eyes, 2)][num2hex(pref.b_eyes, 2)]'><tr><td>__</td></tr></table></font><br>"
+		out += "<br><b>Eyes</b><br>"
+		out += "<a href='?src=\ref[src];eye_color=1'>Change Color</a> [HTML_RECT(rgb(pref.r_eyes, pref.g_eyes, pref.b_eyes))] <br>"

 	if(has_flag(mob_species, HAS_SKIN_COLOR))
-		. += "<br><b>Body Color</b><br>"
-		. += "<a href='?src=\ref[src];skin_color=1'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(pref.r_skin, 2)][num2hex(pref.g_skin, 2)][num2hex(pref.b_skin, 2)]'><table style='display:inline;' bgcolor='#[num2hex(pref.r_skin, 2)][num2hex(pref.g_skin, 2)][num2hex(pref.b_skin, 2)]'><tr><td>__</td></tr></table></font><br>"
+		out += "<br><b>Body Color</b><br>"
+		out += "<a href='?src=\ref[src];skin_color=1'>Change Color</a> [HTML_RECT(rgb(pref.r_skin, pref.g_skin, pref.b_skin))] <br>"

-	. += "<br><a href='?src=\ref[src];marking_style=1'>Body Markings +</a><br>"
+	out += "<br><a href='?src=\ref[src];marking_style=1'>Body Markings +</a><br>"
 	for(var/M in pref.body_markings)
-		. += "[M] <a href='?src=\ref[src];marking_remove=[M]'>-</a> <a href='?src=\ref[src];marking_color=[M]'>Color</a>"
-		. += "<font face='fixedsys' size='3' color='[pref.body_markings[M]]'><table style='display:inline;' bgcolor='[pref.body_markings[M]]'><tr><td>__</td></tr></table></font>"
-		. += "<br>"
+		out += "[M] <a href='?src=\ref[src];marking_remove=[M]'>-</a> <a href='?src=\ref[src];marking_color=[M]'>Color</a>"
+		out += HTML_RECT(pref.body_markings[M])
+		out += "<br>"
+
+	. = out.Join()

 /datum/category_item/player_setup_item/general/body/proc/has_flag(var/datum/species/mob_species, var/flag)
 	return mob_species && (mob_species.appearance_flags & flag)
@@ -320,22 +334,26 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		if(prev_species != pref.species)
 			mob_species = all_species[pref.species]

+			var/bodytype = mob_species.get_bodytype()
+
 			//grab one of the valid hair styles for the newly chosen species
 			var/list/valid_hairstyles = list()
+
+			// Snowflake check for industrials - they're an IPC bodytype but don't have IPC screens.
+			if (mob_species.name != "Industrial Frame")
 				for(var/hairstyle in hair_styles_list)
 					var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
 					if(pref.gender == MALE && S.gender == FEMALE)
 						continue
 					if(pref.gender == FEMALE && S.gender == MALE)
 						continue
-				if(!(mob_species.get_bodytype() in S.species_allowed) || mob_species.name == "Industrial Frame") //super snowflake check because Industrial Frames are IPC bodytypes, but don't have an IPC head.
+					if(!(bodytype in S.species_allowed))
 						continue
 					valid_hairstyles[hairstyle] = hair_styles_list[hairstyle]

 			if(valid_hairstyles.len)
 				pref.h_style = pick(valid_hairstyles)
-			else
-				//this shouldn't happen
+			else	// Species has no hair, or something fucked up.
 				pref.h_style = hair_styles_list["Bald"]

 			//grab one of the valid facial hair styles for the newly chosen species
@@ -346,7 +364,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 					continue
 				if(pref.gender == FEMALE && S.gender == MALE)
 					continue
-				if(!(mob_species.get_bodytype() in S.species_allowed))
+				if(!(bodytype in S.species_allowed))
 					continue

 				valid_facialhairstyles[facialhairstyle] = facial_hair_styles_list[facialhairstyle]
@@ -374,18 +392,19 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 			return TOPIC_NOACTION
 		var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference", rgb(pref.r_hair, pref.g_hair, pref.b_hair)) as color|null
 		if(new_hair && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user))
-			pref.r_hair = hex2num(copytext(new_hair, 2, 4))
-			pref.g_hair = hex2num(copytext(new_hair, 4, 6))
-			pref.b_hair = hex2num(copytext(new_hair, 6, 8))
+			pref.r_hair = GetRedPart(new_hair)
+			pref.g_hair = GetGreenPart(new_hair)
+			pref.b_hair = GetBluePart(new_hair)
 			return TOPIC_REFRESH

 	else if(href_list["hair_style"])
 		if(mob_species.bald)
 			return
+		var/bodytype = mob_species.get_bodytype()
 		var/list/valid_hairstyles = list()
 		for(var/hairstyle in hair_styles_list)
 			var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
-			if(!(mob_species.get_bodytype() in S.species_allowed))
+			if(!(bodytype in S.species_allowed))
 				continue

 			valid_hairstyles[hairstyle] = hair_styles_list[hairstyle]
@@ -400,9 +419,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 			return TOPIC_NOACTION
 		var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference", rgb(pref.r_facial, pref.g_facial, pref.b_facial)) as color|null
 		if(new_facial && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user))
-			pref.r_facial = hex2num(copytext(new_facial, 2, 4))
-			pref.g_facial = hex2num(copytext(new_facial, 4, 6))
-			pref.b_facial = hex2num(copytext(new_facial, 6, 8))
+			pref.r_facial = GetRedPart(new_facial)
+			pref.g_facial = GetGreenPart(new_facial)
+			pref.b_facial = GetBluePart(new_facial)
 			return TOPIC_REFRESH

 	else if(href_list["eye_color"])
@@ -410,9 +429,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 			return TOPIC_NOACTION
 		var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference", rgb(pref.r_eyes, pref.g_eyes, pref.b_eyes)) as color|null
 		if(new_eyes && has_flag(mob_species, HAS_EYE_COLOR) && CanUseTopic(user))
-			pref.r_eyes = hex2num(copytext(new_eyes, 2, 4))
-			pref.g_eyes = hex2num(copytext(new_eyes, 4, 6))
-			pref.b_eyes = hex2num(copytext(new_eyes, 6, 8))
+			pref.r_eyes = GetRedPart(new_eyes)
+			pref.g_eyes = GetGreenPart(new_eyes)
+			pref.b_eyes = GetRedPart(new_eyes)
 			return TOPIC_REFRESH

 	else if(href_list["skin_tone"])
@@ -428,22 +447,23 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 			return TOPIC_NOACTION
 		var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference", rgb(pref.r_skin, pref.g_skin, pref.b_skin)) as color|null
 		if(new_skin && has_flag(mob_species, HAS_SKIN_COLOR) && CanUseTopic(user))
-			pref.r_skin = hex2num(copytext(new_skin, 2, 4))
-			pref.g_skin = hex2num(copytext(new_skin, 4, 6))
-			pref.b_skin = hex2num(copytext(new_skin, 6, 8))
+			pref.r_skin = GetRedPart(new_skin)
+			pref.g_skin = GetGreenPart(new_skin)
+			pref.b_skin = GetBluePart(new_skin)
 			return TOPIC_REFRESH

 	else if(href_list["facial_style"])
 		if(mob_species.bald)
 			return
 		var/list/valid_facialhairstyles = list()
+		var/bodytype = mob_species.get_bodytype()
 		for(var/facialhairstyle in facial_hair_styles_list)
 			var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
 			if(pref.gender == MALE && S.gender == FEMALE)
 				continue
 			if(pref.gender == FEMALE && S.gender == MALE)
 				continue
-			if(!(mob_species.get_bodytype() in S.species_allowed))
+			if(!(bodytype in S.species_allowed))
 				continue

 			valid_facialhairstyles[facialhairstyle] = facial_hair_styles_list[facialhairstyle]
@@ -454,7 +474,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 			return TOPIC_REFRESH

 	else if(href_list["marking_style"])
-		var/list/usable_markings = pref.body_markings.Copy() ^ body_marking_styles_list.Copy()
+		var/list/usable_markings = pref.body_markings ^ body_marking_styles_list
 		for(var/M in usable_markings)
 			var/datum/sprite_accessory/S = usable_markings[M]
 			if(!S.species_allowed.len)
@@ -616,15 +636,19 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	if(!pref.species_preview || !(pref.species_preview in all_species))
 		pref.species_preview = "Human"
 	var/datum/species/current_species = all_species[pref.species_preview]
-	var/dat = "<body>"
-	dat += "<center><h2>[current_species.name] \[<a href='?src=\ref[src];show_species=1'>change</a>\]</h2></center><hr/>"
-	dat += "<table padding='8px'>"
-	dat += "<tr>"
-	dat += "<td width = 400>[current_species.blurb]</td>"
-	dat += "<td width = 200 align='center'>"
+	var/list/dat = list(
+		"<body>",
+		"<center><h2>[current_species.name] \[<a href='?src=\ref[src];show_species=1'>change</a>\]</h2></center><hr/>",
+		"<table padding='8px'>",
+		"<tr>",
+		"<td width = 400>[current_species.blurb]</td>",
+		"<td width = 200 align='center'>"
+	)
 	if("preview" in icon_states(current_species.icobase))
 		var/curr_name = html_encode(current_species.name)
-		usr << browse_rsc(icon(current_species.icobase,"preview"), "species_preview_[curr_name].png")
+		var/icon/preview = icon(current_species.icobase, "preview")
+		preview.Scale(64, 64)	// Scale it here to stop it blurring.
+		usr << browse_rsc(preview, "species_preview_[curr_name].png")
 		dat += "<img src='species_preview_[curr_name].png' width='64px' height='64px'><br/><br/>"
 	dat += "<b>Language:</b> [current_species.language]<br/>"
 	dat += "<small>"
@@ -667,12 +691,12 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		if(restricted == 1)
 			dat += "<font color='red'><b>You cannot play as this species.</br><small>If you wish to be whitelisted, you can make an application post on <a href='?src=\ref[user];preference=open_whitelist_forum'>the forums</a>.</small></b></font></br>"
 		else if(restricted == 2)
-			dat += "<font color='red'><b>You cannot play as this species.</br><small>This species is not available for play as a station race..</small></b></font></br>"
+			dat += "<font color='red'><b>You cannot play as this species.</br><small>This species is not available for play as a station race.</small></b></font></br>"
 	if(!restricted || check_rights(R_ADMIN, 0))
 		dat += "\[<a href='?src=\ref[src];set_species=[html_encode(pref.species_preview)]'>select</a>\]"
 	dat += "</center></body>"

-	user << browse(dat, "window=species;size=700x400")
+	user << browse(dat.Join(), "window=species;size=700x400")

 /*/datum/category_item/player_setup_item/general/body/proc/reset_limbs()

--- a/code/modules/client/preference_setup/general/04_equipment.dm
+++ b/code/modules/client/preference_setup/general/04_equipment.dm
@@ -15,16 +15,42 @@
 	S["backbag"]    << pref.backbag

 /datum/category_item/player_setup_item/general/equipment/gather_load_query()
-	return list("ss13_characters" = list("vars" = list("underwear", "undershirt", "socks", "backbag"), "args" = list("id")))
+	return list(
+		"ss13_characters" = list(
+			"vars" = list(
+				"underwear",
+				"undershirt",
+				"socks",
+				"backbag"
+			), 
+			"args" = list("id")
+		)
+	)

 /datum/category_item/player_setup_item/general/equipment/gather_load_parameters()
 	return list("id" = pref.current_character)

 /datum/category_item/player_setup_item/general/equipment/gather_save_query()
-	return list("ss13_characters" = list("underwear", "undershirt", "socks", "backbag", "id" = 1, "ckey" = 1))
+	return list(
+		"ss13_characters" = list(
+			"underwear",
+			"undershirt",
+			"socks",
+			"backbag",
+			"id" = 1,
+			"ckey" = 1
+		)
+	)

 /datum/category_item/player_setup_item/general/equipment/gather_save_parameters()
-	return list("underwear" = pref.underwear, "undershirt" = pref.undershirt, "socks" = pref.socks, "backbag" = pref.backbag, "id" = pref.current_character, "ckey" = pref.client.ckey)
+	return list(
+		"underwear" = pref.underwear,
+		"undershirt" = pref.undershirt,
+		"socks" = pref.socks,
+		"backbag" = pref.backbag,
+		"id" = pref.current_character,
+		"ckey" = pref.client.ckey
+	)

 /datum/category_item/player_setup_item/general/equipment/sanitize_character(var/sql_load = 0)
 	if (sql_load)
@@ -42,11 +68,14 @@
 		pref.socks = null

 /datum/category_item/player_setup_item/general/equipment/content()
-	. += "<b>Equipment:</b><br>"
-	. += "Underwear: <a href='?src=\ref[src];change_underwear=1'><b>[get_key_by_value(get_undies(),pref.underwear)]</b></a><br>"
-	. += "Undershirt: <a href='?src=\ref[src];change_undershirt=1'><b>[get_key_by_value(undershirt_t,pref.undershirt)]</b></a><br>"
-	. += "Socks: <a href='?src=\ref[src];change_socks=1'><b>[get_key_by_value(get_gender_socks(),pref.socks)]</b></a><br>"
-	. += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
+	var/list/dat = list()
+	dat += "<b>Equipment:</b><br>"
+	dat += "Underwear: <a href='?src=\ref[src];change_underwear=1'><b>[get_key_by_value(get_undies(),pref.underwear)]</b></a><br>"
+	dat += "Undershirt: <a href='?src=\ref[src];change_undershirt=1'><b>[get_key_by_value(undershirt_t,pref.undershirt)]</b></a><br>"
+	dat += "Socks: <a href='?src=\ref[src];change_socks=1'><b>[get_key_by_value(get_gender_socks(),pref.socks)]</b></a><br>"
+	dat += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
+
+	. = dat.Join()

 /datum/category_item/player_setup_item/general/equipment/proc/get_undies()
 	return pref.gender == MALE ? underwear_m : underwear_f
--- a/code/modules/client/preference_setup/general/05_background.dm
+++ b/code/modules/client/preference_setup/general/05_background.dm
@@ -23,25 +23,55 @@
 	S["nanotrasen_relation"] << pref.nanotrasen_relation

 /datum/category_item/player_setup_item/general/background/gather_load_query()
-	return list("ss13_characters_flavour" = list("vars" = list("records_employment" = "gen_record",
+	return list(
+		"ss13_characters_flavour" = list(
+			"vars" = list(
+				"records_employment" = "gen_record",
 				"records_medical" = "med_record",
 				"records_security" = "sec_record",
-																"records_ccia" = "ccia_record"),
-												"args" = list("char_id")),
-				"ss13_characters" = list("vars" = list("nt_relation" = "nanotrasen_relation" ,"home_system", "citizenship", "faction", "religion"), "args" = list("id")))
+				"records_ccia" = "ccia_record"
+			),
+			"args" = list("char_id")
+		),
+		"ss13_characters" = list(
+			"vars" = list(
+				"nt_relation" = "nanotrasen_relation",
+				"home_system", 
+				"citizenship", 
+				"faction", 
+				"religion"
+			),
+			"args" = list("id")
+		)
+	)

 /datum/category_item/player_setup_item/general/background/gather_load_parameters()
-	return list("id" = pref.current_character, "char_id" = pref.current_character)
+	return list(
+		"id" = pref.current_character,
+		"char_id" = pref.current_character
+	)

 /datum/category_item/player_setup_item/general/background/gather_save_query()
-	return list("ss13_characters_flavour" = list("records_employment",
+	return list(
+		"ss13_characters_flavour" = list(
+			"records_employment",
 			"records_medical",
 			"records_security",
-												 "char_id" = 1),
-				"ss13_characters" = list("nt_relation", "home_system", "citizenship", "faction", "religion", "id" = 1, "ckey" = 1))
+			"char_id" = 1
+		),
+		"ss13_characters" = list(
+			"nt_relation", 
+			"home_system", 
+			"citizenship",
+			"faction",
+			"religion","id" = 1,
+			"ckey" = 1
+		)
+	)

 /datum/category_item/player_setup_item/general/background/gather_save_parameters()
-	return list("records_employment" = pref.gen_record,
+	return list(
+		"records_employment" = pref.gen_record,
 		"records_medical" = pref.med_record,
 		"records_security" = pref.sec_record,
 		"char_id" = pref.current_character,
@@ -51,7 +81,8 @@
 		"faction" = pref.faction,
 		"religion" = pref.religion,
 		"id" = pref.current_character,
-				"ckey" = pref.client.ckey)
+		"ckey" = pref.client.ckey
+	)

 /datum/category_item/player_setup_item/general/background/sanitize_character()
 	if(!pref.home_system)
@@ -66,23 +97,27 @@
 	pref.nanotrasen_relation = sanitize_inlist(pref.nanotrasen_relation, COMPANY_ALIGNMENTS, initial(pref.nanotrasen_relation))

 /datum/category_item/player_setup_item/general/background/content(var/mob/user)
-	. += "<b>Background Information</b><br>"
-	. += "[company_name] Relation: <a href='?src=\ref[src];nt_relation=1'>[pref.nanotrasen_relation]</a><br/>"
-	. += "Home System: <a href='?src=\ref[src];home_system=1'>[pref.home_system]</a><br/>"
-	. += "Citizenship: <a href='?src=\ref[src];citizenship=1'>[pref.citizenship]</a><br/>"
-	. += "Faction: <a href='?src=\ref[src];faction=1'>[pref.faction]</a><br/>"
-	. += "Religion: <a href='?src=\ref[src];religion=1'>[pref.religion]</a><br/>"
+	var/list/dat = list(
+		"<b>Background Information</b><br>",
+		"[company_name] Relation: <a href='?src=\ref[src];nt_relation=1'>[pref.nanotrasen_relation]</a><br/>",
+		"Home System: <a href='?src=\ref[src];home_system=1'>[pref.home_system]</a><br/>",
+		"Citizenship: <a href='?src=\ref[src];citizenship=1'>[pref.citizenship]</a><br/>",
+		"Faction: <a href='?src=\ref[src];faction=1'>[pref.faction]</a><br/>",
+		"Religion: <a href='?src=\ref[src];religion=1'>[pref.religion]</a><br/>",
+		"<br/><b>Records</b>:<br/>"
+	)

-	. += "<br/><b>Records</b>:<br/>"
 	if(jobban_isbanned(user, "Records"))
-		. += "<span class='danger'>You are banned from using character records.</span><br>"
+		dat += "<span class='danger'>You are banned from using character records.</span><br>"
 	else
-		. += "Medical Records:<br>"
-		. += "<a href='?src=\ref[src];set_medical_records=1'>[TextPreview(pref.med_record,40)]</a><br><br>"
-		. += "Employment Records:<br>"
-		. += "<a href='?src=\ref[src];set_general_records=1'>[TextPreview(pref.gen_record,40)]</a><br><br>"
-		. += "Security Records:<br>"
-		. += "<a href='?src=\ref[src];set_security_records=1'>[TextPreview(pref.sec_record,40)]</a><br>"
+		dat += "Medical Records:<br>"
+		dat += "<a href='?src=\ref[src];set_medical_records=1'>[TextPreview(pref.med_record,40)]</a><br><br>"
+		dat += "Employment Records:<br>"
+		dat += "<a href='?src=\ref[src];set_general_records=1'>[TextPreview(pref.gen_record,40)]</a><br><br>"
+		dat += "Security Records:<br>"
+		dat += "<a href='?src=\ref[src];set_security_records=1'>[TextPreview(pref.sec_record,40)]</a><br>"
+
+	. = dat.Join()

 /datum/category_item/player_setup_item/general/background/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["nt_relation"])
--- a/code/modules/client/preference_setup/general/06_flavor.dm
+++ b/code/modules/client/preference_setup/general/06_flavor.dm
@@ -40,7 +40,8 @@
 	S["signfont"]  << pref.signfont

 /datum/category_item/player_setup_item/general/flavor/gather_load_query()
-	var/list/var_list = list("flavour_general" = "flavor_texts/general",
+	var/list/var_list = list(
+		"flavour_general" = "flavor_texts/general",
 		"flavour_head" = "flavor_texts/head",
 		"flavour_face" = "flavor_texts/face",
 		"flavour_eyes" = "flavor_texts/eyes",
@@ -51,18 +52,25 @@
 		"flavour_feet" = "flavor_texts/feet",
 		"robot_default" = "flavour_texts_robot/Default",
 		"signature" = "signature",
-												"signature_font" = "signfont")
+		"signature_font" = "signfont"
+	)

 	for (var/module in robot_module_types)
 		var_list["robot_[module]"] = "flavour_texts_robot/[module]"

-	return list("ss13_characters_flavour" = list("vars" = var_list, "args" = list("char_id")))
+	return list(
+		"ss13_characters_flavour" = list(
+			"vars" = var_list, 
+			"args" = list("char_id")
+		)
+	)

 /datum/category_item/player_setup_item/general/flavor/gather_load_parameters()
 	return list("char_id" = pref.current_character)

 /datum/category_item/player_setup_item/general/flavor/gather_save_query()
-	var/list/var_list = list("flavour_general",
+	var/list/var_list = list(
+		"flavour_general",
 		"flavour_head",
 		"flavour_face",
 		"flavour_eyes",
@@ -74,7 +82,8 @@
 		"robot_default",
 		"signature",
 		"signature_font",
-							 "char_id" = 1)
+		"char_id" = 1
+	)

 	for (var/module in robot_module_types)
 		var_list += "robot_[module]"
@@ -82,7 +91,8 @@
 	return list("ss13_characters_flavour" = var_list)

 /datum/category_item/player_setup_item/general/flavor/gather_save_parameters()
-	var/list/var_list = list("char_id" = pref.current_character,
+	var/list/var_list = list(
+		"char_id" = pref.current_character,
 		"flavour_general" = pref.flavor_texts["general"],
 		"flavour_head" = pref.flavor_texts["head"],
 		"flavour_face" = pref.flavor_texts["face"],
@@ -94,7 +104,8 @@
 		"flavour_feet" = pref.flavor_texts["feet"],
 		"robot_default" = pref.flavour_texts_robot["Default"],
 		"signature" = pref.signature,
-							"signature_font" = pref.signfont)
+		"signature_font" = pref.signfont
+	)

 	for (var/module in robot_module_types)
 		var_list["robot_[module]"] += pref.flavour_texts_robot[module]
@@ -108,15 +119,18 @@
 		pref.signfont = "Verdana"

 /datum/category_item/player_setup_item/general/flavor/content(var/mob/user)
-	. += "<b>Flavor:</b><br>"
-	. += "<a href='?src=\ref[src];flavor_text=open'>Set Flavor Text</a><br/>"
-	. += "<a href='?src=\ref[src];flavour_text_robot=open'>Set Robot Flavor Text</a><br/>"
-	. += "<br>"
-	. += "Signature: <font face='[pref.signfont ? pref.signfont : "Verdana"]'>[pref.signature]</font><br/>"
-	. += "<a href='?src=\ref[src];edit_signature=text'>Edit Text</a> | "
-	. += "<a href='?src=\ref[src];edit_signature=font'>Edit Font</a> | "
-	. += "<a href='?src=\ref[src];edit_signature=help'>Help</a> | "
-	. += "<a href='?src=\ref[src];edit_signature=reset'>Reset</a><br/>"
+	var/list/dat = list(
+		"<b>Flavor:</b><br>",
+		"<a href='?src=\ref[src];flavor_text=open'>Set Flavor Text</a><br/>",
+		"<a href='?src=\ref[src];flavour_text_robot=open'>Set Robot Flavor Text</a><br/>",
+		"<br>",
+		"Signature: <font face='[pref.signfont ? pref.signfont : "Verdana"]'>[pref.signature]</font><br/>",
+		"<a href='?src=\ref[src];edit_signature=text'>Edit Text</a> | ",
+		"<a href='?src=\ref[src];edit_signature=font'>Edit Font</a> | ",
+		"<a href='?src=\ref[src];edit_signature=help'>Help</a> | ",
+		"<a href='?src=\ref[src];edit_signature=reset'>Reset</a><br/>"
+	)
+	. = dat.Join()

 /datum/category_item/player_setup_item/general/flavor/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["flavor_text"])
@@ -178,11 +192,11 @@
 			if ("help")
 				var/html = ""
 				html += "A character's signature can be augmented with the following tags:<br>"
-				html += "<ul><li><i>Italics</i> - \[i\]text\[\\i\]</li>"
-				html += "<li><b>Bold</b> - \[b\]text\[\\b\]</li>"
-				html += "<li><u>Underline</u> - \[u\]text\[\\u\]</li>"
-				html += "<li><font size='4'>Large text</font> - \[large\]text\[\\large\]</li>"
-				html += "<li><font size='1'>Small text</font> - \[small\]text\[\\small\]</li></ul>"
+				html += "<ul><li><i>Italics</i> - \[i\]text\[/i\]</li>"
+				html += "<li><b>Bold</b> - \[b\]text\[/b\]</li>"
+				html += "<li><u>Underline</u> - \[u\]text\[/u\]</li>"
+				html += "<li><font size='4'>Large text</font> - \[large\]text\[/large\]</li>"
+				html += "<li><font size='1'>Small text</font> - \[small\]text\[/small\]</li></ul>"
 				html += "<br><br>Beyond that, a maximum of 100 symbols are allowed for the signature text."
 				html += " Note that this includes mark-up symbols."

--- a/code/modules/client/preference_setup/global/01_ui.dm
+++ b/code/modules/client/preference_setup/global/01_ui.dm
@@ -15,16 +15,40 @@
 	S["ooccolor"]       << pref.ooccolor

 /datum/category_item/player_setup_item/player_global/ui/gather_load_query()
-	return list("ss13_player_preferences" = list("vars" = list("UI_style", "UI_style_color", "UI_style_alpha", "ooccolor"), "args" = list("ckey")))
+	return list(
+		"ss13_player_preferences" = list(
+			"vars" = list(
+				"UI_style",
+				"UI_style_color",
+				"UI_style_alpha",
+				"ooccolor"
+			), 
+			"args" = list("ckey")
+		)
+	)

 /datum/category_item/player_setup_item/player_global/ui/gather_load_parameters()
 	return list("ckey" = pref.client.ckey)

 /datum/category_item/player_setup_item/player_global/ui/gather_save_query()
-	return list("ss13_player_preferences" = list("UI_style", "UI_style_color", "UI_style_alpha", "ooccolor", "ckey" = 1))
+	return list(
+		"ss13_player_preferences" = list(
+			"UI_style",
+			"UI_style_color",
+			"UI_style_alpha",
+			"ooccolor",
+			"ckey" = 1
+		)
+	)

 /datum/category_item/player_setup_item/player_global/ui/gather_save_parameters()
-	return list("ckey" = pref.client.ckey, "UI_style_alpha" = pref.UI_style_alpha, "UI_style_color" = pref.UI_style_color, "UI_style" = pref.UI_style, "ooccolor" = pref.ooccolor)
+	return list(
+		"ckey" = pref.client.ckey,
+		"UI_style_alpha" = pref.UI_style_alpha,
+		"UI_style_color" = pref.UI_style_color,
+		"UI_style" = pref.UI_style,
+		"ooccolor" = pref.ooccolor
+	)

 /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))
@@ -32,18 +56,21 @@
 	pref.UI_style_alpha = sanitize_integer(text2num(pref.UI_style_alpha), 0, 255, initial(pref.UI_style_alpha))
 	pref.ooccolor       = sanitize_hexcolor(pref.ooccolor, initial(pref.ooccolor))

-/datum/category_item/player_setup_item/player_global/ui/content(var/mob/user)
-	. += "<b>UI Settings</b><br>"
-	. += "<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><table style='display:inline;' bgcolor='[pref.UI_style_color]'><tr><td>__</td></tr></table><3E><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><EFBFBD><a href='?src=\ref[src];reset=alpha'>reset</a><br>"
+/datum/category_item/player_setup_item/player_global/ui/content(mob/user)
+	var/list/dat = list()
+	dat += "<b>UI Settings</b><br>"
+	dat += "<b>UI Style:</b> <a href='?src=\ref[src];select_style=1'><b>[pref.UI_style]</b></a><br>"
+	dat += "<b>Custom UI</b> (recommended for White UI):<br>"
+	dat += "-Color: <a href='?src=\ref[src];select_color=1'><b>[pref.UI_style_color]</b></a> [HTML_RECT(pref.UI_style_color)] - <a href='?src=\ref[src];reset=ui'>reset</a><br>"
+	dat += "-Alpha(transparency): <a href='?src=\ref[src];select_alpha=1'><b>[pref.UI_style_alpha]</b></a> - <a href='?src=\ref[src];reset=alpha'>reset</a><br>"
 	if(can_select_ooc_color(user))
-		. += "<b>OOC Color:</b><EFBFBD>"
+		dat += "<b>OOC Color:</b> "
 		if(pref.ooccolor == initial(pref.ooccolor))
-			. += "<a href='?src=\ref[src];select_ooc_color=1'><b>Using Default</b></a><br>"
+			dat += "<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> <table style='display:inline;' bgcolor='[pref.ooccolor]'><tr><td>__</td></tr></table><3E><a href='?src=\ref[src];reset=ooc'>reset</a><br>"
+			dat += "<a href='?src=\ref[src];select_ooc_color=1'><b>[pref.ooccolor]</b></a> [HTML_RECT(pref.ooccolor)] - <a href='?src=\ref[src];reset=ooc'>reset</a><br>"
+
+	. = dat.Join()

 /datum/category_item/player_setup_item/player_global/ui/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["select_style"])
--- a/code/modules/client/preference_setup/global/02_settings.dm
+++ b/code/modules/client/preference_setup/global/02_settings.dm
@@ -23,16 +23,41 @@
 	S["parallax_toggles"] << pref.parallax_togs

 /datum/category_item/player_setup_item/player_global/settings/gather_load_query()
-	return list("ss13_player_preferences" = list("vars" = list("lastchangelog", "current_character", "toggles", "asfx_togs", "lastmotd" = "motd_hash", "lastmemo" = "memo_hash"), "args" = list("ckey")))
+	return list(
+		"ss13_player_preferences" = list(
+			"vars" = list(
+				"lastchangelog",
+				"current_character",
+				"toggles",
+				"asfx_togs",
+				"lastmotd" = "motd_hash",
+				"lastmemo" = "memo_hash"
+			), 
+			"args" = list("ckey")
+		)
+	)

 /datum/category_item/player_setup_item/player_global/settings/gather_load_parameters()
 	return list("ckey" = pref.client.ckey)

 /datum/category_item/player_setup_item/player_global/settings/gather_save_query()
-	return list("ss13_player_preferences" = list("lastchangelog", "current_character", "toggles", "asfx_togs", "lastmotd", "lastmemo", "ckey" = 1, "parallax_toggles", "parallax_speed"))
+	return list(
+		"ss13_player_preferences" = list(
+			"lastchangelog",
+			"current_character",
+			"toggles",
+			"asfx_togs",
+			"lastmotd",
+			"lastmemo",
+			"ckey" = 1,
+			"parallax_toggles",
+			"parallax_speed"
+		)
+	)

 /datum/category_item/player_setup_item/player_global/settings/gather_save_parameters()
-	return list("ckey" = pref.client.ckey,
+	return list(
+		"ckey" = pref.client.ckey,
 		"lastchangelog" = pref.lastchangelog,
 		"current_character" = pref.current_character,
 		"toggles" = pref.toggles,
@@ -40,7 +65,8 @@
 		"lastmotd" = pref.motd_hash,
 		"lastmemo" = pref.memo_hash,
 		"parallax_toggles" = pref.parallax_togs,
-				"parallax_speed" = pref.parallax_speed)
+		"parallax_speed" = pref.parallax_speed
+	)

 /datum/category_item/player_setup_item/player_global/settings/sanitize_preferences(var/sql_load = 0)
 	if (sql_load)
@@ -55,16 +81,20 @@
 	pref.parallax_speed = sanitize_integer(text2num(pref.parallax_speed), 1, 10, initial(pref.parallax_speed))
 	pref.parallax_togs  = sanitize_integer(text2num(pref.parallax_togs), 0, 65535, initial(pref.parallax_togs))

-/datum/category_item/player_setup_item/player_global/settings/content(var/mob/user)
-	. += "<b>Play admin midis:</b> <a href='?src=\ref[src];toggle=[SOUND_MIDI]'><b>[(pref.toggles & SOUND_MIDI) ? "Yes" : "No"]</b></a><br>"
-	. += "<b>Play lobby music:</b> <a href='?src=\ref[src];toggle=[SOUND_LOBBY]'><b>[(pref.toggles & SOUND_LOBBY) ? "Yes" : "No"]</b></a><br>"
-	. += "<b>Ghost ears:</b> <a href='?src=\ref[src];toggle=[CHAT_GHOSTEARS]'><b>[(pref.toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]</b></a><br>"
-	. += "<b>Ghost sight:</b> <a href='?src=\ref[src];toggle=[CHAT_GHOSTSIGHT]'><b>[(pref.toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"]</b></a><br>"
-	. += "<b>Ghost radio:</b> <a href='?src=\ref[src];toggle=[CHAT_GHOSTRADIO]'><b>[(pref.toggles & CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]</b></a><br>"
-	. += "<b>Space Parallax:</b> <a href='?src=\ref[src];paratoggle=[PARALLAX_SPACE]'><b>[(pref.parallax_togs & PARALLAX_SPACE) ? "Yes" : "No"]</b></a><br>"
-	. += "<b>Space Dust:</b> <a href='?src=\ref[src];paratoggle=[PARALLAX_DUST]'><b>[(pref.parallax_togs & PARALLAX_DUST) ? "Yes" : "No"]</b></a><br>"
-	. += "<b>Progress Bars:</b> <a href='?src=\ref[src];paratoggle=[PROGRESS_BARS]'><b>[(pref.parallax_togs & PROGRESS_BARS) ? "Yes" : "No"]</b></a><br>"
-	. += "<b>Static Space:</b> <a href='?src=\ref[src];paratoggle=[PARALLAX_IS_STATIC]'><b>[(pref.parallax_togs & PARALLAX_IS_STATIC) ? "Yes" : "No"]</b></a><br>"
+/datum/category_item/player_setup_item/player_global/settings/content(mob/user)
+	var/list/dat = list(
+		"<b>Play admin midis:</b> <a href='?src=\ref[src];toggle=[SOUND_MIDI]'><b>[(pref.toggles & SOUND_MIDI) ? "Yes" : "No"]</b></a><br>",
+		"<b>Play lobby music:</b> <a href='?src=\ref[src];toggle=[SOUND_LOBBY]'><b>[(pref.toggles & SOUND_LOBBY) ? "Yes" : "No"]</b></a><br>",
+		"<b>Ghost ears:</b> <a href='?src=\ref[src];toggle=[CHAT_GHOSTEARS]'><b>[(pref.toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]</b></a><br>",
+		"<b>Ghost sight:</b> <a href='?src=\ref[src];toggle=[CHAT_GHOSTSIGHT]'><b>[(pref.toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"]</b></a><br>",
+		"<b>Ghost radio:</b> <a href='?src=\ref[src];toggle=[CHAT_GHOSTRADIO]'><b>[(pref.toggles & CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]</b></a><br>",
+		"<b>Space Parallax:</b> <a href='?src=\ref[src];paratoggle=[PARALLAX_SPACE]'><b>[(pref.parallax_togs & PARALLAX_SPACE) ? "Yes" : "No"]</b></a><br>",
+		"<b>Space Dust:</b> <a href='?src=\ref[src];paratoggle=[PARALLAX_DUST]'><b>[(pref.parallax_togs & PARALLAX_DUST) ? "Yes" : "No"]</b></a><br>",
+		"<b>Progress Bars:</b> <a href='?src=\ref[src];paratoggle=[PROGRESS_BARS]'><b>[(pref.parallax_togs & PROGRESS_BARS) ? "Yes" : "No"]</b></a><br>",
+		"<b>Static Space:</b> <a href='?src=\ref[src];paratoggle=[PARALLAX_IS_STATIC]'><b>[(pref.parallax_togs & PARALLAX_IS_STATIC) ? "Yes" : "No"]</b></a><br>"
+	)
+
+	. = dat.Join()

 /datum/category_item/player_setup_item/player_global/settings/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["toggle"])
--- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
@@ -66,7 +66,7 @@
 /datum/gear/accessory/white_vest
 	display_name = "webbing, medical"
 	path = /obj/item/clothing/accessory/storage/white_vest
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident")

 /datum/gear/accessory/webbing
 	display_name = "webbing, simple"
@@ -86,7 +86,7 @@
 /datum/gear/accessory/white_pouches
 	display_name = "drop pouches, medical"
 	path = /obj/item/clothing/accessory/storage/white_pouches
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist","Geneticist", "Paramedic", "Nursing Intern")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist","Geneticist", "Paramedic", "Medical Resident")

 /datum/gear/accessory/pouches
 	display_name = "drop pouches, simple"
--- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
@@ -46,7 +46,7 @@
 /datum/gear/eyes/medical
 	display_name = "medical HUD"
 	path = /obj/item/clothing/glasses/hud/health
-	allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Nursing Intern")
+	allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Medical Resident")

 /datum/gear/eyes/shades
 	display_name = "sunglasses, fat"
--- a/code/modules/client/preference_setup/loadout/loadout_head.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head.dm
@@ -154,7 +154,7 @@
 /datum/gear/head/surgical
 	display_name = "surgical cap selection"
 	path = /obj/item/clothing/head/surgery/blue
-	allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Geneticist", "Chemist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
+	allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Geneticist", "Chemist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")

 /datum/gear/head/surgical/New()
 	..()
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -72,7 +72,7 @@
 	display_name = "surgical apron"
 	path = /obj/item/clothing/suit/apron/surgery
 	cost = 1
-	allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
+	allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")

 /datum/gear/suit/poncho
 	display_name = "poncho selection"
@@ -132,7 +132,7 @@
 /datum/gear/suit/winter/medical
 	display_name = "winter coat, medical"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Nursing Intern", "Psychiatrist", "Chemist")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")

 /datum/gear/suit/winter/engineering
 	display_name = "winter coat, engineering"
--- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
@@ -82,7 +82,7 @@
 /datum/gear/uniform/scrubs
 	display_name = "scrubs selection"
 	path = /obj/item/clothing/under/rank/medical/black
-	allowed_roles = list("Scientist","Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
+	allowed_roles = list("Scientist","Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")

 /datum/gear/uniform/scrubs/New()
 	..()
--- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm
@@ -133,7 +133,7 @@
 	display_name = "PRA medical coat (Tajara)"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
 	whitelisted = list("Tajara")
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident")
 	sort_category = "Xenowear"

 //other things
--- a/code/modules/client/preference_setup/occupation/occupation.dm
+++ b/code/modules/client/preference_setup/occupation/occupation.dm
@@ -34,16 +34,34 @@
 	S["player_alt_titles"]	<< pref.player_alt_titles

 /datum/category_item/player_setup_item/occupation/gather_load_query()
-	return list("ss13_characters" = list("vars" = list("jobs" = "unsanitized_jobs", "alternate_option", "alternate_titles" = "player_alt_titles"), "args" = list("id")))
+	return list(
+		"ss13_characters" = list(
+			"vars" = list(
+				"jobs" = "unsanitized_jobs",
+				"alternate_option",
+				"alternate_titles" = "player_alt_titles"
+			),
+			"args" = list("id")
+		)
+	)

 /datum/category_item/player_setup_item/occupation/gather_load_parameters()
 	return list("id" = pref.current_character)

 /datum/category_item/player_setup_item/occupation/gather_save_query()
-	return list("ss13_characters" = list("jobs", "alternate_option", "alternate_titles", "id" = 1, "ckey" = 1))
+	return list(
+		"ss13_characters" = list(
+			"jobs",
+			"alternate_option",
+			"alternate_titles",
+			"id" = 1,
+			"ckey" = 1
+		)
+	)

 /datum/category_item/player_setup_item/occupation/gather_save_parameters()
-	var/list/compiled_jobs = list("job_civilian_high" = pref.job_civilian_high,
+	var/list/compiled_jobs = list(
+		"job_civilian_high" = pref.job_civilian_high,
 		"job_civilian_med" = pref.job_civilian_med,
 		"job_civilian_low" = pref.job_civilian_low,
 		"job_medsci_high" = pref.job_medsci_high,
@@ -51,9 +69,16 @@
 		"job_medsci_low" = pref.job_medsci_low,
 		"job_engsec_high" = pref.job_engsec_high,
 		"job_engsec_med" = pref.job_engsec_med,
-								"job_engsec_low" = pref.job_engsec_low)
+		"job_engsec_low" = pref.job_engsec_low
+	)

-	return list("jobs" = list2params(compiled_jobs), "alternate_option" = pref.alternate_option, "alternate_titles" = list2params(pref.player_alt_titles), "id" = pref.current_character, "ckey" = pref.client.ckey)
+	return list(
+		"jobs" = list2params(compiled_jobs),
+		"alternate_option" = pref.alternate_option,
+		"alternate_titles" = list2params(pref.player_alt_titles),
+		"id" = pref.current_character,
+		"ckey" = pref.client.ckey
+	)

 /datum/category_item/player_setup_item/occupation/sanitize_character(var/sql_load = 0)
 	if (sql_load)
@@ -102,89 +127,91 @@
 			pref.player_alt_titles -= job.title

 /datum/category_item/player_setup_item/occupation/content(mob/user, limit = 16, list/splitJobs = list("Chief Medical Officer"))
-
-	. += "<tt><center>"
-	. += "<b>Choose occupation chances</b><br>Unavailable occupations are crossed out.<br>"
-	. += "<table width='100%' cellpadding='1' cellspacing='0'><tr><td width='20%'>" // Table within a table for alignment, also allows you to easily add more colomns.
-	. += "<table width='100%' cellpadding='1' cellspacing='0'>"
+	var/list/dat = list(
+		"<tt><center>",
+		"<b>Choose occupation chances</b><br>Unavailable occupations are crossed out.<br>",
+		"<table width='100%' cellpadding='1' cellspacing='0'><tr><td width='20%'>", // Table within a table for alignment, also allows you to easily add more colomns.
+		"<table width='100%' cellpadding='1' cellspacing='0'>"
+	)
 	var/index = -1

 	//The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows.
 	var/datum/job/lastJob
 	for(var/datum/job/job in SSjobs.occupations)
-
 		index += 1
 		if((index >= limit) || (job.title in splitJobs))
 			if((index < limit) && (lastJob != null))
 				//If the cells were broken up by a job in the splitJob list then it will fill in the rest of the cells with
 				//the last job's selection color. Creating a rather nice effect.
 				for(var/i = 0, i < (limit - index), i += 1)
-					. += "<tr bgcolor='[lastJob.selection_color]'><td width='60%' align='right'><a>&nbsp</a></td><td><a>&nbsp</a></td></tr>"
-			. += "</table></td><td width='20%'><table width='100%' cellpadding='1' cellspacing='0'>"
+					dat += "<tr bgcolor='[lastJob.selection_color]'><td width='60%' align='right'><a>&nbsp</a></td><td><a>&nbsp</a></td></tr>"
+			dat += "</table></td><td width='20%'><table width='100%' cellpadding='1' cellspacing='0'>"
 			index = 0

-		. += "<tr bgcolor='[job.selection_color]'><td width='60%' align='right'>"
+		dat += "<tr bgcolor='[job.selection_color]'><td width='60%' align='right'>"
 		var/rank = job.title
 		lastJob = job
 		var/ban_reason = jobban_isbanned(user, rank)
 		if(ban_reason == "WHITELISTED")
-			. += "<del>[rank]</del></td><td><b> \[WHITELISTED]</b></td></tr>"
+			dat += "<del>[rank]</del></td><td><b> \[WHITELISTED]</b></td></tr>"
 			continue
 		else if (ban_reason == "AGE WHITELISTED")
 			var/available_in_days = player_old_enough_for_role(user.client, rank)
-			. += "<del>[rank]</del></td><td> \[IN [(available_in_days)] DAYS]</td></tr>"
+			dat += "<del>[rank]</del></td><td> \[IN [(available_in_days)] DAYS]</td></tr>"
 			continue
 		else if (ban_reason)
-			. += "<del>[rank]</del></td><td><b> \[<a href='?src=\ref[user.client];view_jobban=\ref[rank];'>BANNED</a>]</b></td></tr>"
+			dat += "<del>[rank]</del></td><td><b> \[<a href='?src=\ref[user.client];view_jobban=\ref[rank];'>BANNED</a>]</b></td></tr>"
 			continue
 		if((pref.job_civilian_low & ASSISTANT) && (rank != "Assistant"))
-			. += "<font color=orange>[rank]</font></td><td></td></tr>"
+			dat += "<font color=orange>[rank]</font></td><td></td></tr>"
 			continue
 		if((rank in command_positions) || (rank == "AI"))//Bold head jobs
-			. += "<b>[rank]</b>"
+			dat += "<b>[rank]</b>"
 		else
-			. += "[rank]"
+			dat += "[rank]"

-		. += "</td><td width='40%'>"
+		dat += "</td><td width='40%'>"

-		. += "<a href='?src=\ref[src];set_job=[rank]'>"
+		dat += "<a href='?src=\ref[src];set_job=[rank]'>"

 		if(rank == "Assistant")//Assistant is special
 			if(pref.job_civilian_low & ASSISTANT)
-				. += " <font color=green>\[Yes]</font>"
+				dat += " <font color=green>\[Yes]</font>"
 			else
-				. += " <font color=red>\[No]</font>"
+				dat += " <font color=red>\[No]</font>"
 			if(job.alt_titles) //Blatantly cloned from a few lines down.
-				. += "</a></td></tr><tr bgcolor='[lastJob.selection_color]'><td width='60%' align='center'>&nbsp</td><td><a href='?src=\ref[src];select_alt_title=\ref[job]'>\[[pref.GetPlayerAltTitle(job)]\]</a></td></tr>"
-			. += "</a></td></tr>"
+				dat += "</a></td></tr><tr bgcolor='[lastJob.selection_color]'><td width='60%' align='center'>&nbsp</td><td><a href='?src=\ref[src];select_alt_title=\ref[job]'>\[[pref.GetPlayerAltTitle(job)]\]</a></td></tr>"
+			dat += "</a></td></tr>"
 			continue

 		if(pref.GetJobDepartment(job, 1) & job.flag)
-			. += " <font color=blue>\[High]</font>"
+			dat += " <font color=blue>\[High]</font>"
 		else if(pref.GetJobDepartment(job, 2) & job.flag)
-			. += " <font color=green>\[Medium]</font>"
+			dat += " <font color=green>\[Medium]</font>"
 		else if(pref.GetJobDepartment(job, 3) & job.flag)
-			. += " <font color=orange>\[Low]</font>"
+			dat += " <font color=orange>\[Low]</font>"
 		else
-			. += " <font color=red>\[NEVER]</font>"
+			dat += " <font color=red>\[NEVER]</font>"
 		if(job.alt_titles)
-			. += "</a></td></tr><tr bgcolor='[lastJob.selection_color]'><td width='60%' align='center'>&nbsp</td><td><a href='?src=\ref[src];select_alt_title=\ref[job]'>\[[pref.GetPlayerAltTitle(job)]\]</a></td></tr>"
-		. += "</a></td></tr>"
+			dat += "</a></td></tr><tr bgcolor='[lastJob.selection_color]'><td width='60%' align='center'>&nbsp</td><td><a href='?src=\ref[src];select_alt_title=\ref[job]'>\[[pref.GetPlayerAltTitle(job)]\]</a></td></tr>"
+		dat += "</a></td></tr>"

-	. += "</td'></tr></table>"
+	dat += "</td'></tr></table>"

-	. += "</center></table>"
+	dat += "</center></table>"

 	switch(pref.alternate_option)
 		if(GET_RANDOM_JOB)
-			. += "<center><br><u><a href='?src=\ref[src];job_alternative=1'><font color=green>Get random job if preferences unavailable</font></a></u></center><br>"
+			dat += "<center><br><u><a href='?src=\ref[src];job_alternative=1'><font color=green>Get random job if preferences unavailable</font></a></u></center><br>"
 		if(BE_ASSISTANT)
-			. += "<center><br><u><a href='?src=\ref[src];job_alternative=1'><font color=red>Be assistant if preference unavailable</font></a></u></center><br>"
+			dat += "<center><br><u><a href='?src=\ref[src];job_alternative=1'><font color=red>Be assistant if preference unavailable</font></a></u></center><br>"
 		if(RETURN_TO_LOBBY)
-			. += "<center><br><u><a href='?src=\ref[src];job_alternative=1'><font color=purple>Return to lobby if preference unavailable</font></a></u></center><br>"
+			dat += "<center><br><u><a href='?src=\ref[src];job_alternative=1'><font color=purple>Return to lobby if preference unavailable</font></a></u></center><br>"

-	. += "<center><a href='?src=\ref[src];reset_jobs=1'>\[Reset\]</a></center>"
-	. += "</tt>"
+	dat += "<center><a href='?src=\ref[src];reset_jobs=1'>\[Reset\]</a></center>"
+	dat += "</tt>"
+
+	. = dat.Join()

 /datum/category_item/player_setup_item/occupation/OnTopic(href, href_list, user)
 	if(href_list["reset_jobs"])
--- a/code/modules/client/preference_setup/other/01_incidents.dm
+++ b/code/modules/client/preference_setup/other/01_incidents.dm
@@ -61,27 +61,30 @@
 			infraction.felony = text2num(char_infraction_query.item[11])
 			pref.incidents.Add(infraction)

-/datum/category_item/player_setup_item/other/incidents/content(var/mob/user)
-	pref.incidents = list()
-	. += "<b>Incident Information</b><br>"
-	. += "The following incidents are on file for your character<br>"
+/datum/category_item/player_setup_item/other/incidents/content(mob/user)
+	var/list/dat = list(
+		"<b>Incident Information</b><br>",
+		"The following incidents are on file for your character<br>"
+	)
 	for (var/datum/char_infraction/I in pref.incidents)
-		. += "<hr>"
-		. += "UID: [I.UID]<br>"
-		. += "Date/Time: [I.datetime]<br>"
-		. += "Charges: "
+		dat += "<hr>"
+		dat += "UID: [I.UID]<br>"
+		dat += "Date/Time: [I.datetime]<br>"
+		dat += "Charges: "
 		for (var/L in I.charges)
-			. += "[L], "
+			dat += "[L], "
 		if (I.fine == 0)
-			. += "<br>Brig Sentence: [I.getBrigSentence()] <br>"
+			dat += "<br>Brig Sentence: [I.getBrigSentence()] <br>"
 		else
-			. += "Fine: [I.fine] Credits<br>"
-		. += "Notes: <br>"
+			dat += "Fine: [I.fine] Credits<br>"
+		dat += "Notes: <br>"
 		if (I.notes != "")
-			. += nl2br(I.notes)
+			dat += nl2br(I.notes)
 		else
-			. += "- No Summary Entered -"
-		. += "<br><a href='?src=\ref[src];details_sec_incident=[I.db_id]'>Show Details</a><br><a href='?src=\ref[src];del_sec_incident=[I.db_id]'>Delete Incident</a>"
+			dat += "- No Summary Entered -"
+		dat += "<br><a href='?src=\ref[src];details_sec_incident=[I.db_id]'>Show Details</a><br><a href='?src=\ref[src];del_sec_incident=[I.db_id]'>Delete Incident</a>"
+
+	. = dat.Join()

 /datum/category_item/player_setup_item/other/incidents/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["del_sec_incident"])
--- a/code/modules/client/preference_setup/preference_setup.dm
+++ b/code/modules/client/preference_setup/preference_setup.dm
@@ -7,6 +7,9 @@
 #define SQL_CHARACTER	0x1
 #define SQL_PREFERENCES	0x2

+// General-purpose helper for drawing a colored box.
+#define HTML_RECT(color) "&nbsp;<div style=\"display:inline;height:10px;width:30px;background:'[color || "#FFFFFF"]'\"></div>&nbsp;"
+
 /datum/category_group/player_setup_category/general_preferences
 	name = "General"
 	sort_order = 1
--- a/code/modules/client/preference_setup/skills/skills.dm
+++ b/code/modules/client/preference_setup/skills/skills.dm
@@ -13,16 +13,36 @@
 	S["skill_specialization"] << pref.skill_specialization

 /datum/category_item/player_setup_item/skills/gather_load_query()
-	return list("ss13_characters" = list("vars" = list("skills", "skill_specialization"), "args" = list("id")))
+	return list(
+		"ss13_characters" = list(
+			"vars" = list(
+				"skills",
+				"skill_specialization"
+			), 
+			"args" = list("id")
+		)
+	)

 /datum/category_item/player_setup_item/skills/gather_load_parameters()
 	return list("id" = pref.current_character)

 /datum/category_item/player_setup_item/skills/gather_save_query()
-	return list("ss13_characters" = list("skills", "skill_specialization", "id" = 1, "ckey" = 1))
+	return list(
+		"ss13_characters" = list(
+			"skills",
+			"skill_specialization",
+			"id" = 1,
+			"ckey" = 1
+		)
+	)

 /datum/category_item/player_setup_item/skills/gather_save_parameters()
-	return list("skills" = list2params(pref.skills), "skill_specialization" = pref.skill_specialization, "id" = pref.current_character, "ckey" = pref.client.ckey)
+	return list(
+		"skills" = list2params(pref.skills),
+		"skill_specialization" = pref.skill_specialization,
+		"id" = pref.current_character,
+		"ckey" = pref.client.ckey
+	)

 /datum/category_item/player_setup_item/skills/sanitize_character(var/sql_load = 0)
 	if (SKILLS == null)
@@ -45,27 +65,30 @@
 		pref.used_skillpoints = 0

 /datum/category_item/player_setup_item/skills/content()
-	. += "<b>Select your Skills</b><br>"
-	. += "Current skill level: <b>[pref.GetSkillClass(pref.used_skillpoints)]</b> ([pref.used_skillpoints])<br>"
-	. += "<a href='?src=\ref[src];preconfigured=1'>Use preconfigured skillset</a><br>"
-	. += "<table>"
+	var/list/dat = list(
+		"<b>Select your Skills</b><br>",
+		"Current skill level: <b>[pref.GetSkillClass(pref.used_skillpoints)]</b> ([pref.used_skillpoints])<br>",
+		"<a href='?src=\ref[src];preconfigured=1'>Use preconfigured skillset</a><br>",
+		"<table>"
+	)
 	for(var/V in SKILLS)
-		. += "<tr><th colspan = 5><b>[V]</b>"
-		. += "</th></tr>"
+		dat += "<tr><th colspan = 5><b>[V]</b>"
+		dat += "</th></tr>"
 		for(var/datum/skill/S in SKILLS[V])
 			var/level = pref.skills[S.ID]
-			. += "<tr style='text-align:left;'>"
-			. += "<th><a href='?src=\ref[src];skillinfo=\ref[S]'>[S.name]</a></th>"
-			. += "<th><a href='?src=\ref[src];setskill=\ref[S];newvalue=[SKILL_NONE]'><font color=[(level == SKILL_NONE) ? "red" : "black"]>\[Untrained\]</font></a></th>"
+			dat += "<tr style='text-align:left;'>"
+			dat += "<th><a href='?src=\ref[src];skillinfo=\ref[S]'>[S.name]</a></th>"
+			dat += "<th><a href='?src=\ref[src];setskill=\ref[S];newvalue=[SKILL_NONE]'><font color=[(level == SKILL_NONE) ? "red" : "black"]>\[Untrained\]</font></a></th>"
 			// secondary skills don't have an amateur level
 			if(S.secondary)
-				. += "<th></th>"
+				dat += "<th></th>"
 			else
-				. += "<th><a href='?src=\ref[src];setskill=\ref[S];newvalue=[SKILL_BASIC]'><font color=[(level == SKILL_BASIC) ? "red" : "black"]>\[Amateur\]</font></a></th>"
-			. += "<th><a href='?src=\ref[src];setskill=\ref[S];newvalue=[SKILL_ADEPT]'><font color=[(level == SKILL_ADEPT) ? "red" : "black"]>\[Trained\]</font></a></th>"
-			. += "<th><a href='?src=\ref[src];setskill=\ref[S];newvalue=[SKILL_EXPERT]'><font color=[(level == SKILL_EXPERT) ? "red" : "black"]>\[Professional\]</font></a></th>"
-			. += "</tr>"
-	. += "</table>"
+				dat += "<th><a href='?src=\ref[src];setskill=\ref[S];newvalue=[SKILL_BASIC]'><font color=[(level == SKILL_BASIC) ? "red" : "black"]>\[Amateur\]</font></a></th>"
+			dat += "<th><a href='?src=\ref[src];setskill=\ref[S];newvalue=[SKILL_ADEPT]'><font color=[(level == SKILL_ADEPT) ? "red" : "black"]>\[Trained\]</font></a></th>"
+			dat += "<th><a href='?src=\ref[src];setskill=\ref[S];newvalue=[SKILL_EXPERT]'><font color=[(level == SKILL_EXPERT) ? "red" : "black"]>\[Professional\]</font></a></th>"
+			dat += "</tr>"
+	dat += "</table>"
+	. = dat.Join()

 /datum/category_item/player_setup_item/skills/OnTopic(href, href_list, user)
 	if(href_list["skillinfo"])
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -148,13 +148,21 @@
 	siemens_coefficient = 1.5
 	item_icons = list()

-	update_icon(var/mob/living/carbon/human/user)
-		if(!istype(user)) return
-		var/icon/ears = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty")
-		ears.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
+/obj/item/clothing/head/kitty/equipped(mob/living/carbon/human/user, slot)
+	. = ..()
+	if (slot == slot_head && istype(user))
+		var/hairgb = rgb(user.r_hair, user.g_hair, user.b_hair)
+		var/icon/blended = SSicon_cache.kitty_ear_cache[hairgb]
+		if (!blended)
+			blended = icon('icons/mob/head.dmi', "kitty")
+			blended.Blend(hairgb, ICON_ADD)
+			blended.Blend(icon('icons/mob/head.dmi', "kittyinner"), ICON_OVERLAY)

-		var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner")
-		ears.Blend(earbit, ICON_OVERLAY)
+			SSicon_cache.kitty_ear_cache[hairgb] = blended
+
+		icon_override = blended
+	else if (icon_override)
+		icon_override = null

 /obj/item/clothing/head/richard
 	name = "chicken mask"
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -107,7 +107,7 @@

 /obj/item/clothing/suit/wizrobe/gentlecoat
 	name = "gentlemans coat"
-	desc = "A heavy threaded twead gray jacket. For a different sort of Gentleman."
+	desc = "A heavy threaded tweed gray jacket. For a different sort of Gentleman."
 	icon_state = "gentlecoat"
 	item_state = "gentlecoat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -512,7 +512,7 @@ All custom items with worn sprites must follow the contained sprite system: http


 /obj/item/clothing/suit/storage/toggle/labcoat/fluff/helmut_labcoat //CERN Labcoat - Helmut Kronigernischultz - pyrociraptor
-	name = "CERN labcoat"
+	name = "\improper CERN labcoat"
 	desc = "A Labcoat with a blue pocket and blue collar. On the pocket, you can read \"C.E.R.N.\"."
 	icon = 'icons/obj/custom_items/helmut_labcoat.dmi'
 	icon_state = "helmut_labcoat"
@@ -703,6 +703,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	desc = "A sterile insulated coat made of leather stitched over fur. It has two gold lapels indicating Officer rank. \
 	The a white armband with a scarlet line in the center indicates that the person wearing this coat is medically trained."

+
 /obj/item/clothing/suit/storage/tajaran/fluff/maksim_coat //Tajaran Naval Officer's Coat - Maksim Vasilyev - aimlessanalyst
 	name = "tajaran naval officer coat"
 	desc = "A thick wool coat from Adhomai, calling back to days long past."
@@ -1168,3 +1169,79 @@ All custom items with worn sprites must follow the contained sprite system: http
 /obj/item/clothing/mask/fluff/corvo_cigarette/examine(mob/user)
 	if(..(user, 1))
 		user << "It is [active ? "on" : "off"]."
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac/fluff/leonce_cognac //Old Earth Luxury Cognac - Francois Leonce - driecg36
+	name = "old earth luxury cognac"
+	desc = "An unusually shaped crystal bottle, covered in elaborate etchings displaying the symbol of the house that produced it. Inside is a smooth, amber liquor, \
+	which smells of the barrel it was aged in. The region and producer are on the label."
+	icon = 'icons/obj/custom_items/leonce_cognac.dmi'
+	icon_state = "leonce_cognac"
+
+
+/obj/item/clothing/under/fluff/birkin_uniform //White Suit - Joseph Birkin - unknownmurder
+	name = "white suit"
+	desc = "This collared uniform appears to be little wrinkled and the tie is a bit loose from the collar. The jean seems to be neatly straight with the leather belt attached."
+	icon = 'icons/obj/custom_items/birkin_uniform.dmi'
+	icon_state = "birkin_uniform"
+	item_state = "birkin_uniform"
+	contained_sprite = TRUE
+
+
+/obj/item/clothing/suit/storage/fluff/sonorous_mantle //Maraziite Throw Over - Sonorous Zouzoror - sleepywolf
+	name = "maraziite throw over"
+	desc = "A grey poncho, exclusively warn by members of the Maraziite Order. This one has the flag of the Izweski Hegemony stitched on."
+	icon = 'icons/obj/custom_items/sonorous_clothing.dmi'
+	icon_state = "sonorous_mantle"
+	item_state = "sonorous_mantle"
+	contained_sprite = TRUE
+
+/obj/item/clothing/mask/fluff/sonorous_mask //Iron Mask - Sonorous Zouzoror - sleepywolf
+	name = "iron mask"
+	desc = "A mask made of iron worn by members of the Maraziite Order. This one looks like it's modeled after a fish."
+	icon = 'icons/obj/custom_items/sonorous_clothing.dmi'
+	icon_state = "sonorous_mask"
+	item_state = "sonorous_mask"
+	contained_sprite = TRUE
+	flags_inv = HIDEEARS|HIDEFACE
+	body_parts_covered = FACE
+	w_class = 3.0
+
+
+/obj/item/clothing/under/fluff/ellie_uniform //Cheery Blazer - Ellie Shoshanna - resilynn
+	name = "cheery blazer"
+	desc = "A cheery but professional outfit, mauve corduroys, blue blazer and a tie."
+	icon = 'icons/obj/custom_items/ellie_uniform.dmi'
+	icon_state = "ellie_uniform"
+	item_state = "ellie_uniform"
+	contained_sprite = TRUE
+
+
+/obj/item/clothing/accessory/fluff/zhilin_necklace //Tajaran Religious Necklace - Zhilin Vadim - fireandglory
+	name = "tajaran religious necklace"
+	desc = "A necklace with black string, it appears to have carved wooden figures of the Tajaran god Mata'ke and all of his pantheon strung through it."
+	icon = 'icons/obj/custom_items/zhilin_necklace.dmi'
+	icon_state = "zhilin_necklace"
+	item_state = "zhilin_necklace"
+	contained_sprite = TRUE
+	slot_flags = SLOT_EARS | SLOT_TIE
+
+
+/obj/item/weapon/book/fluff/huntington_book //Spark Theorem - Monica Huntington - moondancerpony
+	name = "\improper Spark Theorem"
+	desc = "A bound copy of the 2458 research paper \"Spark Theorem: Research Into the Development of Synthetic Consciousness and Sapience\". This one is signed by the author."
+	title = "Spark Theorem"
+	icon_state = "book6"
+	author = "Kyyir'ry'avii 'Karima' Ile'nagrii Al'Ghul-Mo'Taki"
+	dat = "<!doctype html><html style=\"width:100%;height:100%;\"><head><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\"></head><body><iframe style=\"width:100%;height:100%\" src=\"https://assets.lohikar.io/mdp/sparktheorem.html\"></iframe></body></html>"
+	due_date = 0
+	unique = 1
+
+
+/obj/item/clothing/shoes/fluff/hikmat_shoes //Native Tajaran Foot-wear - Hikmat Rrhazkal-Jawdat - prospekt1559
+	name = "native tajaran foot-wear"
+	desc = "Native foot and leg wear worn by Tajara, completely covering the legs in wraps and the feet in native Tajaran fabric."
+	icon = 'icons/obj/custom_items/hikmat_shoes.dmi'
+	icon_state = "hikmat_shoes"
+	item_state = "hikmat_shoes"
+	species_restricted = null
+	contained_sprite = TRUE
--- a/code/modules/detectivework/tools/rag.dm
+++ b/code/modules/detectivework/tools/rag.dm
@@ -111,7 +111,7 @@
 			user.do_attack_animation(src)
 			M.IgniteMob()
 		else if(reagents.total_volume)
-			if(user.zone_sel.selecting == "mouth")
+			if(user.zone_sel.selecting == "mouth" && !(M.wear_mask && M.wear_mask.item_flags & AIRTIGHT))
 				user.do_attack_animation(src)
 				user.visible_message(
 					"<span class='danger'>\The [user] smothers [target] with [src]!</span>",
--- a/code/modules/economy/economy_misc.dm
+++ b/code/modules/economy/economy_misc.dm
@@ -46,17 +46,6 @@

 #define GEAR_EVA 15

-
-/var/list/economic_species_modifier = list(
-												/datum/species/human	= 12,
-												/datum/species/skrell	= 10,
-												/datum/species/tajaran	= 7,
-												/datum/species/unathi	= 7,
-												/datum/species/diona	= 3,
-												/datum/species/machine	= 3,
-												/datum/species/bug		= 1
-											)
-
 //---- The following corporations are friendly with NanoTrasen and loosely enable trade and travel:
 //Corporation NanoTrasen - Generalised / high tech research and phoron exploitation.
 //Corporation Vessel Contracting - Ship and station construction, materials research.
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -67,11 +67,10 @@
 	var/last_biolum = null

 /obj/effect/plant/Destroy()
-	if(SSplants)
-		STOP_PROCESSING(SSplants, src)
+	SSplants.remove_plant(src)
 	for(var/obj/effect/plant/neighbor in range(1,src))
 		if (!QDELETED(neighbor))
-			START_PROCESSING(SSplants, neighbor)
+			SSplants.add_plant(neighbor)
 	return ..()
 	
 /obj/effect/plant/single
@@ -129,7 +128,7 @@
 /obj/effect/plant/proc/post_initialize()
 	set_dir(calc_dir())
 	update_icon()
-	START_PROCESSING(SSplants, src)
+	SSplants.add_plant(src)
 	// Some plants eat through plating.
 	if(islist(seed.chems) && !isnull(seed.chems["pacid"]))
 		var/turf/T = get_turf(src)
@@ -239,7 +238,7 @@
 /obj/effect/plant/attackby(var/obj/item/weapon/W, var/mob/user)

 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
-	START_PROCESSING(SSplants, src)
+	SSplants.add_plant(src)

 	if(iswirecutter(W) || istype(W, /obj/item/weapon/scalpel))
 		if(sampled)
--- a/code/modules/hydroponics/spreading/spreading_growth.dm
+++ b/code/modules/hydroponics/spreading/spreading_growth.dm
@@ -23,6 +23,10 @@
 		if(!Adjacent(floor) || !floor.Enter(src))
 			continue
 		neighbors |= floor
+
+	if (neighbors.len)
+		SSplants.add_plant(src)
+
 	// Update all of our friends.
 	var/turf/T = get_turf(src)
 	for(var/obj/effect/plant/neighbor in range(1,src))
@@ -82,8 +86,8 @@

 	// We shouldn't have spawned if the controller doesn't exist.
 	check_health()
-	if(neighbors.len || health != max_health)
-		START_PROCESSING(SSplants, src)
+	if(neighbors.len || health != max_health || buckled_mob)
+		SSplants.add_plant(src)

 /obj/effect/plant/proc/do_spread(spread_chance, max_spread)
 	for(var/i in 1 to max_spread)
@@ -113,7 +117,7 @@
 			continue
 		for(var/obj/effect/plant/neighbor in check_turf.contents)
 			neighbor.neighbors |= check_turf
-			START_PROCESSING(SSplants, neighbor)
+			SSplants.add_plant(neighbor)

 	QDEL_IN(src, 1)

--- a/code/modules/intern/intern.dm
+++ b/code/modules/intern/intern.dm
@@ -24,7 +24,7 @@
 		return 1

 /datum/job/intern_med
-	title = "Nursing Intern"
+	title = "Medical Resident"
 	flag = INTERN_MED
 	department_flag = MEDSCI
 	faction = "Station"
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -1131,8 +1131,7 @@ var/list/total_extraction_beacons = list()
 		single_spark(O.loc)
 		do_teleport(O, user, 0)

-		if (TICK_CHECK)
-			return
+		CHECK_TICK

 /******************************Sculpting*******************************/
 /obj/item/weapon/autochisel
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -16,12 +16,14 @@
 		src.contents += W
 	if (istype(W, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = W
-		S.hide_from(usr)
+		S.hide_from(user)
 		for(var/obj/item/weapon/ore/O in S.contents)
-			S.remove_from_storage(O, src) //This will move the item to this item's contents
+			S.remove_from_storage_deferred(O, src, user) //This will move the item to this item's contents

 			CHECK_TICK

+		S.post_remove_from_storage_deferred(loc, user)
+
 		user << span("notice", "You empty the satchel into the box.")

 	update_ore_count()
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -174,13 +174,13 @@ Works together with spawning an observer, noted above.
 		C.images += target.hud_list[SPECIALROLE_HUD]
 	return 1

-/mob/proc/ghostize(var/can_reenter_corpse = 1)
+/mob/proc/ghostize(var/can_reenter_corpse = 1, var/should_set_timer = 1)
 	if(ckey)
 		var/mob/dead/observer/ghost = new(src)	//Transfer safety to observer spawning proc.
 		ghost.can_reenter_corpse = can_reenter_corpse
 		ghost.timeofdeath = src.stat == DEAD ? src.timeofdeath : world.time

-
+		if(should_set_timer)
 			//This is duplicated for robustness in cases where death might not be called.		
 			//It is also set in the mob/death proc		
 			if (isanimal(src))		
@@ -190,13 +190,10 @@ Works together with spawning an observer, noted above.
 			else		
 				set_death_time(CREW, world.time)//Crew is the fallback

-
 		ghost.ckey = ckey
 		ghost.client = client
 		ghost.initialise_postkey()
 		if(ghost.client)
-
-
 			if(!ghost.client.holder && !config.antag_hud_allowed)		// For new ghosts we remove the verb from even showing up if it's not allowed.
 				ghost.verbs -= /mob/dead/observer/verb/toggle_antagHUD	// Poor guys, don't know what they are missing!
 		return ghost
@@ -210,7 +207,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set desc = "Relinquish your life and enter the land of the dead."

 	if(stat == DEAD)
-		announce_ghost_joinleave(ghostize(1))
+		announce_ghost_joinleave(ghostize(1, 0))
 	else
 		var/response
 		if(check_rights((R_MOD|R_ADMIN), 0))
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -11,8 +11,6 @@
 	mob_size = 9//Based on average weight of a human

 /mob/living/carbon/human/Initialize(mapload, var/new_species = null)
-	eat_types |= TYPE_ORGANIC//Any mobs that are given the devour verb, can eat nonhumanoid organics. Only applies to unathi for now
-
 	if(!dna)
 		dna = new /datum/dna(null)
 		// Species name is handled by set_species()
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -258,8 +258,6 @@ This saves us from having to call add_fingerprint() any time something is put in
 				update_hair(redraw_mob)	//rebuild hair
 				update_inv_ears(0)
 				update_inv_wear_mask(0)
-			if(istype(W,/obj/item/clothing/head/kitty))
-				W.update_icon(src)
 			W.equipped(src, slot)
 			update_inv_head(redraw_mob)
 		if(slot_shoes)
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -13,6 +13,7 @@
 	var/bodytype
 	var/age_min = 17
 	var/age_max = 85
+	var/economic_modifier = 0

 	// Icon/appearance vars.
 	var/icobase = 'icons/mob/human_races/r_human.dmi'    // Normal icon set.
@@ -148,6 +149,7 @@

 	var/gluttonous                // Can eat some mobs. Boolean.
 	var/mouth_size                // How big the mob's mouth is. Limits how large a mob this species can swallow. Only relevant if gluttonous is TRUE.
+	var/allowed_eat_types = TYPE_ORGANIC
 	var/max_nutrition_factor = 1	//Multiplier on maximum nutrition
 	var/nutrition_loss_factor = 1	//Multiplier on passive nutrition losses

@@ -337,6 +339,7 @@
 	H.pass_flags = pass_flags
 	H.mob_size = mob_size
 	H.mouth_size = mouth_size || 2
+	H.eat_types = allowed_eat_types
 	if(!kpg)
 		if(islesserform(H))
 			H.dna.SetSEState(MONKEYBLOCK,1)
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -5,8 +5,15 @@
 	name_plural = "Humans"
 	bodytype = "Human"
 	age_max = 125
+	economic_modifier = 12
+
 	primitive_form = "Monkey"
-	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite)
+	unarmed_types = list(
+		/datum/unarmed_attack/stomp,
+		/datum/unarmed_attack/kick,
+		/datum/unarmed_attack/punch,
+		/datum/unarmed_attack/bite
+	)
 	blurb = "Humanity originated in the Sol system, and over the last four centuries has spread colonies across a wide swathe of space. \
 	They hold a wide range of forms and creeds.<br><br>\
 	The Sol Alliance is still massively influential, but independent human nations have managed to shake off its dominance and forge their \
@@ -35,7 +42,12 @@
 	deform = 'icons/mob/human_races/r_def_lizard.dmi'
 	tail = "sogtail"
 	tail_animation = 'icons/mob/species/unathi/tail.dmi'
-	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
+	unarmed_types = list(
+		/datum/unarmed_attack/stomp,
+		/datum/unarmed_attack/kick,
+		/datum/unarmed_attack/claws,
+		/datum/unarmed_attack/bite/sharp
+	)
 	primitive_form = "Stok"
 	darksight = 3
 	gluttonous = 1
@@ -44,6 +56,7 @@
 	fall_mod = 1.2
 	ethanol_resistance = 0.4
 	taste_sensitivity = TASTE_SENSITIVE
+	economic_modifier = 7

 	num_alternate_languages = 2
 	secondary_langs = list(LANGUAGE_UNATHI, LANGUAGE_AZAZIBA)
@@ -110,13 +123,18 @@
 /datum/species/tajaran
 	name = "Tajara"
 	short_name = "taj"
-	name_plural = "Tajaran"
+	name_plural = "Tajara"
 	bodytype = "Tajara"
 	icobase = 'icons/mob/human_races/r_tajaran.dmi'
 	deform = 'icons/mob/human_races/r_def_tajaran.dmi'
 	tail = "tajtail"
 	tail_animation = 'icons/mob/species/tajaran/tail.dmi'
-	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
+	unarmed_types = list(
+		/datum/unarmed_attack/stomp,
+		/datum/unarmed_attack/kick,
+		/datum/unarmed_attack/claws,
+		/datum/unarmed_attack/bite/sharp
+	)
 	darksight = 8
 	slowdown = -1
 	brute_mod = 1.2
@@ -126,8 +144,9 @@
 	name_language = LANGUAGE_SIIK_MAAS
 	ethanol_resistance = 0.8//Gets drunk a little faster
 	rarity_value = 2
+	economic_modifier = 7

-	stamina	=	90			  // Tajarans evolved to maintain a steady pace in the snow, sprinting wastes energy
+	stamina = 90	// Tajara evolved to maintain a steady pace in the snow, sprinting wastes energy
 	stamina_recovery = 4
 	sprint_speed_factor = 0.65
 	sprint_cost_factor = 0.75
@@ -175,6 +194,7 @@
 	name_plural = "Skrell"
 	bodytype = "Skrell"
 	age_max = 500
+	economic_modifier = 10
 	icobase = 'icons/mob/human_races/r_skrell.dmi'
 	deform = 'icons/mob/human_races/r_def_skrell.dmi'
 	eyes = "skrell_eyes_s"
@@ -218,18 +238,22 @@
 	stamina = 90
 	sprint_speed_factor = 1.25 //Evolved for rapid escapes from predators

-
 /datum/species/diona
 	name = "Diona"
 	short_name = "dio"
 	name_plural = "Dionaea"
 	bodytype = "Diona"
 	age_max = 1000
+	economic_modifier = 3
 	icobase = 'icons/mob/human_races/r_diona.dmi'
 	deform = 'icons/mob/human_races/r_def_plant.dmi'
 	language = "Ceti Basic"
 	default_language = LANGUAGE_ROOTSONG
-	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/diona)
+	unarmed_types = list(
+		/datum/unarmed_attack/stomp,
+		/datum/unarmed_attack/kick,
+		/datum/unarmed_attack/diona
+	)
 	//primitive_form = "Nymph"
 	slowdown = 7
 	rarity_value = 4
@@ -331,8 +355,6 @@
 		H << span("danger", "We have expended our energy reserves, and cannot continue to move at such a pace. We must find light!")
 		return 0

-
-
 /datum/species/diona/can_understand(var/mob/other)
 	var/mob/living/carbon/alien/diona/D = other
 	if(istype(D))
@@ -360,7 +382,6 @@
 	else//Most of the stuff in the parent function doesnt apply to nymphs
 		add_inherent_verbs(H)

-
 /datum/species/diona/handle_death(var/mob/living/carbon/human/H, var/gibbed = 0)
 	if (!gibbed)
 		// This proc sleeps. Async it.
@@ -374,6 +395,7 @@
 	bodytype = "Machine"
 	age_min = 1
 	age_max = 30
+	economic_modifier = 3

 	blurb = "IPCs are, quite simply, 'Integrated Positronic Chassis'. In this scenario, positronic does not mean anything significant - it is a nickname given \
 	to all advanced processing units, based on the works of vintage writer Isaac Asimov. The long of the short is that they represent all unbound synthetic \
@@ -503,7 +525,7 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)

 		var/obj/item/organ/ipc_tag/tag = new_machine.internal_organs_by_name["ipc tag"]

-		var/status = 0
+		var/status = TRUE
 		var/list/query_details = list("ckey" = player.ckey, "character_name" = player.prefs.real_name)
 		var/DBQuery/query = dbcon.NewQuery("SELECT tag_status FROM ss13_ipc_tracking WHERE player_ckey = :ckey: AND character_name = :character_name:")
 		query.Execute(query_details)
@@ -511,12 +533,12 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)
 		if (query.NextRow())
 			status = text2num(query.item[1])
 		else
-			var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO ss13_ipc_tracking (player_ckey, character_name) VALUES (:ckey:, :character_name:)")
+			var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO ss13_ipc_tracking (player_ckey, character_name, tag_status) VALUES (:ckey:, :character_name:, 1)")
 			log_query.Execute(query_details)

 		if (!status)
-			new_machine.internal_organs_by_name.Remove("ipc tag")
-			new_machine.internal_organs.Remove(tag)
+			new_machine.internal_organs_by_name -= "ipc tag"
+			new_machine.internal_organs -= tag
 			qdel(tag)

 /datum/species/machine/proc/update_tag(var/mob/living/carbon/human/target, var/client/player)
@@ -524,10 +546,10 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)
 		return

 	if (establish_db_connection(dbcon))
-		var/status = 0
-		var/sql_status = 0
+		var/status = FALSE
+		var/sql_status = FALSE
 		if (target.internal_organs_by_name["ipc tag"])
-			status = 1
+			status = TRUE

 		var/list/query_details = list("ckey" = player.ckey, "character_name" = target.real_name)
 		var/DBQuery/query = dbcon.NewQuery("SELECT tag_status FROM ss13_ipc_tracking WHERE player_ckey = :ckey: AND character_name = :character_name:")
@@ -602,6 +624,7 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)
 	bodytype = "Vaurca"
 	age_min = 1
 	age_max = 20
+	economic_modifier = 1
 	language = LANGUAGE_VAURCA
 	primitive_form = "V'krexi"
 	greater_form = "Vaurca Warrior"
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
@@ -13,6 +13,7 @@
 	siemens_coefficient = 0
 	gluttonous = TRUE
 	mouth_size = 15	// Should be larger than any human-type.
+	allowed_eat_types = TYPE_ORGANIC | TYPE_SYNTHETIC | TYPE_HUMANOID
 	mob_size = 14
 	fall_mod = 0

--- a/code/modules/mob/living/devour.dm
+++ b/code/modules/mob/living/devour.dm
@@ -181,7 +181,7 @@
 			M.adjustBruteLoss(round(dmg_factor * 0.33, 0.1) || 0.1)
 			M.adjustFireLoss(round(dmg_factor * 0.66, 0.1) || 0.1)

-			ingested.add_reagent(M.composition_reagent, M.composition_reagent_quantity * 1/dmg_factor)
+			ingested.add_reagent(M.composition_reagent, M.composition_reagent_quantity * dmg_factor)

 			if (M.stat == DEAD && !stomach_contents[M])	// If the mob has died, poke the consuming mob about it.
 				src << "Your stomach feels a little more relaxed as \the [M] finally stops fighting."
--- a/code/modules/mob/living/living_powers.dm
+++ b/code/modules/mob/living/living_powers.dm
@@ -18,6 +18,7 @@
 	set name = "Devour Creature"
 	set desc = "Attempt to eat a nearby creature, swallowing it whole if small enough, or eating it piece by piece otherwise"
 	var/list/choices = list()
+
 	for(var/mob/living/C in view(1,src))

 		if((!(src.Adjacent(C)) || C == src)) continue//cant steal nymphs right out of other gestalts
@@ -26,7 +27,11 @@
 			var/mob/living/carbon/alien/diona/D = C
 			if (D.gestalt)
 				continue
-		choices.Add(C)
+
+		if (C in src)	// Just no.
+			continue
+
+		choices += C

 	var/mob/living/L = input(src,"Which creature do you wish to consume?") in null|choices

--- a/code/modules/mob/living/silicon/ai/icons.dm
+++ b/code/modules/mob/living/silicon/ai/icons.dm
@@ -155,7 +155,7 @@ var/list/datum/ai_icon/ai_icons
 	alive_icon = "ai-hades"
 	dead_icon = "ai-hades_dead"

-/datum/ai_icon/triumvirate_static
+/datum/ai_icon/triumvirate
 	name = "Triumvirate"
 	alive_icon = "ai-triumvirate"
 	alive_light = "#020B2B"
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -208,7 +208,7 @@
 					return alert("Communications circuits remain uninitialized.")

 				var/target = locate(href_list["target"])
-				P.pda.create_message(P, target, 1)
+				P.pda.create_message(P, target, 0)
 				return 1

 /datum/pai_software/med_records
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -615,7 +615,7 @@ var/global/list/robot_modules = list(
 					"Kent" = "toiletbot",
 					"Bro" = "brobot",
 					"Rich" = "maximillion",
-					"Basic" = "robotserv",
+					"Basic" = "robotServ",
 					"Drone - Service" = "drone-service",
 					"Drone - Hydro" = "drone-hydro",
 					"Classic" = "service2",
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -35,6 +35,9 @@
 	if (eyeobj)
 		return eyeobj.zMove(direction)

+	if (istype(src.loc,/obj/mecha))
+		return FALSE
+
 	// Check if we can actually travel a Z-level.
 	if (!can_ztravel(direction))
 		to_chat(src, "<span class='warning'>You lack means of travel in that direction.</span>")
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -145,7 +145,7 @@
 		return

 	if (user.a_intent == I_HELP && old_name && icon_state == "paper_plane")
-		user.visible_message(span("notice", "the [src] unfolds \the [src]."), span("notice", "You unfold \the [src]."), "You hear paper rustling.")
+		user.visible_message(span("notice", "\The [user] unfolds \the [src]."), span("notice", "You unfold \the [src]."), "You hear paper rustling.")
 		icon_state = initial(icon_state)
 		throw_range = initial(throw_range)
 		name = old_name
--- a/code/modules/projectiles/guns/energy/lawgiver.dm
+++ b/code/modules/projectiles/guns/energy/lawgiver.dm
@@ -3,9 +3,8 @@
 	icon_state = "lawgiver"
 	item_state = "gun"
 	origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 5)
-	projectile_type=/obj/item/projectile/bullet/pistol
-	fire_sound='sound/weapons/Gunshot_smg.ogg'
 	sel_mode = 1
+	var/mode_check = 1
 	desc = "A highly advanced firearm for the modern police force. It has multiple voice-activated firing modes."
 	var/dna	= null//dna-locking the firearm
 	var/emagged = 0 //if the gun is emagged or not
@@ -21,7 +20,13 @@
 			mode_name = "singleshot",
 			charge_cost = 50,
 			fire_delay = 3,
-			recoil=1
+			recoil = 1,
+			burst = null,
+			move_delay = null,
+			accuracy = null,
+			dispersion = null,
+			projectile_type = /obj/item/projectile/bullet/pistol,
+			fire_sound = 'sound/weapons/Gunshot_smg.ogg'
 		),
 		list(
 			mode_name = "rapidfire",
@@ -31,43 +36,78 @@
 			burst = 3,
 			move_delay = 4,
 			accuracy = list(0,-1,-1,-2,-2),
-			dispersion = list(0.0, 0.6, 1.0)
+			dispersion = list(0.0, 0.6, 1.0),
+			projectile_type = /obj/item/projectile/bullet/pistol,
+			fire_sound = 'sound/weapons/Gunshot_smg.ogg'
 		),
 		list(
 			mode_name = "highex",
-			charge_cost=300,
+			charge_cost = 400,
 			fire_delay = 6,
-			recoil=3
+			recoil = 3,
+			burst = null,
+			move_delay = null,
+			accuracy = null,
+			dispersion = null,
+			projectile_type = /obj/item/projectile/bullet/gyro/law,
+			fire_sound = 'sound/effects/Explosion1.ogg'
 		),
 		list(
 			mode_name = "stun",
 			charge_cost = 50,
 			fire_delay = 4,
-			recoil=0
+			recoil = 0,
+			burst = null,
+			move_delay = null,
+			accuracy = null,
+			dispersion = null,
+			projectile_type = /obj/item/projectile/beam/stun,
+			fire_sound = 'sound/weapons/Taser.ogg'
 		),
 		list(
 			mode_name = "hotshot",
-			charge_cost=200,
+			charge_cost = 250,
 			fire_delay = 4,
-			recoil=3
+			recoil = 3,
+			burst = null,
+			move_delay = null,
+			accuracy = null,
+			dispersion = null,
+			projectile_type = /obj/item/projectile/bullet/shotgun/incendiary,
+			fire_sound = 'sound/weapons/Gunshot.ogg'
 		),
 		list(
 			mode_name = "armorpiercing",
-			charge_cost=300,
+			charge_cost = 130,
 			fire_delay = 6,
-			recoil=3
+			recoil = 3,
+			burst = null,
+			move_delay = null,
+			accuracy = null,
+			dispersion = null,
+			projectile_type = /obj/item/projectile/bullet/rifle/a556,
+			fire_sound = 'sound/weapons/Gunshot.ogg'
 		),
 		list(
 			mode_name = "pellets",
-			charge_cost=300,
+			charge_cost = 250,
 			fire_delay = 6,
-			recoil=3
+			recoil = 3,
+			burst = null,
+			move_delay = null,
+			accuracy = null,
+			dispersion = null,
+			projectile_type = /obj/item/projectile/bullet/pellet/shotgun,
+			fire_sound = 'sound/weapons/Gunshot.ogg'
 		)
 	)

 /obj/item/weapon/gun/energy/lawgiver/Initialize()
 	. = ..()
 	listening_objects += src
+	power_supply = new /obj/item/weapon/cell/device/variable(src, 2000)
+	var/datum/firemode/new_mode = firemodes[sel_mode]
+	new_mode.apply_to(src)

 /obj/item/weapon/gun/energy/lawgiver/Destroy()
 	listening_objects -= src
@@ -138,38 +178,24 @@
 	/* Firing Modes*/
 	if(findtext(msg,"single"))
 		sel_mode = 1
-		projectile_type=/obj/item/projectile/bullet/pistol
-		fire_sound='sound/weapons/Gunshot_smg.ogg'
 		usr << "<span class='warning'>[src.name] is now set to single shot mode.</span>"
 	else if(findtext(msg,"rapidfire"))
 		sel_mode = 2
-		projectile_type=/obj/item/projectile/bullet/pistol
-		fire_sound='sound/weapons/Gunshot_smg.ogg'
 		usr << "<span class='warning'>[src.name] is now set to rapid fire mode.</span>"
 	else if(findtext(msg,"highex") || findtext(msg,"grenade"))
 		sel_mode = 3
-		projectile_type=/obj/item/projectile/bullet/gyro/law
-		fire_sound='sound/effects/Explosion1.ogg'
 		usr << "<span class='warning'>[src.name] is now set to high explosive mode.</span>"
 	else if(findtext(msg,"stun"))
 		sel_mode = 4
-		projectile_type=/obj/item/projectile/beam/stun
-		fire_sound='sound/weapons/Taser.ogg'
 		usr << "<span class='warning'>[src.name] is now set to stun mode.</span>"
 	else if(findtext(msg,"hotshot") || findtext(msg,"incendiary"))
 		sel_mode = 5
-		projectile_type=/obj/item/projectile/bullet/shotgun/incendiary
-		fire_sound='sound/weapons/Gunshot.ogg'
 		usr << "<span class='warning'>[src.name] is now set to incendiary mode.</span>"
 	else if(findtext(msg,"armorpiercing") || findtext(msg,"execution"))
 		sel_mode = 6
-		projectile_type=/obj/item/projectile/bullet/rifle/a556
-		fire_sound='sound/weapons/Gunshot.ogg'
 		usr << "<span class='warning'>[src.name] is now set to armorpiercing mode.</span>"
 	else if(findtext(msg,"pellets"))
 		sel_mode = 7
-		projectile_type=/obj/item/projectile/bullet/pellet/shotgun
-		fire_sound='sound/weapons/Gunshot.ogg'
 		usr << "<span class='warning'>[src.name] is now set to pellet mode.</span>"
 	/* Other Stuff */
 	else if(findtext(msg,"reset") && (findtext(msg,"user") || findtext(msg,"dna")))
@@ -188,5 +214,8 @@
 		message_enabled = 1
 		message_disable = 0
 		play_message()
-	else
-		return
+
+	if(mode_check != sel_mode)
+		var/datum/firemode/new_mode = firemodes[sel_mode]
+		new_mode.apply_to(src)
+		mode_check = sel_mode
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -354,6 +354,9 @@

 /datum/reagent/nutriment/flour/touch_turf(var/turf/simulated/T)
 	if(!istype(T, /turf/space))
+		if(locate(/obj/effect/decal/cleanable/flour) in T)
+			return
+
 		new /obj/effect/decal/cleanable/flour(T)

 /datum/reagent/nutriment/coco
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -38,6 +38,9 @@
 				if(istype(target, /mob/living/carbon/human))
 					var/mob/living/carbon/human/victim = target

+					if(victim.isSynthetic())
+						return
+
 					var/obj/item/safe_thing = null
 					if(victim.wear_mask)
 						if (victim.wear_mask.body_parts_covered & EYES)
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -4351,7 +4351,7 @@
 	filling_color = "#A8A8A8"
 	center_of_mass = list("x"=16, "y"=15)
 	nutriment_desc = list("chalk" = 3)
-	nutriment_amt = 3
+	nutriment_amt = 10

 /obj/item/weapon/reagent_containers/food/snacks/liquidfood/Initialize()
 	. = ..()
--- a/code/modules/virus2/centrifuge.dm
+++ b/code/modules/virus2/centrifuge.dm
@@ -29,8 +29,8 @@

 /obj/machinery/computer/centrifuge/update_icon()
 	..()
-	if(! (stat & (BROKEN|NOPOWER)) && (isolating || curing))
-		icon_state = "centrifuge_moving"
+	if(! (stat & (BROKEN|NOPOWER)))
+		icon_state = (isolating||curing ? "centrifuge_moving" : "centrifuge")

 /obj/machinery/computer/centrifuge/attack_hand(var/mob/user as mob)
 	if(..()) return
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,37 @@
 		-->
 		<div class="commit sansserif">

+			<h2 class="date">09 September 2017</h2>
+			<h3 class="author">Ezuo updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed the long broken Lawgiver code. It will now function as intended, with different firemodes using different charge values.</li>
+			</ul>
+
+			<h2 class="date">06 September 2017</h2>
+			<h3 class="author">Skull132 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Cameras will no longer lag the server to death whenever you click to jump to a turf that's outside the station.</li>
+			</ul>
+
+			<h2 class="date">05 September 2017</h2>
+			<h3 class="author">Lohikar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="experiment">Storage code has been tweaked so ore bags should no longer take multiple seconds to fill/empty.</li>
+				<li class="tweak">The ore summoner should actually transport useful amounts of ore now.</li>
+			</ul>
+
+			<h2 class="date">27 August 2017</h2>
+			<h3 class="author">Printer16 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Hunter killers can repair themselves now.</li>
+			</ul>
+
+			<h2 class="date">23 August 2017</h2>
+			<h3 class="author">Lohikar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Nursing Intern has been renamed to Medical Resident.</li>
+			</ul>
+
 			<h2 class="date">15 August 2017</h2>
 			<h3 class="author">Lohikar updated:</h3>
 			<ul class="changes bgimages16">
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4534,3 +4534,22 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
  Lohikar:
  - bugfix: Vaurca now have two hearts and one set of lungs as was originally intended
      instead of three hearts and two sets of lungs.
+2017-08-23:
+  Lohikar:
+  - tweak: Nursing Intern has been renamed to Medical Resident.
+2017-08-27:
+  Printer16:
+  - bugfix: Hunter killers can repair themselves now.
+2017-09-05:
+  Lohikar:
+  - experiment: Storage code has been tweaked so ore bags should no longer take multiple
+      seconds to fill/empty.
+  - tweak: The ore summoner should actually transport useful amounts of ore now.
+2017-09-06:
+  Skull132:
+  - bugfix: Cameras will no longer lag the server to death whenever you click to jump
+      to a turf that's outside the station.
+2017-09-09:
+  Ezuo:
+  - bugfix: Fixed the long broken Lawgiver code. It will now function as intended,
+      with different firemodes using different charge values.
--- a/icons/obj/closet.dmi
+++ b/icons/obj/closet.dmi
--- a/icons/obj/custom_items/birkin_uniform.dmi
+++ b/icons/obj/custom_items/birkin_uniform.dmi
--- a/icons/obj/custom_items/ellie_uniform.dmi
+++ b/icons/obj/custom_items/ellie_uniform.dmi
--- a/icons/obj/custom_items/hikmat_shoes.dmi
+++ b/icons/obj/custom_items/hikmat_shoes.dmi
--- a/icons/obj/custom_items/leonce_cognac.dmi
+++ b/icons/obj/custom_items/leonce_cognac.dmi
--- a/icons/obj/custom_items/sayyidah_dress.dmi
+++ b/icons/obj/custom_items/sayyidah_dress.dmi
--- a/icons/obj/custom_items/sonorous_clothing.dmi
+++ b/icons/obj/custom_items/sonorous_clothing.dmi
--- a/icons/obj/custom_items/zhilin_necklace.dmi
+++ b/icons/obj/custom_items/zhilin_necklace.dmi
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -41323,13 +41323,13 @@
 	dir = 10
 	},
 /obj/effect/landmark/start{
-	name = "Nursing Intern"
+	name = "Medical Resident"
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay2)
 "btj" = (
 /obj/effect/landmark/start{
-	name = "Nursing Intern"
+	name = "Medical Resident"
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay2)