Ohkay

code/modules/antagonists/disease/disease_abilities.dm

@@ -57,7 +57,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	var/short_desc = ""
 	var/long_desc = ""
 	var/stat_block = ""
-	var/threshold_block = ""
+	var/threshold_block = list()
 	var/category = ""
 
 	var/list/symptoms
@@ -76,7 +76,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 			resistance += initial(S.resistance)
 			stage_speed += initial(S.stage_speed)
 			transmittable += initial(S.transmittable)
-			threshold_block += "<br><br>[initial(S.threshold_desc)]"
+			threshold_block += initial(S.threshold_desc) 
 			stat_block = "Resistance: [resistance]<br>Stealth: [stealth]<br>Stage Speed: [stage_speed]<br>Transmissibility: [transmittable]<br><br>"
 			if(symptoms.len == 1) //lazy boy's dream
 				name = initial(S.name)

code/modules/antagonists/disease/disease_mob.dm

@@ -318,7 +318,11 @@ the new instance inside the host to be updated to the template's stats.
 	var/list/dat = list()
 
 	if(examining_ability)
-		dat += "<a href='byond://?src=[REF(src)];main_menu=1'>Back</a><br><h1>[examining_ability.name]</h1>[examining_ability.stat_block][examining_ability.long_desc][examining_ability.threshold_block]"
+		dat += "<a href='byond://?src=[REF(src)];main_menu=1'>Back</a><br>"
+		dat += "<h1>[examining_ability.name]</h1>"
+		dat += "[examining_ability.stat_block][examining_ability.long_desc][examining_ability.threshold_block]"
+		for(var/entry in examining_ability.threshold_block)
+			dat += "<b>[entry]</b>: [examining_ability.threshold_block[entry]]<br>"
 	else
 		dat += "<h1>Disease Statistics</h1><br>\
 			Resistance: [DT.totalResistance()]<br>\

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -11,9 +11,10 @@
 	var/default_timer_set = 90
 	var/minimum_timer_set = 90
 	var/maximum_timer_set = 3600
-	var/ui_style = "nanotrasen"
+	ui_style = "nanotrasen"
 
 	var/numeric_input = ""
+	var/ui_mode = NUKEUI_AWAIT_DISK
 	var/timing = FALSE
 	var/exploding = FALSE
 	var/exploded = FALSE
@@ -97,6 +98,8 @@
 		if(!user.transferItemToLoc(I, src))
 			return
 		auth = I
+		update_ui_mode()
+		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
 		add_fingerprint(user)
 		return
 
@@ -233,113 +236,154 @@
 			var/volume = (get_time_left() <= 20 ? 30 : 5)
 			playsound(loc, 'sound/items/timer.ogg', volume, 0)
 
+/obj/machinery/nuclearbomb/proc/update_ui_mode()
+	if(exploded)
+		ui_mode = NUKEUI_EXPLODED
+		return
+
+	if(!auth)
+		ui_mode = NUKEUI_AWAIT_DISK
+		return
+
+	if(timing)
+		ui_mode = NUKEUI_TIMING
+		return
+
+	if(!safety)
+		ui_mode = NUKEUI_AWAIT_ARM
+		return
+
+	if(!yes_code)
+		ui_mode = NUKEUI_AWAIT_CODE
+		return
+
+	ui_mode = NUKEUI_AWAIT_TIMER
+
+
 /obj/machinery/nuclearbomb/ui_interact(mob/user, ui_key="main", datum/tgui/ui=null, force_open=0, datum/tgui/master_ui=null, datum/ui_state/state=GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "nuclear_bomb", name, 500, 600, master_ui, state)
+		ui = new(user, src, ui_key, "nuclear_bomb", name, 350, 442, master_ui, state)
 		ui.set_style(ui_style)
 		ui.open()
 
 /obj/machinery/nuclearbomb/ui_data(mob/user)
 	var/list/data = list()
 	data["disk_present"] = auth
-	data["code_approved"] = yes_code
-	var/first_status
-	if(auth)
-		if(yes_code)
-			first_status = timing ? "Func/Set" : "Functional"
-		else
-			first_status = "Auth S2."
+	var/hidden_code = (ui_mode == NUKEUI_AWAIT_CODE && numeric_input != "ERROR")
+	var/current_code = ""
+	if(hidden_code)
+		while(length(current_code) < length(numeric_input))
+			current_code = "[current_code]*"
 	else
-		if(timing)
-			first_status = "Set"
-		else
-			first_status = "Auth S1."
-	var/second_status = exploded ? "Warhead triggered, thanks for flying Nanotrasen" : (safety ? "Safe" : "Engaged")
-	data["status1"] = first_status
-	data["status2"] = second_status
-	data["anchored"] = anchored
-	data["safety"] = safety
-	data["timing"] = timing
-	data["time_left"] = get_time_left()
-
-	data["timer_set"] = timer_set
-	data["timer_is_not_default"] = timer_set != default_timer_set
-	data["timer_is_not_min"] = timer_set != minimum_timer_set
-	data["timer_is_not_max"] = timer_set != maximum_timer_set
-
-	var/message = "AUTH"
-	if(auth)
-		message = "[numeric_input]"
-		if(yes_code)
-			message = "*****"
-	data["message"] = message
+		current_code = numeric_input
+	while(length(current_code) < 5)
+		current_code = "[current_code]-"
+	var/first_status = null
+	var/second_status = null
+	switch(ui_mode)
+		if(NUKEUI_AWAIT_DISK)
+			first_status = "DEVICE LOCKED"
+			if(timing)
+				second_status = "TIME: [get_time_left()]"
+			else
+				second_status = "AWAIT DISK"
+		if(NUKEUI_AWAIT_CODE)
+			first_status = "INPUT CODE"
+			second_status = "CODE: [current_code]"
+		if(NUKEUI_AWAIT_TIMER)
+			first_status = "INPUT TIME"
+			second_status = "TIME: [current_code]"
+		if(NUKEUI_AWAIT_ARM)
+			first_status = "DEVICE READY"
+			second_status = "TIME: [get_time_left()]"
+		if(NUKEUI_TIMING)
+			first_status = "DEVICE ARMED"
+			second_status = "TIME: [get_time_left()]"
+		if(NUKEUI_EXPLODED)
+			first_status = "DEVICE DEPLOYED"
+			second_status = "THANK YOU"
 
 	return data
 
 /obj/machinery/nuclearbomb/ui_act(action, params)
 	if(..())
 		return
+	playsound(src, "terminal_type", 20, FALSE)
 	switch(action)
 		if("eject_disk")
 			if(auth && auth.loc == src)
+				playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
+				playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE)
 				auth.forceMove(get_turf(src))
 				auth = null
 				. = TRUE
-		if("insert_disk")
-			if(!auth)
+			else
 				var/obj/item/I = usr.is_holding_item_of_type(/obj/item/disk/nuclear)
 				if(I && disk_check(I) && usr.transferItemToLoc(I, src))
+					playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
+					playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE)
 					auth = I
 					. = TRUE
+			update_ui_mode()
 		if("keypad")
 			if(auth)
 				var/digit = params["digit"]
 				switch(digit)
-					if("R")
+					if("C")
+						if(auth && ui_mode == NUKEUI_AWAIT_ARM)
+							set_safety()
+							yes_code = FALSE
+							playsound(src, 'sound/machines/nuke/confirm_beep.ogg', 50, FALSE)
+							update_ui_mode()
+						else
+							playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE)
 						numeric_input = ""
-						yes_code = FALSE
 						. = TRUE
 					if("E")
-						if(numeric_input == r_code)
-							numeric_input = ""
-							yes_code = TRUE
-							. = TRUE
-						else
-							numeric_input = "ERROR"
+						switch(ui_mode)
+							if(NUKEUI_AWAIT_CODE)
+								if(numeric_input == r_code)
+									numeric_input = ""
+									yes_code = TRUE
+									playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE)
+									. = TRUE
+								else
+									playsound(src, 'sound/machines/nuke/angry_beep.ogg', 50, FALSE)
+									numeric_input = "ERROR"
+							if(NUKEUI_AWAIT_TIMER)
+								var/number_value = text2num(numeric_input)
+								if(number_value)
+									timer_set = CLAMP(number_value, minimum_timer_set, maximum_timer_set)
+									playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE)
+									set_safety()
+									. = TRUE
+							else
+								playsound(src, 'sound/machines/nuke/angry_beep.ogg', 50, FALSE)
+						update_ui_mode()
 					if("0","1","2","3","4","5","6","7","8","9")
 						if(numeric_input != "ERROR")
 							numeric_input += digit
 							if(length(numeric_input) > 5)
 								numeric_input = "ERROR"
+							else
+								playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE)
 							. = TRUE
-		if("timer")
-			if(auth && yes_code)
-				var/change = params["change"]
-				if(change == "reset")
-					timer_set = default_timer_set
-				else if(change == "decrease")
-					timer_set = max(minimum_timer_set, timer_set - 10)
-				else if(change == "increase")
-					timer_set = min(maximum_timer_set, timer_set + 10)
-				else if(change == "input")
-					var/user_input = input(usr, "Set time to detonation.", name) as null|num
-					if(!user_input)
-						return
-					var/N = text2num(user_input)
-					if(!N)
-						return
-					timer_set = CLAMP(N,minimum_timer_set,maximum_timer_set)
-				. = TRUE
-		if("safety")
-			if(auth && yes_code && !exploded)
-				set_safety()
+			else
+				playsound(src, 'sound/machines/nuke/angry_beep.ogg', 50, FALSE)
+		if("arm")
+			if(auth && yes_code && !safety && !exploded)
+				playsound(src, 'sound/machines/nuke/confirm_beep.ogg', 50, FALSE)
+				set_active()
+				update_ui_mode()
+			else
+				playsound(src, 'sound/machines/nuke/angry_beep.ogg', 50, FALSE)
 		if("anchor")
 			if(auth && yes_code)
+				playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE)
 				set_anchor()
-		if("toggle_timer")
-			if(auth && yes_code && !safety && !exploded)
-				set_active()
+			else
+				playsound(src, 'sound/machines/nuke/angry_beep.ogg', 50, FALSE)
 
 
 /obj/machinery/nuclearbomb/proc/set_anchor()

code/modules/antagonists/swarmer/swarmer.dm

@@ -19,6 +19,7 @@
 	job_description = "Swarmer"
 	death = FALSE
 	roundstart = FALSE
+	short_desc = "You are a swarmer, a weapon of a long dead civilization."
 	flavour_text = {"
 	<b>You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate.</b>
 	<b>Clicking on any object will try to consume it, either deconstructing it into its components, destroying it, or integrating any materials it has into you if successful.</b>

code/modules/atmospherics/machinery/components/trinary_devices/filter.dm

@@ -203,7 +203,7 @@
 																	datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_filter", name, 475, 195, master_ui, state)
+		ui = new(user, src, ui_key, "atmos_filter", name, 475, 185, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/trinary/filter/ui_data()

code/modules/atmospherics/machinery/portable/pump.dm

@@ -1,156 +1,158 @@
-#define PUMP_OUT "out"
-#define PUMP_IN "in"
-#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 25)
-#define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10)
-#define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE)
-
-/obj/machinery/portable_atmospherics/pump
-	name = "portable air pump"
-	icon_state = "psiphon:0"
-	density = TRUE
-
-	var/on = FALSE
-	var/direction = PUMP_OUT
-	var/obj/machinery/atmospherics/components/binary/pump/pump
-
-	volume = 1000
-
-/obj/machinery/portable_atmospherics/pump/Initialize()
-	. = ..()
-	pump = new(src, FALSE)
-	pump.on = TRUE
-	pump.stat = 0
-	pump.build_network()
-
-/obj/machinery/portable_atmospherics/pump/Destroy()
-	var/turf/T = get_turf(src)
-	T.assume_air(air_contents)
-	air_update_turf()
-	QDEL_NULL(pump)
-	return ..()
-
-/obj/machinery/portable_atmospherics/pump/update_icon()
-	icon_state = "psiphon:[on]"
-
-	cut_overlays()
-	if(holding)
-		add_overlay("siphon-open")
-	if(connected_port)
-		add_overlay("siphon-connector")
-
-/obj/machinery/portable_atmospherics/pump/process_atmos()
-	..()
-	if(!on)
-		pump.airs[1] = null
-		pump.airs[2] = null
-		return
-
-	var/turf/T = get_turf(src)
-	if(direction == PUMP_OUT) // Hook up the internal pump.
-		pump.airs[1] = holding ? holding.air_contents : air_contents
-		pump.airs[2] = holding ? air_contents : T.return_air()
-	else
-		pump.airs[1] = holding ? air_contents : T.return_air()
-		pump.airs[2] = holding ? holding.air_contents : air_contents
-
-	pump.process_atmos() // Pump gas.
-	if(!holding)
-		air_update_turf() // Update the environment if needed.
-
-/obj/machinery/portable_atmospherics/pump/emp_act(severity)
-	. = ..()
-	if(. & EMP_PROTECT_SELF)
-		return
-	if(is_operational())
-		if(prob(50 / severity))
-			on = !on
-		if(prob(100 / severity))
-			direction = PUMP_OUT
-		pump.target_pressure = rand(0, 100 * ONE_ATMOSPHERE)
-		update_icon()
-
-/obj/machinery/portable_atmospherics/pump/replace_tank(mob/living/user, close_valve)
-	. = ..()
-	if(.)
-		if(close_valve)
-			if(on)
-				on = FALSE
-				update_icon()
-		else if(on && holding && direction == PUMP_OUT)
-			investigate_log("[key_name(user)] started a transfer into [holding].<br>", INVESTIGATE_ATMOS)
-
-
-/obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "portable_pump", name, 420, 415, master_ui, state)
-		ui.open()
-
-/obj/machinery/portable_atmospherics/pump/ui_data()
-	var/data = list()
-	data["on"] = on
-	data["direction"] = direction
-	data["connected"] = connected_port ? 1 : 0
-	data["pressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
-	data["target_pressure"] = round(pump.target_pressure ? pump.target_pressure : 0)
-	data["default_pressure"] = round(PUMP_DEFAULT_PRESSURE)
-	data["min_pressure"] = round(PUMP_MIN_PRESSURE)
-	data["max_pressure"] = round(PUMP_MAX_PRESSURE)
-
-	if(holding)
-		data["holding"] = list()
-		data["holding"]["name"] = holding.name
-		data["holding"]["pressure"] = round(holding.air_contents.return_pressure())
-	return data
-
-/obj/machinery/portable_atmospherics/pump/ui_act(action, params)
-	if(..())
-		return
-	switch(action)
-		if("power")
-			on = !on
-			if(on && !holding)
-				var/plasma = air_contents.gases[/datum/gas/plasma]
-				var/n2o = air_contents.gases[/datum/gas/nitrous_oxide]
-				if(n2o || plasma)
-					message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [ADMIN_VERBOSEJMP(src)]")
-					log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [AREACOORD(src)]")
-			else if(on && direction == PUMP_OUT)
-				investigate_log("[key_name(usr)] started a transfer into [holding].<br>", INVESTIGATE_ATMOS)
-			. = TRUE
-		if("direction")
-			if(direction == PUMP_OUT)
-				direction = PUMP_IN
-			else
-				if(on && holding)
-					investigate_log("[key_name(usr)] started a transfer into [holding].<br>", INVESTIGATE_ATMOS)
-				direction = PUMP_OUT
-			. = TRUE
-		if("pressure")
-			var/pressure = params["pressure"]
-			if(pressure == "reset")
-				pressure = PUMP_DEFAULT_PRESSURE
-				. = TRUE
-			else if(pressure == "min")
-				pressure = PUMP_MIN_PRESSURE
-				. = TRUE
-			else if(pressure == "max")
-				pressure = PUMP_MAX_PRESSURE
-				. = TRUE
-			else if(pressure == "input")
-				pressure = input("New release pressure ([PUMP_MIN_PRESSURE]-[PUMP_MAX_PRESSURE] kPa):", name, pump.target_pressure) as num|null
-				if(!isnull(pressure) && !..())
-					. = TRUE
-			else if(text2num(pressure) != null)
-				pressure = text2num(pressure)
-				. = TRUE
-			if(.)
-				pump.target_pressure = CLAMP(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE)
-				investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS)
-		if("eject")
-			if(holding)
-				holding.forceMove(drop_location())
-				holding = null
-				. = TRUE
-	update_icon()
+#define PUMP_OUT "out"
+#define PUMP_IN "in"
+#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 25)
+#define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10)
+#define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE)
+
+/obj/machinery/portable_atmospherics/pump
+	name = "portable air pump"
+	icon_state = "psiphon:0"
+	density = TRUE
+
+	var/on = FALSE
+	var/direction = PUMP_OUT
+	var/obj/machinery/atmospherics/components/binary/pump/pump
+
+	volume = 1000
+
+/obj/machinery/portable_atmospherics/pump/Initialize()
+	. = ..()
+	pump = new(src, FALSE)
+	pump.on = TRUE
+	pump.stat = 0
+	pump.build_network()
+
+/obj/machinery/portable_atmospherics/pump/Destroy()
+	var/turf/T = get_turf(src)
+	T.assume_air(air_contents)
+	air_update_turf()
+	QDEL_NULL(pump)
+	return ..()
+
+/obj/machinery/portable_atmospherics/pump/update_icon()
+	icon_state = "psiphon:[on]"
+
+	cut_overlays()
+	if(holding)
+		add_overlay("siphon-open")
+	if(connected_port)
+		add_overlay("siphon-connector")
+
+/obj/machinery/portable_atmospherics/pump/process_atmos()
+	..()
+	if(!on)
+		pump.airs[1] = null
+		pump.airs[2] = null
+		return
+
+	var/turf/T = get_turf(src)
+	if(direction == PUMP_OUT) // Hook up the internal pump.
+		pump.airs[1] = holding ? holding.air_contents : air_contents
+		pump.airs[2] = holding ? air_contents : T.return_air()
+	else
+		pump.airs[1] = holding ? air_contents : T.return_air()
+		pump.airs[2] = holding ? holding.air_contents : air_contents
+
+	pump.process_atmos() // Pump gas.
+	if(!holding)
+		air_update_turf() // Update the environment if needed.
+
+/obj/machinery/portable_atmospherics/pump/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
+	if(is_operational())
+		if(prob(50 / severity))
+			on = !on
+		if(prob(100 / severity))
+			direction = PUMP_OUT
+		pump.target_pressure = rand(0, 100 * ONE_ATMOSPHERE)
+		update_icon()
+
+/obj/machinery/portable_atmospherics/pump/replace_tank(mob/living/user, close_valve)
+	. = ..()
+	if(.)
+		if(close_valve)
+			if(on)
+				on = FALSE
+				update_icon()
+		else if(on && holding && direction == PUMP_OUT)
+			investigate_log("[key_name(user)] started a transfer into [holding].<br>", INVESTIGATE_ATMOS)
+
+
+/obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "portable_pump", name, 300, 315, master_ui, state)
+		ui.open()
+
+/obj/machinery/portable_atmospherics/pump/ui_data()
+	var/data = list()
+	data["on"] = on
+	data["direction"] = direction == PUMP_IN ? TRUE : FALSE
+	data["connected"] = connected_port ? TRUE : FALSE
+	data["pressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
+	data["target_pressure"] = round(pump.target_pressure ? pump.target_pressure : 0)
+	data["default_pressure"] = round(PUMP_DEFAULT_PRESSURE)
+	data["min_pressure"] = round(PUMP_MIN_PRESSURE)
+	data["max_pressure"] = round(PUMP_MAX_PRESSURE)
+
+	if(holding)
+		data["holding"] = list()
+		data["holding"]["name"] = holding.name
+		data["holding"]["pressure"] = round(holding.air_contents.return_pressure())
+	else
+		data["holding"] = null
+	return data
+
+/obj/machinery/portable_atmospherics/pump/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("power")
+			on = !on
+			if(on && !holding)
+				var/plasma = air_contents.gases[/datum/gas/plasma]
+				var/n2o = air_contents.gases[/datum/gas/nitrous_oxide]
+				if(n2o || plasma)
+					message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [ADMIN_VERBOSEJMP(src)]")
+					log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [AREACOORD(src)]")
+			else if(on && direction == PUMP_OUT)
+				investigate_log("[key_name(usr)] started a transfer into [holding].<br>", INVESTIGATE_ATMOS)
+			. = TRUE
+		if("direction")
+			if(direction == PUMP_OUT)
+				direction = PUMP_IN
+			else
+				if(on && holding)
+					investigate_log("[key_name(usr)] started a transfer into [holding].<br>", INVESTIGATE_ATMOS)
+				direction = PUMP_OUT
+			. = TRUE
+		if("pressure")
+			var/pressure = params["pressure"]
+			if(pressure == "reset")
+				pressure = PUMP_DEFAULT_PRESSURE
+				. = TRUE
+			else if(pressure == "min")
+				pressure = PUMP_MIN_PRESSURE
+				. = TRUE
+			else if(pressure == "max")
+				pressure = PUMP_MAX_PRESSURE
+				. = TRUE
+			else if(pressure == "input")
+				pressure = input("New release pressure ([PUMP_MIN_PRESSURE]-[PUMP_MAX_PRESSURE] kPa):", name, pump.target_pressure) as num|null
+				if(!isnull(pressure) && !..())
+					. = TRUE
+			else if(text2num(pressure) != null)
+				pressure = text2num(pressure)
+				. = TRUE
+			if(.)
+				pump.target_pressure = CLAMP(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE)
+				investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS)
+		if("eject")
+			if(holding)
+				holding.forceMove(drop_location())
+				holding = null
+				. = TRUE
+	update_icon()

code/modules/atmospherics/machinery/portable/scrubber.dm

@@ -1,144 +1,146 @@
-/obj/machinery/portable_atmospherics/scrubber
-	name = "portable air scrubber"
-	icon_state = "pscrubber:0"
-	density = TRUE
-
-	var/on = FALSE
-	var/volume_rate = 1000
-	volume = 1000
-
-	var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitryl, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor)
-
-/obj/machinery/portable_atmospherics/scrubber/Destroy()
-	var/turf/T = get_turf(src)
-	T.assume_air(air_contents)
-	air_update_turf()
-	return ..()
-
-/obj/machinery/portable_atmospherics/scrubber/update_icon()
-	icon_state = "pscrubber:[on]"
-
-	cut_overlays()
-	if(holding)
-		add_overlay("scrubber-open")
-	if(connected_port)
-		add_overlay("scrubber-connector")
-
-/obj/machinery/portable_atmospherics/scrubber/process_atmos()
-	..()
-	if(!on)
-		return
-
-	if(holding)
-		scrub(holding.air_contents)
-	else
-		var/turf/T = get_turf(src)
-		scrub(T.return_air())
-
-/obj/machinery/portable_atmospherics/scrubber/proc/scrub(var/datum/gas_mixture/mixture)
-	var/transfer_moles = min(1, volume_rate / mixture.volume) * mixture.total_moles()
-
-	var/datum/gas_mixture/filtering = mixture.remove(transfer_moles) // Remove part of the mixture to filter.
-	var/datum/gas_mixture/filtered = new
-	if(!filtering)
-		return
-
-	filtered.temperature = filtering.temperature
-	for(var/gas in filtering.gases & scrubbing)
-		filtered.gases[gas] = filtering.gases[gas] // Shuffle the "bad" gasses to the filtered mixture.
-		filtering.gases[gas] = 0
-	GAS_GARBAGE_COLLECT(filtering.gases)
-
-	air_contents.merge(filtered) // Store filtered out gasses.
-	mixture.merge(filtering) // Returned the cleaned gas.
-	if(!holding)
-		air_update_turf()
-
-/obj/machinery/portable_atmospherics/scrubber/emp_act(severity)
-	. = ..()
-	if(. & EMP_PROTECT_SELF)
-		return
-	if(is_operational())
-		if(prob(50 / severity))
-			on = !on
-		update_icon()
-
-/obj/machinery/portable_atmospherics/scrubber/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "portable_scrubber", name, 420, 435, master_ui, state)
-		ui.open()
-
-/obj/machinery/portable_atmospherics/scrubber/ui_data()
-	var/data = list()
-	data["on"] = on
-	data["connected"] = connected_port ? 1 : 0
-	data["pressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
-
-	data["id_tag"] = -1 //must be defined in order to reuse code between portable and vent scrubbers
-	data["filter_types"] = list()
-	for(var/path in GLOB.meta_gas_ids)
-		data["filter_types"] += list(list("gas_id" = GLOB.meta_gas_ids[path], "gas_name" = GLOB.meta_gas_names[path], "enabled" = (path in scrubbing)))
-
-	if(holding)
-		data["holding"] = list()
-		data["holding"]["name"] = holding.name
-		data["holding"]["pressure"] = round(holding.air_contents.return_pressure())
-	return data
-
-/obj/machinery/portable_atmospherics/scrubber/ui_act(action, params)
-	if(..())
-		return
-	switch(action)
-		if("power")
-			on = !on
-			. = TRUE
-		if("eject")
-			if(holding)
-				holding.forceMove(drop_location())
-				holding = null
-				. = TRUE
-		if("toggle_filter")
-			scrubbing ^= gas_id2path(params["val"])
-			. = TRUE
-	update_icon()
-
-/obj/machinery/portable_atmospherics/scrubber/huge
-	name = "huge air scrubber"
-	icon_state = "scrubber:0"
-	anchored = TRUE
-	active_power_usage = 500
-	idle_power_usage = 10
-
-	volume_rate = 1500
-	volume = 50000
-
-	var/movable = FALSE
-
-/obj/machinery/portable_atmospherics/scrubber/huge/movable
-	movable = TRUE
-
-/obj/machinery/portable_atmospherics/scrubber/huge/update_icon()
-	icon_state = "scrubber:[on]"
-
-/obj/machinery/portable_atmospherics/scrubber/huge/process_atmos()
-	if((!anchored && !movable) || !is_operational())
-		on = FALSE
-		update_icon()
-	use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE
-	if(!on)
-		return
-
-	..()
-	if(!holding)
-		var/turf/T = get_turf(src)
-		for(var/turf/AT in T.GetAtmosAdjacentTurfs(alldir = TRUE))
-			scrub(AT.return_air())
-
-/obj/machinery/portable_atmospherics/scrubber/huge/attackby(obj/item/W, mob/user)
-	if(default_unfasten_wrench(user, W))
-		if(!movable)
-			on = FALSE
-	else
-		return ..()
+/obj/machinery/portable_atmospherics/scrubber
+	name = "portable air scrubber"
+	icon_state = "pscrubber:0"
+	density = TRUE
+
+	var/on = FALSE
+	var/volume_rate = 1000
+	volume = 1000
+
+	var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitryl, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor)
+
+/obj/machinery/portable_atmospherics/scrubber/Destroy()
+	var/turf/T = get_turf(src)
+	T.assume_air(air_contents)
+	air_update_turf()
+	return ..()
+
+/obj/machinery/portable_atmospherics/scrubber/update_icon()
+	icon_state = "pscrubber:[on]"
+
+	cut_overlays()
+	if(holding)
+		add_overlay("scrubber-open")
+	if(connected_port)
+		add_overlay("scrubber-connector")
+
+/obj/machinery/portable_atmospherics/scrubber/process_atmos()
+	..()
+	if(!on)
+		return
+
+	if(holding)
+		scrub(holding.air_contents)
+	else
+		var/turf/T = get_turf(src)
+		scrub(T.return_air())
+
+/obj/machinery/portable_atmospherics/scrubber/proc/scrub(var/datum/gas_mixture/mixture)
+	var/transfer_moles = min(1, volume_rate / mixture.volume) * mixture.total_moles()
+
+	var/datum/gas_mixture/filtering = mixture.remove(transfer_moles) // Remove part of the mixture to filter.
+	var/datum/gas_mixture/filtered = new
+	if(!filtering)
+		return
+
+	filtered.temperature = filtering.temperature
+	for(var/gas in filtering.gases & scrubbing)
+		filtered.gases[gas] = filtering.gases[gas] // Shuffle the "bad" gasses to the filtered mixture.
+		filtering.gases[gas] = 0
+	GAS_GARBAGE_COLLECT(filtering.gases)
+
+	air_contents.merge(filtered) // Store filtered out gasses.
+	mixture.merge(filtering) // Returned the cleaned gas.
+	if(!holding)
+		air_update_turf()
+
+/obj/machinery/portable_atmospherics/scrubber/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
+	if(is_operational())
+		if(prob(50 / severity))
+			on = !on
+		update_icon()
+
+/obj/machinery/portable_atmospherics/scrubber/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "portable_scrubber", name, 320, 335, master_ui, state)
+		ui.open()
+
+/obj/machinery/portable_atmospherics/scrubber/ui_data()
+	var/data = list()
+	data["on"] = on
+	data["connected"] = connected_port ? 1 : 0
+	data["pressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
+
+	data["id_tag"] = -1 //must be defined in order to reuse code between portable and vent scrubbers
+	data["filter_types"] = list()
+	for(var/path in GLOB.meta_gas_ids)
+		data["filter_types"] += list(list("gas_id" = GLOB.meta_gas_ids[path], "gas_name" = GLOB.meta_gas_names[path], "enabled" = (path in scrubbing)))
+
+	if(holding)
+		data["holding"] = list()
+		data["holding"]["name"] = holding.name
+		data["holding"]["pressure"] = round(holding.air_contents.return_pressure())
+	else
+		data["holding"] = null
+	return data
+
+/obj/machinery/portable_atmospherics/scrubber/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("power")
+			on = !on
+			. = TRUE
+		if("eject")
+			if(holding)
+				holding.forceMove(drop_location())
+				holding = null
+				. = TRUE
+		if("toggle_filter")
+			scrubbing ^= gas_id2path(params["val"])
+			. = TRUE
+	update_icon()
+
+/obj/machinery/portable_atmospherics/scrubber/huge
+	name = "huge air scrubber"
+	icon_state = "scrubber:0"
+	anchored = TRUE
+	active_power_usage = 500
+	idle_power_usage = 10
+
+	volume_rate = 1500
+	volume = 50000
+
+	var/movable = FALSE
+
+/obj/machinery/portable_atmospherics/scrubber/huge/movable
+	movable = TRUE
+
+/obj/machinery/portable_atmospherics/scrubber/huge/update_icon()
+	icon_state = "scrubber:[on]"
+
+/obj/machinery/portable_atmospherics/scrubber/huge/process_atmos()
+	if((!anchored && !movable) || !is_operational())
+		on = FALSE
+		update_icon()
+	use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE
+	if(!on)
+		return
+
+	..()
+	if(!holding)
+		var/turf/T = get_turf(src)
+		for(var/turf/AT in T.GetAtmosAdjacentTurfs(alldir = TRUE))
+			scrub(AT.return_air())
+
+/obj/machinery/portable_atmospherics/scrubber/huge/attackby(obj/item/W, mob/user)
+	if(default_unfasten_wrench(user, W))
+		if(!movable)
+			on = FALSE
+	else
+		return ..()

code/modules/awaymissions/corpse.dm

@@ -13,7 +13,9 @@
 	var/death = TRUE //Kill the mob
 	var/roundstart = TRUE //fires on initialize
 	var/instant = FALSE	//fires on New
-	var/flavour_text = "The mapper forgot to set this!"
+	var/short_desc = "The mapper forgot to set this!"
+	var/flavour_text = ""
+	var/important_info = ""
 	var/faction = null
 	var/permanent = FALSE	//If true, the spawner will not disappear upon running out of uses.
 	var/random = FALSE		//Don't set a name or gender, just go random
@@ -110,7 +112,12 @@
 	if(ckey)
 		M.ckey = ckey
 		if(show_flavour)
-			to_chat(M, "[flavour_text]")
+			var/output_message = "<span class='big bold'>[short_desc]</span>"
+			if(flavour_text != "")
+				output_message += "\n<span class='bold'>[flavour_text]</span>"
+			if(important_info != "")
+				output_message += "\n<span class='userdanger'>[important_info]</span>"
+			to_chat(M, output_message)
 		var/datum/mind/MM = M.mind
 		var/datum/antagonist/A
 		if(antagonist_type)
@@ -340,7 +347,7 @@
 	name = "sleeper"
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper"
-	flavour_text = "<span class='big bold'>You are a space doctor!</span>"
+	short_desc = "You are a space doctor!"
 	assignedrole = "Space Doctor"
 	job_description = "Off-station Doctor"
 
@@ -397,7 +404,8 @@
 	name = "bartender sleeper"
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper"
-	flavour_text = "<span class='big bold'>You are a space bartender!</span><b> Time to mix drinks and change lives. Smoking space drugs makes it easier to understand your patrons' odd dialect.</b>"
+	short_desc = "You are a space bartender!"
+	flavour_text = "Time to mix drinks and change lives. Smoking space drugs makes it easier to understand your patrons' odd dialect."
 	assignedrole = "Space Bartender"
 	id_job = "Bartender"
 
@@ -422,7 +430,8 @@
 	name = "beach bum sleeper"
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper"
-	flavour_text = "<span class='big bold'>You're, like, totally a dudebro, bruh.</span><b> Ch'yea. You came here, like, on spring break, hopin' to pick up some bangin' hot chicks, y'knaw?</b>"
+	short_desc = "You're a spunky lifeguard!"
+	flavour_text = "It's up to you to make sure nobody drowns or gets eaten by sharks and stuff."
 	assignedrole = "Beach Bum"
 
 /obj/effect/mob_spawn/human/beach/alive/lifeguard
@@ -511,7 +520,7 @@
 	name = "sleeper"
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper"
-	flavour_text = "<span class='big bold'>You are a Nanotrasen Commander!</span>"
+	short_desc = "You are a Nanotrasen Commander!"
 
 /obj/effect/mob_spawn/human/nanotrasensoldier/alive
 	death = FALSE
@@ -522,7 +531,7 @@
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper"
 	faction = "nanotrasenprivate"
-	flavour_text = "<span class='big bold'>You are a Nanotrasen Private Security Officer!</span>"
+	short_desc = "You are a Nanotrasen Private Security Officer!"
 
 
 /////////////////Spooky Undead//////////////////////
@@ -539,7 +548,8 @@
 	job_description = "Skeleton"
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "remains"
-	flavour_text = "<span class='big bold'>By unknown powers, your skeletal remains have been reanimated!</span><b> Walk this mortal plain and terrorize all living adventurers who dare cross your path.</b>"
+	short_desc = "By unknown powers, your skeletal remains have been reanimated!"
+	flavour_text = "Walk this mortal plain and terrorize all living adventurers who dare cross your path."
 	assignedrole = "Skeleton"
 
 /obj/effect/mob_spawn/human/zombie
@@ -554,7 +564,9 @@
 	job_description = "Zombie"
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "remains"
-	flavour_text = "<span class='big bold'>By unknown powers, your rotting remains have been resurrected!</span><b> Walk this mortal plain and terrorize all living adventurers who dare cross your path.</b>"
+	short_desc = "By unknown powers, your rotting remains have been resurrected!"
+	flavour_text = "Walk this mortal plain and terrorize all living adventurers who dare cross your path."
+
 
 
 /obj/effect/mob_spawn/human/abductor

code/modules/awaymissions/mission_code/snowdin.dm

@@ -595,8 +595,9 @@
 	job_description = "Syndicate Snow Operative"
 	faction = ROLE_SYNDICATE
 	outfit = /datum/outfit/snowsyndie
-	flavour_text = "<span class='big bold'>You are a syndicate operative recently awoken from cryostasis in an underground outpost. Monitor Nanotrasen communications and record information. All intruders should be \
-	disposed of swiftly to assure no gathered information is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself.</span>"
+	short_desc = "You are a syndicate operative recently awoken from cryostasis in an underground outpost."
+	flavour_text = "You are a syndicate operative recently awoken from cryostasis in an underground outpost. Monitor Nanotrasen communications and record information. All intruders should be \
+	disposed of swiftly to assure no gathered information is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself."
 
 /datum/outfit/snowsyndie
 	name = "Syndicate Snow Operative"

code/modules/cargo/console.dm

@@ -1,228 +1,226 @@
-/obj/machinery/computer/cargo
-	name = "supply console"
-	desc = "Used to order supplies, approve requests, and control the shuttle."
-	icon_screen = "supply"
-	circuit = /obj/item/circuitboard/computer/cargo
-	req_access = list(ACCESS_CARGO)
-	var/requestonly = FALSE
-	var/contraband = FALSE
-	var/safety_warning = "For safety reasons, the automated supply shuttle \
-		cannot transport live organisms, human remains, classified nuclear weaponry \
-		or homing beacons."
-	var/blockade_warning = "Bluespace instability detected. Shuttle movement impossible."
-
-	light_color = "#E2853D"//orange
-
-/obj/machinery/computer/cargo/request
-	name = "supply request console"
-	desc = "Used to request supplies from cargo."
-	icon_screen = "request"
-	circuit = /obj/item/circuitboard/computer/cargo/request
-	req_access = list()
-	requestonly = TRUE
-
-/obj/machinery/computer/cargo/Initialize()
-	. = ..()
-	var/obj/item/circuitboard/computer/cargo/board = circuit
-	contraband = board.contraband
-	if (board.obj_flags & EMAGGED)
-		obj_flags |= EMAGGED
-	else
-		obj_flags &= ~EMAGGED
-
-/obj/machinery/computer/cargo/proc/get_export_categories()
-	. = EXPORT_CARGO
-	if(contraband)
-		. |= EXPORT_CONTRABAND
-	if(obj_flags & EMAGGED)
-		. |= EXPORT_EMAG
-
-/obj/machinery/computer/cargo/emag_act(mob/user)
-	. = ..()
-	if(obj_flags & EMAGGED)
-		return
-	user.visible_message("<span class='warning'>[user] swipes a suspicious card through [src]!</span>",
-	"<span class='notice'>You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.</span>")
-
-	obj_flags |= EMAGGED
-	contraband = TRUE
-
-	// This also permamently sets this on the circuit board
-	var/obj/item/circuitboard/computer/cargo/board = circuit
-	board.contraband = TRUE
-	board.obj_flags |= EMAGGED
-	req_access = list()
-	return TRUE
-
-/obj/machinery/computer/cargo/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "cargo", name, 1000, 800, master_ui, state)
-		ui.open()
-
-/obj/machinery/computer/cargo/ui_data()
-	var/list/data = list()
-	data["requestonly"] = requestonly
-	data["location"] = SSshuttle.supply.getStatusText()
-	data["points"] = SSshuttle.points
-	data["away"] = SSshuttle.supply.getDockedId() == "supply_away"
-	data["docked"] = SSshuttle.supply.mode == SHUTTLE_IDLE
-	data["loan"] = !!SSshuttle.shuttle_loan
-	data["loan_dispatched"] = SSshuttle.shuttle_loan && SSshuttle.shuttle_loan.dispatched
-	var/message = "Remember to stamp and send back the supply manifests."
-	if(SSshuttle.centcom_message)
-		message = SSshuttle.centcom_message
-	if(SSshuttle.supplyBlocked)
-		message = blockade_warning
-	data["message"] = message
-	data["supplies"] = list()
-	for(var/pack in SSshuttle.supply_packs)
-		var/datum/supply_pack/P = SSshuttle.supply_packs[pack]
-		if(!data["supplies"][P.group])
-			data["supplies"][P.group] = list(
-				"name" = P.group,
-				"packs" = list()
-			)
-		if((P.hidden && !(obj_flags & EMAGGED)) || (P.contraband && !contraband) || (P.special && !P.special_enabled) || P.DropPodOnly)
-			continue
-		data["supplies"][P.group]["packs"] += list(list(
-			"name" = P.name,
-			"cost" = P.cost,
-			"id" = pack,
-			"desc" = P.desc || P.name // If there is a description, use it. Otherwise use the pack's name.
-		))
-
-	data["cart"] = list()
-	for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
-		data["cart"] += list(list(
-			"object" = SO.pack.name,
-			"cost" = SO.pack.cost,
-			"id" = SO.id
-		))
-
-	data["requests"] = list()
-	for(var/datum/supply_order/SO in SSshuttle.requestlist)
-		data["requests"] += list(list(
-			"object" = SO.pack.name,
-			"cost" = SO.pack.cost,
-			"orderer" = SO.orderer,
-			"reason" = SO.reason,
-			"id" = SO.id
-		))
-
-	return data
-
-/obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui)
-	if(..())
-		return
-	if(!allowed(usr))
-		to_chat(usr, "<span class='notice'>Access denied.</span>")
-		return
-	if(action != "add" && requestonly)
-		return
-	switch(action)
-		if("send")
-			if(!SSshuttle.supply.canMove())
-				say(safety_warning)
-				return
-			if(SSshuttle.supplyBlocked)
-				say(blockade_warning)
-				return
-			if(SSshuttle.supply.getDockedId() == "supply_home")
-				SSshuttle.supply.export_categories = get_export_categories()
-				SSshuttle.moveShuttle("supply", "supply_away", TRUE)
-				say("The supply shuttle is departing.")
-				investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO)
-			else
-				investigate_log("[key_name(usr)] called the supply shuttle.", INVESTIGATE_CARGO)
-				say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.")
-				SSshuttle.moveShuttle("supply", "supply_home", TRUE)
-			. = TRUE
-		if("loan")
-			if(!SSshuttle.shuttle_loan)
-				return
-			if(SSshuttle.supplyBlocked)
-				say(blockade_warning)
-				return
-			else if(SSshuttle.supply.mode != SHUTTLE_IDLE)
-				return
-			else if(SSshuttle.supply.getDockedId() != "supply_away")
-				return
-			else
-				SSshuttle.shuttle_loan.loan_shuttle()
-				say("The supply shuttle has been loaned to CentCom.")
-				. = TRUE
-		if("add")
-			var/id = text2path(params["id"])
-			var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
-			if(!istype(pack))
-				return
-			if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.contraband && !contraband) || pack.DropPodOnly)
-				return
-
-			var/name = "*None Provided*"
-			var/rank = "*None Provided*"
-			var/ckey = usr.ckey
-			if(ishuman(usr))
-				var/mob/living/carbon/human/H = usr
-				name = H.get_authentification_name()
-				rank = H.get_assignment(hand_first = TRUE)
-			else if(issilicon(usr))
-				name = usr.real_name
-				rank = "Silicon"
-
-			var/reason = ""
-			if(requestonly)
-				reason = stripped_input("Reason:", name, "")
-				if(isnull(reason) || ..())
-					return
-
-			var/turf/T = get_turf(src)
-			var/datum/supply_order/SO = new(pack, name, rank, ckey, reason)
-			SO.generateRequisition(T)
-			if(requestonly)
-				SSshuttle.requestlist += SO
-			else
-				SSshuttle.shoppinglist += SO
-			. = TRUE
-		if("remove")
-			var/id = text2num(params["id"])
-			for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
-				if(SO.id == id)
-					SSshuttle.shoppinglist -= SO
-					. = TRUE
-					break
-		if("clear")
-			SSshuttle.shoppinglist.Cut()
-			. = TRUE
-		if("approve")
-			var/id = text2num(params["id"])
-			for(var/datum/supply_order/SO in SSshuttle.requestlist)
-				if(SO.id == id)
-					SSshuttle.requestlist -= SO
-					SSshuttle.shoppinglist += SO
-					. = TRUE
-					break
-		if("deny")
-			var/id = text2num(params["id"])
-			for(var/datum/supply_order/SO in SSshuttle.requestlist)
-				if(SO.id == id)
-					SSshuttle.requestlist -= SO
-					. = TRUE
-					break
-		if("denyall")
-			SSshuttle.requestlist.Cut()
-			. = TRUE
-	if(.)
-		post_signal("supply")
-
-/obj/machinery/computer/cargo/proc/post_signal(command)
-
-	var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
-
-	if(!frequency)
-		return
-
-	var/datum/signal/status_signal = new(list("command" = command))
-	frequency.post_signal(src, status_signal)
+/obj/machinery/computer/cargo
+	name = "supply console"
+	desc = "Used to order supplies, approve requests, and control the shuttle."
+	icon_screen = "supply"
+	circuit = /obj/item/circuitboard/computer/cargo
+	req_access = list(ACCESS_CARGO)
+	var/requestonly = FALSE
+	var/contraband = FALSE
+	var/safety_warning = "For safety reasons, the automated supply shuttle \
+		cannot transport live organisms, human remains, classified nuclear weaponry \
+		or homing beacons."
+	var/blockade_warning = "Bluespace instability detected. Shuttle movement impossible."
+
+	light_color = "#E2853D"//orange
+
+/obj/machinery/computer/cargo/request
+	name = "supply request console"
+	desc = "Used to request supplies from cargo."
+	icon_screen = "request"
+	circuit = /obj/item/circuitboard/computer/cargo/request
+	req_access = list()
+	requestonly = TRUE
+
+/obj/machinery/computer/cargo/Initialize()
+	. = ..()
+	var/obj/item/circuitboard/computer/cargo/board = circuit
+	contraband = board.contraband
+	if (board.obj_flags & EMAGGED)
+		obj_flags |= EMAGGED
+	else
+		obj_flags &= ~EMAGGED
+
+/obj/machinery/computer/cargo/proc/get_export_categories()
+	. = EXPORT_CARGO
+	if(contraband)
+		. |= EXPORT_CONTRABAND
+	if(obj_flags & EMAGGED)
+		. |= EXPORT_EMAG
+
+/obj/machinery/computer/cargo/emag_act(mob/user)
+	. = ..()
+	if(obj_flags & EMAGGED)
+		return
+	user.visible_message("<span class='warning'>[user] swipes a suspicious card through [src]!</span>",
+	"<span class='notice'>You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.</span>")
+
+	obj_flags |= EMAGGED
+	contraband = TRUE
+
+	// This also permamently sets this on the circuit board
+	var/obj/item/circuitboard/computer/cargo/board = circuit
+	board.contraband = TRUE
+	board.obj_flags |= EMAGGED
+	req_access = list()
+	return TRUE
+
+/obj/machinery/computer/cargo/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "cargo", name, 780, 750, master_ui, state)
+		ui.open()
+
+/obj/machinery/computer/cargo/ui_data()
+	var/list/data = list()
+	data["requestonly"] = requestonly
+	data["location"] = SSshuttle.supply.getStatusText()
+	data["points"] = SSshuttle.points
+	data["away"] = SSshuttle.supply.getDockedId() == "supply_away"
+	data["docked"] = SSshuttle.supply.mode == SHUTTLE_IDLE
+	data["loan"] = !!SSshuttle.shuttle_loan
+	data["loan_dispatched"] = SSshuttle.shuttle_loan && SSshuttle.shuttle_loan.dispatched
+	var/message = "Remember to stamp and send back the supply manifests."
+	if(SSshuttle.centcom_message)
+		message = SSshuttle.centcom_message
+	if(SSshuttle.supplyBlocked)
+		message = blockade_warning
+	data["message"] = message
+	data["supplies"] = list()
+	for(var/pack in SSshuttle.supply_packs)
+		var/datum/supply_pack/P = SSshuttle.supply_packs[pack]
+		if(!data["supplies"][P.group])
+			data["supplies"][P.group] = list(
+				"name" = P.group,
+				"packs" = list()
+			)
+		if((P.hidden && !(obj_flags & EMAGGED)) || (P.contraband && !contraband) || (P.special && !P.special_enabled) || P.DropPodOnly)
+			continue
+		data["supplies"][P.group]["packs"] += list(list(
+			"name" = P.name,
+			"cost" = P.cost,
+			"id" = pack,
+			"desc" = P.desc || P.name // If there is a description, use it. Otherwise use the pack's name.
+		))
+
+	data["cart"] = list()
+	for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
+		data["cart"] += list(list(
+			"object" = SO.pack.name,
+			"cost" = SO.pack.cost,
+			"id" = SO.id
+		))
+
+	data["requests"] = list()
+	for(var/datum/supply_order/SO in SSshuttle.requestlist)
+		data["requests"] += list(list(
+			"object" = SO.pack.name,
+			"cost" = SO.pack.cost,
+			"orderer" = SO.orderer,
+			"reason" = SO.reason,
+			"id" = SO.id
+		))
+
+	return data
+
+/obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui)
+	if(..())
+		return
+	if(!allowed(usr))
+		to_chat(usr, "<span class='notice'>Access denied.</span>")
+		return
+	switch(action)
+		if("send")
+			if(!SSshuttle.supply.canMove())
+				say(safety_warning)
+				return
+			if(SSshuttle.supplyBlocked)
+				say(blockade_warning)
+				return
+			if(SSshuttle.supply.getDockedId() == "supply_home")
+				SSshuttle.supply.export_categories = get_export_categories()
+				SSshuttle.moveShuttle("supply", "supply_away", TRUE)
+				say("The supply shuttle is departing.")
+				investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO)
+			else
+				investigate_log("[key_name(usr)] called the supply shuttle.", INVESTIGATE_CARGO)
+				say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.")
+				SSshuttle.moveShuttle("supply", "supply_home", TRUE)
+			. = TRUE
+		if("loan")
+			if(!SSshuttle.shuttle_loan)
+				return
+			if(SSshuttle.supplyBlocked)
+				say(blockade_warning)
+				return
+			else if(SSshuttle.supply.mode != SHUTTLE_IDLE)
+				return
+			else if(SSshuttle.supply.getDockedId() != "supply_away")
+				return
+			else
+				SSshuttle.shuttle_loan.loan_shuttle()
+				say("The supply shuttle has been loaned to CentCom.")
+				. = TRUE
+		if("add")
+			var/id = text2path(params["id"])
+			var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
+			if(!istype(pack))
+				return
+			if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.contraband && !contraband) || pack.DropPodOnly)
+				return
+
+			var/name = "*None Provided*"
+			var/rank = "*None Provided*"
+			var/ckey = usr.ckey
+			if(ishuman(usr))
+				var/mob/living/carbon/human/H = usr
+				name = H.get_authentification_name()
+				rank = H.get_assignment(hand_first = TRUE)
+			else if(issilicon(usr))
+				name = usr.real_name
+				rank = "Silicon"
+
+			var/reason = ""
+			if(requestonly)
+				reason = stripped_input("Reason:", name, "")
+				if(isnull(reason) || ..())
+					return
+
+			var/turf/T = get_turf(src)
+			var/datum/supply_order/SO = new(pack, name, rank, ckey, reason)
+			SO.generateRequisition(T)
+			if(requestonly)
+				SSshuttle.requestlist += SO
+			else
+				SSshuttle.shoppinglist += SO
+			. = TRUE
+		if("remove")
+			var/id = text2num(params["id"])
+			for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
+				if(SO.id == id)
+					SSshuttle.shoppinglist -= SO
+					. = TRUE
+					break
+		if("clear")
+			SSshuttle.shoppinglist.Cut()
+			. = TRUE
+		if("approve")
+			var/id = text2num(params["id"])
+			for(var/datum/supply_order/SO in SSshuttle.requestlist)
+				if(SO.id == id)
+					SSshuttle.requestlist -= SO
+					SSshuttle.shoppinglist += SO
+					. = TRUE
+					break
+		if("deny")
+			var/id = text2num(params["id"])
+			for(var/datum/supply_order/SO in SSshuttle.requestlist)
+				if(SO.id == id)
+					SSshuttle.requestlist -= SO
+					. = TRUE
+					break
+		if("denyall")
+			SSshuttle.requestlist.Cut()
+			. = TRUE
+	if(.)
+		post_signal("supply")
+
+/obj/machinery/computer/cargo/proc/post_signal(command)
+
+	var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
+
+	if(!frequency)
+		return
+
+	var/datum/signal/status_signal = new(list("command" = command))
+	frequency.post_signal(src, status_signal)

code/modules/cargo/expressconsole.dm

@@ -1,206 +1,206 @@
-#define MAX_EMAG_ROCKETS 8
-#define BEACON_COST 5000
-#define SP_LINKED 1
-#define SP_READY 2
-#define SP_LAUNCH 3
-#define SP_UNLINK 4
-#define SP_UNREADY 5
-
-/obj/machinery/computer/cargo/express
-	name = "express supply console"
-	desc = "This console allows the user to purchase a package \
-		with 1/40th of the delivery time: made possible by NanoTrasen's new \"1500mm Orbital Railgun\".\
-		All sales are near instantaneous - please choose carefully"
-	icon_screen = "supply_express"
-	circuit = /obj/item/circuitboard/computer/cargo/express
-	blockade_warning = "Bluespace instability detected. Delivery impossible."
-	req_access = list(ACCESS_QM)
-	var/message
-	var/printed_beacons = 0 //number of beacons printed. Used to determine beacon names.
-	var/list/meme_pack_data
-	var/obj/item/supplypod_beacon/beacon //the linked supplypod beacon
-	var/area/landingzone = /area/quartermaster/storage //where we droppin boys
-	var/podType = /obj/structure/closet/supplypod
-	var/cooldown = 0 //cooldown to prevent printing supplypod beacon spam
-	var/locked = TRUE //is the console locked? unlock with ID
-	var/usingBeacon = FALSE //is the console in beacon mode? exists to let beacon know when a pod may come in
-
-/obj/machinery/computer/cargo/express/Initialize()
-	. = ..()
-	packin_up()
-
-/obj/machinery/computer/cargo/express/Destroy()
-	if(beacon)
-		beacon.unlink_console()
-	return ..()
-
-/obj/machinery/computer/cargo/express/attackby(obj/item/W, mob/living/user, params)
-	if((istype(W, /obj/item/card/id) || istype(W, /obj/item/pda)) && allowed(user))
-		locked = !locked
-		to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] the interface.</span>")
-		return
-	else if(istype(W, /obj/item/disk/cargo/bluespace_pod))
-		podType = /obj/structure/closet/supplypod/bluespacepod
-		to_chat(user, "<span class='notice'>You insert the disk into [src], allowing for advanced supply delivery vehicles.</span>")
-		qdel(W)
-		return TRUE
-	else if(istype(W, /obj/item/supplypod_beacon))
-		var/obj/item/supplypod_beacon/sb = W
-		if (sb.express_console != src)
-			sb.link_console(src, user)
-			return TRUE
-		else
-			to_chat(user, "<span class='notice'>[src] is already linked to [sb].</span>")
-	..()
-
-/obj/machinery/computer/cargo/express/emag_act(mob/living/user)
-	. = SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT)
-	if(obj_flags & EMAGGED)
-		return
-	user.visible_message("<span class='warning'>[user] swipes a suspicious card through [src]!</span>",
-	"<span class='notice'>You change the routing protocols, allowing the Supply Pod to land anywhere on the station.</span>")
-	obj_flags |= EMAGGED
-	// This also sets this on the circuit board
-	var/obj/item/circuitboard/computer/cargo/board = circuit
-	board.obj_flags |= EMAGGED
-	packin_up()
-	req_access = list()
-	return TRUE
-
-/obj/machinery/computer/cargo/express/proc/packin_up() // oh shit, I'm sorry
-	meme_pack_data = list() // sorry for what?
-	for(var/pack in SSshuttle.supply_packs) // our quartermaster taught us not to be ashamed of our supply packs
-		var/datum/supply_pack/P = SSshuttle.supply_packs[pack]  // specially since they're such a good price and all
-		if(!meme_pack_data[P.group]) // yeah, I see that, your quartermaster gave you good advice
-			meme_pack_data[P.group] = list( // it gets cheaper when I return it
-				"name" = P.group, // mmhm
-				"packs" = list()  // sometimes, I return it so much, I rip the manifest
-			) // see, my quartermaster taught me a few things too
-		if((P.hidden) || (P.special)) // like, how not to rip the manifest
-			continue// by using someone else's crate
-		if(!(obj_flags & EMAGGED) && P.contraband) // will you show me?
-			continue // i'd be right happy to
-		meme_pack_data[P.group]["packs"] += list(list(
-			"name" = P.name,
-			"cost" = P.cost,
-			"id" = pack,
-			"desc" = P.desc || P.name // If there is a description, use it. Otherwise use the pack's name.
-		))
-
-/obj/machinery/computer/cargo/express/ui_interact(mob/living/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) // Remember to use the appropriate state.
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "cargo_express", name, 1000, 800, master_ui, state)
-		ui.open()
-
-/obj/machinery/computer/cargo/express/ui_data(mob/user)
-	var/canBeacon = beacon && (isturf(beacon.loc) || ismob(beacon.loc))//is the beacon in a valid location?
-	var/list/data = list()
-	data["locked"] = locked//swipe an ID to unlock
-	data["siliconUser"] = user.has_unlimited_silicon_privilege
-	data["beaconzone"] = beacon ? get_area(beacon) : ""//where is the beacon located? outputs in the tgui
-	data["usingBeacon"] = usingBeacon //is the mode set to deliver to the beacon or the cargobay?
-	data["canBeacon"] = !usingBeacon || canBeacon //is the mode set to beacon delivery, and is the beacon in a valid location?
-	data["canBuyBeacon"] = cooldown <= 0 && SSshuttle.points >= BEACON_COST
-	data["beaconError"] = usingBeacon && !canBeacon ? "(BEACON ERROR)" : ""//changes button text to include an error alert if necessary
-	data["hasBeacon"] = beacon != null//is there a linked beacon?
-	data["beaconName"] = beacon ? beacon.name : "No Beacon Found"
-	data["printMsg"] = cooldown > 0 ? "Print Beacon for [BEACON_COST] credits ([cooldown])" : "Print Beacon for [BEACON_COST] credits"//buttontext for printing beacons
-	data["points"] = SSshuttle.points
-	data["supplies"] = list()
-	message = "Sales are near-instantaneous - please choose carefully."
-	if(SSshuttle.supplyBlocked)
-		message = blockade_warning
-	if(usingBeacon && !beacon)
-		message = "BEACON ERROR: BEACON MISSING"//beacon was destroyed
-	else if (usingBeacon && !canBeacon)
-		message = "BEACON ERROR: MUST BE EXPOSED"//beacon's loc/user's loc must be a turf
-	if(obj_flags & EMAGGED)
-		message = "(&!#@ERROR: ROUTING_#PROTOCOL MALF(*CT#ON. $UG%ESTE@ ACT#0N: !^/PULS3-%E)ET CIR*)ITB%ARD."
-	data["message"] = message
-	if(!meme_pack_data)
-		packin_up()
-		stack_trace("You didn't give the cargo tech good advice, and he ripped the manifest. As a result, there was no pack data for [src]")
-	data["supplies"] = meme_pack_data
-	if (cooldown > 0)//cooldown used for printing beacons
-		cooldown--
-	return data
-
-/obj/machinery/computer/cargo/express/ui_act(action, params, datum/tgui/ui)
-	switch(action)
-		if("LZCargo")
-			usingBeacon = FALSE
-			if (beacon)
-				beacon.update_status(SP_UNREADY) //ready light on beacon will turn off
-		if("LZBeacon")
-			usingBeacon = TRUE
-			if (beacon)
-				beacon.update_status(SP_READY) //turns on the beacon's ready light
-		if("printBeacon")
-			if (SSshuttle.points >= BEACON_COST)
-				cooldown = 10//a ~ten second cooldown for printing beacons to prevent spam
-				var/obj/item/supplypod_beacon/C = new /obj/item/supplypod_beacon(drop_location())
-				C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc)
-				printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1
-				beacon.name = "Supply Pod Beacon #[printed_beacons]"
-				SSshuttle.points -= BEACON_COST
-
-		if("add")//Generate Supply Order first
-			var/id = text2path(params["id"])
-			var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
-			if(!istype(pack))
-				return
-			var/name = "*None Provided*"
-			var/rank = "*None Provided*"
-			var/ckey = usr.ckey
-			if(ishuman(usr))
-				var/mob/living/carbon/human/H = usr
-				name = H.get_authentification_name()
-				rank = H.get_assignment(hand_first = TRUE)
-			else if(issilicon(usr))
-				name = usr.real_name
-				rank = "Silicon"
-			var/reason = ""
-			var/list/empty_turfs
-			var/datum/supply_order/SO = new(pack, name, rank, ckey, reason)
-			if(!(obj_flags & EMAGGED))
-				if(SO.pack.cost <= SSshuttle.points)
-					var/LZ
-					if (istype(beacon) && usingBeacon)//prioritize beacons over landing in cargobay
-						LZ = get_turf(beacon)
-						beacon.update_status(SP_LAUNCH)
-					else if (!usingBeacon)//find a suitable supplypod landing zone in cargobay
-						landingzone = GLOB.areas_by_type[/area/quartermaster/storage]
-						if (!landingzone)
-							WARNING("[src] couldnt find a Quartermaster/Storage (aka cargobay) area on the station, and as such it has set the supplypod landingzone to the area it resides in.")
-							landingzone = get_area(src)
-						for(var/turf/open/floor/T in landingzone.contents)//uses default landing zone
-							if(is_blocked_turf(T))
-								continue
-							LAZYADD(empty_turfs, T)
-							CHECK_TICK
-						if(empty_turfs && empty_turfs.len)
-							LZ = pick(empty_turfs)
-					if (SO.pack.cost <= SSshuttle.points && LZ)//we need to call the cost check again because of the CHECK_TICK call
-						SSshuttle.points -= SO.pack.cost
-						new /obj/effect/abstract/DPtarget(LZ, podType, SO)
-						. = TRUE
-						update_icon()
-			else
-				if(SO.pack.cost * (0.72*MAX_EMAG_ROCKETS) <= SSshuttle.points) // bulk discount :^)
-					landingzone = GLOB.areas_by_type[pick(GLOB.the_station_areas)]  //override default landing zone
-					for(var/turf/open/floor/T in landingzone.contents)
-						if(is_blocked_turf(T))
-							continue
-						LAZYADD(empty_turfs, T)
-						CHECK_TICK
-					if(empty_turfs && empty_turfs.len)
-						SSshuttle.points -= SO.pack.cost * (0.72*MAX_EMAG_ROCKETS)
-						SO.generateRequisition(get_turf(src))
-						for(var/i in 1 to MAX_EMAG_ROCKETS)
-							var/LZ = pick(empty_turfs)
-							LAZYREMOVE(empty_turfs, LZ)
-							new /obj/effect/abstract/DPtarget(LZ, podType, SO)
-							. = TRUE
-							update_icon()
-							CHECK_TICK
+#define MAX_EMAG_ROCKETS 8
+#define BEACON_COST 5000
+#define SP_LINKED 1
+#define SP_READY 2
+#define SP_LAUNCH 3
+#define SP_UNLINK 4
+#define SP_UNREADY 5
+
+/obj/machinery/computer/cargo/express
+	name = "express supply console"
+	desc = "This console allows the user to purchase a package \
+		with 1/40th of the delivery time: made possible by NanoTrasen's new \"1500mm Orbital Railgun\".\
+		All sales are near instantaneous - please choose carefully"
+	icon_screen = "supply_express"
+	circuit = /obj/item/circuitboard/computer/cargo/express
+	blockade_warning = "Bluespace instability detected. Delivery impossible."
+	req_access = list(ACCESS_QM)
+	var/message
+	var/printed_beacons = 0 //number of beacons printed. Used to determine beacon names.
+	var/list/meme_pack_data
+	var/obj/item/supplypod_beacon/beacon //the linked supplypod beacon
+	var/area/landingzone = /area/quartermaster/storage //where we droppin boys
+	var/podType = /obj/structure/closet/supplypod
+	var/cooldown = 0 //cooldown to prevent printing supplypod beacon spam
+	var/locked = TRUE //is the console locked? unlock with ID
+	var/usingBeacon = FALSE //is the console in beacon mode? exists to let beacon know when a pod may come in
+
+/obj/machinery/computer/cargo/express/Initialize()
+	. = ..()
+	packin_up()
+
+/obj/machinery/computer/cargo/express/Destroy()
+	if(beacon)
+		beacon.unlink_console()
+	return ..()
+
+/obj/machinery/computer/cargo/express/attackby(obj/item/W, mob/living/user, params)
+	if((istype(W, /obj/item/card/id) || istype(W, /obj/item/pda)) && allowed(user))
+		locked = !locked
+		to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] the interface.</span>")
+		return
+	else if(istype(W, /obj/item/disk/cargo/bluespace_pod))
+		podType = /obj/structure/closet/supplypod/bluespacepod
+		to_chat(user, "<span class='notice'>You insert the disk into [src], allowing for advanced supply delivery vehicles.</span>")
+		qdel(W)
+		return TRUE
+	else if(istype(W, /obj/item/supplypod_beacon))
+		var/obj/item/supplypod_beacon/sb = W
+		if (sb.express_console != src)
+			sb.link_console(src, user)
+			return TRUE
+		else
+			to_chat(user, "<span class='notice'>[src] is already linked to [sb].</span>")
+	..()
+
+/obj/machinery/computer/cargo/express/emag_act(mob/living/user)
+	. = SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT)
+	if(obj_flags & EMAGGED)
+		return
+	user.visible_message("<span class='warning'>[user] swipes a suspicious card through [src]!</span>",
+	"<span class='notice'>You change the routing protocols, allowing the Supply Pod to land anywhere on the station.</span>")
+	obj_flags |= EMAGGED
+	// This also sets this on the circuit board
+	var/obj/item/circuitboard/computer/cargo/board = circuit
+	board.obj_flags |= EMAGGED
+	packin_up()
+	req_access = list()
+	return TRUE
+
+/obj/machinery/computer/cargo/express/proc/packin_up() // oh shit, I'm sorry
+	meme_pack_data = list() // sorry for what?
+	for(var/pack in SSshuttle.supply_packs) // our quartermaster taught us not to be ashamed of our supply packs
+		var/datum/supply_pack/P = SSshuttle.supply_packs[pack]  // specially since they're such a good price and all
+		if(!meme_pack_data[P.group]) // yeah, I see that, your quartermaster gave you good advice
+			meme_pack_data[P.group] = list( // it gets cheaper when I return it
+				"name" = P.group, // mmhm
+				"packs" = list()  // sometimes, I return it so much, I rip the manifest
+			) // see, my quartermaster taught me a few things too
+		if((P.hidden) || (P.special)) // like, how not to rip the manifest
+			continue// by using someone else's crate
+		if(!(obj_flags & EMAGGED) && P.contraband) // will you show me?
+			continue // i'd be right happy to
+		meme_pack_data[P.group]["packs"] += list(list(
+			"name" = P.name,
+			"cost" = P.cost,
+			"id" = pack,
+			"desc" = P.desc || P.name // If there is a description, use it. Otherwise use the pack's name.
+		))
+
+/obj/machinery/computer/cargo/express/ui_interact(mob/living/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) // Remember to use the appropriate state.
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "cargo_express", name, 600, 700, master_ui, state)
+		ui.open()
+
+/obj/machinery/computer/cargo/express/ui_data(mob/user)
+	var/canBeacon = beacon && (isturf(beacon.loc) || ismob(beacon.loc))//is the beacon in a valid location?
+	var/list/data = list()
+	data["locked"] = locked//swipe an ID to unlock
+	data["siliconUser"] = user.has_unlimited_silicon_privilege
+	data["beaconzone"] = beacon ? get_area(beacon) : ""//where is the beacon located? outputs in the tgui
+	data["usingBeacon"] = usingBeacon //is the mode set to deliver to the beacon or the cargobay?
+	data["canBeacon"] = !usingBeacon || canBeacon //is the mode set to beacon delivery, and is the beacon in a valid location?
+	data["canBuyBeacon"] = cooldown <= 0 && SSshuttle.points >= BEACON_COST
+	data["beaconError"] = usingBeacon && !canBeacon ? "(BEACON ERROR)" : ""//changes button text to include an error alert if necessary
+	data["hasBeacon"] = beacon != null//is there a linked beacon?
+	data["beaconName"] = beacon ? beacon.name : "No Beacon Found"
+	data["printMsg"] = cooldown > 0 ? "Print Beacon for [BEACON_COST] credits ([cooldown])" : "Print Beacon for [BEACON_COST] credits"//buttontext for printing beacons
+	data["points"] = SSshuttle.points
+	data["supplies"] = list()
+	message = "Sales are near-instantaneous - please choose carefully."
+	if(SSshuttle.supplyBlocked)
+		message = blockade_warning
+	if(usingBeacon && !beacon)
+		message = "BEACON ERROR: BEACON MISSING"//beacon was destroyed
+	else if (usingBeacon && !canBeacon)
+		message = "BEACON ERROR: MUST BE EXPOSED"//beacon's loc/user's loc must be a turf
+	if(obj_flags & EMAGGED)
+		message = "(&!#@ERROR: ROUTING_#PROTOCOL MALF(*CT#ON. $UG%ESTE@ ACT#0N: !^/PULS3-%E)ET CIR*)ITB%ARD."
+	data["message"] = message
+	if(!meme_pack_data)
+		packin_up()
+		stack_trace("You didn't give the cargo tech good advice, and he ripped the manifest. As a result, there was no pack data for [src]")
+	data["supplies"] = meme_pack_data
+	if (cooldown > 0)//cooldown used for printing beacons
+		cooldown--
+	return data
+
+/obj/machinery/computer/cargo/express/ui_act(action, params, datum/tgui/ui)
+	switch(action)
+		if("LZCargo")
+			usingBeacon = FALSE
+			if (beacon)
+				beacon.update_status(SP_UNREADY) //ready light on beacon will turn off
+		if("LZBeacon")
+			usingBeacon = TRUE
+			if (beacon)
+				beacon.update_status(SP_READY) //turns on the beacon's ready light
+		if("printBeacon")
+			if (SSshuttle.points >= BEACON_COST)
+				cooldown = 10//a ~ten second cooldown for printing beacons to prevent spam
+				var/obj/item/supplypod_beacon/C = new /obj/item/supplypod_beacon(drop_location())
+				C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc)
+				printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1
+				beacon.name = "Supply Pod Beacon #[printed_beacons]"
+				SSshuttle.points -= BEACON_COST
+
+		if("add")//Generate Supply Order first
+			var/id = text2path(params["id"])
+			var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
+			if(!istype(pack))
+				return
+			var/name = "*None Provided*"
+			var/rank = "*None Provided*"
+			var/ckey = usr.ckey
+			if(ishuman(usr))
+				var/mob/living/carbon/human/H = usr
+				name = H.get_authentification_name()
+				rank = H.get_assignment(hand_first = TRUE)
+			else if(issilicon(usr))
+				name = usr.real_name
+				rank = "Silicon"
+			var/reason = ""
+			var/list/empty_turfs
+			var/datum/supply_order/SO = new(pack, name, rank, ckey, reason)
+			if(!(obj_flags & EMAGGED))
+				if(SO.pack.cost <= SSshuttle.points)
+					var/LZ
+					if (istype(beacon) && usingBeacon)//prioritize beacons over landing in cargobay
+						LZ = get_turf(beacon)
+						beacon.update_status(SP_LAUNCH)
+					else if (!usingBeacon)//find a suitable supplypod landing zone in cargobay
+						landingzone = GLOB.areas_by_type[/area/quartermaster/storage]
+						if (!landingzone)
+							WARNING("[src] couldnt find a Quartermaster/Storage (aka cargobay) area on the station, and as such it has set the supplypod landingzone to the area it resides in.")
+							landingzone = get_area(src)
+						for(var/turf/open/floor/T in landingzone.contents)//uses default landing zone
+							if(is_blocked_turf(T))
+								continue
+							LAZYADD(empty_turfs, T)
+							CHECK_TICK
+						if(empty_turfs && empty_turfs.len)
+							LZ = pick(empty_turfs)
+					if (SO.pack.cost <= SSshuttle.points && LZ)//we need to call the cost check again because of the CHECK_TICK call
+						SSshuttle.points -= SO.pack.cost
+						new /obj/effect/abstract/DPtarget(LZ, podType, SO)
+						. = TRUE
+						update_icon()
+			else
+				if(SO.pack.cost * (0.72*MAX_EMAG_ROCKETS) <= SSshuttle.points) // bulk discount :^)
+					landingzone = GLOB.areas_by_type[pick(GLOB.the_station_areas)]  //override default landing zone
+					for(var/turf/open/floor/T in landingzone.contents)
+						if(is_blocked_turf(T))
+							continue
+						LAZYADD(empty_turfs, T)
+						CHECK_TICK
+					if(empty_turfs && empty_turfs.len)
+						SSshuttle.points -= SO.pack.cost * (0.72*MAX_EMAG_ROCKETS)
+						SO.generateRequisition(get_turf(src))
+						for(var/i in 1 to MAX_EMAG_ROCKETS)
+							var/LZ = pick(empty_turfs)
+							LAZYREMOVE(empty_turfs, LZ)
+							new /obj/effect/abstract/DPtarget(LZ, podType, SO)
+							. = TRUE
+							update_icon()
+							CHECK_TICK

code/modules/client/client_procs.dm

@@ -47,6 +47,18 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 		else if (job in completed_asset_jobs) //byond bug ID:2256651
 			to_chat(src, "<span class='danger'>An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)</span>")
 			src << browse("...", "window=asset_cache_browser")
+			// Keypress passthrough
+	if(href_list["__keydown"])
+		var/keycode = browser_keycode_to_byond(href_list["__keydown"])
+		if(keycode)
+			keyDown(keycode)
+		return
+	if(href_list["__keyup"])
+		var/keycode = browser_keycode_to_byond(href_list["__keyup"])
+		if(keycode)
+			keyUp(keycode)
+		return
+
 
 	var/mtl = CONFIG_GET(number/minute_topic_limit)
 	if (!holder && mtl)

code/modules/crafting/craft.dm

@@ -3,37 +3,34 @@
 	var/viewing_category = 1 //typical powergamer starting on the Weapons tab
 	var/viewing_subcategory = 1
 	var/list/categories = list(
-				CAT_WEAPONRY,
-				CAT_ROBOT,
-				CAT_MISC,
-				CAT_PRIMAL,
-				CAT_FOOD,
-				CAT_CLOTHING)
-	var/list/subcategories = list(
-						list(	//Weapon subcategories
-							CAT_WEAPON,
-							CAT_AMMO),
-						CAT_NONE, //Robot subcategories
-						CAT_NONE, //Misc subcategories
-						CAT_NONE, //Tribal subcategories
-						list(	//Food subcategories
-							CAT_BREAD,
-							CAT_BURGER,
-							CAT_CAKE,
-							CAT_EGG,
-							CAT_FISH,
-							CAT_ICE,   //Called Frozen
-							CAT_MEAT,
-							CAT_MISCFOOD,
-							CAT_PASTRY,
-							CAT_PIE,
-							CAT_PIZZA,
-							CAT_SALAD,
-							CAT_SANDWICH,
-							CAT_SOUP,
-							CAT_SPAGHETTI),
-						CAT_NONE) //Clothing subcategories
-
+				CAT_WEAPONRY = list(
+					CAT_WEAPON,
+					CAT_AMMO,
+				),
+				CAT_ROBOT = CAT_NONE,
+				CAT_MISC = CAT_NONE,
+				CAT_PRIMAL = CAT_NONE,
+				CAT_FOOD = list(
+					CAT_BREAD,
+					CAT_BURGER,
+					CAT_CAKE,
+					CAT_EGG,
+					CAT_FISH,
+					CAT_ICE,   //Called Frozen
+					CAT_MEAT,
+					CAT_MISCFOOD,
+					CAT_PASTRY,
+					CAT_PIE,
+					CAT_PIZZA,
+					CAT_SALAD,
+					CAT_SANDWICH,
+					CAT_SOUP,
+					CAT_SPAGHETTI,	
+				),
+				CAT_CLOTHING = CAT_NONE
+				)
+	var/cur_category = CAT_NONE
+	var/cur_subcategory = CAT_NONE
 	var/datum/action/innate/crafting/button
 	var/display_craftable_only = FALSE
 	var/display_compact = TRUE
@@ -68,11 +65,11 @@
 							continue main_loop
 						else
 							continue
-			return 0
+			return FALSE
 	for(var/A in R.chem_catalysts)
 		if(contents[A] < R.chem_catalysts[A])
-			return 0
-	return 1
+			return FALSE
+	return TRUE
 
 /datum/personal_crafting/proc/get_environment(mob/user)
 	. = list()
@@ -158,7 +155,7 @@
 				I.CheckParts(parts, R)
 				if(send_feedback)
 					SSblackbox.record_feedback("tally", "object_crafted", 1, I.type)
-				return 0
+				return FALSE
 			return "."
 		return ", missing tool."
 	return ", missing component."
@@ -290,46 +287,97 @@
 /datum/personal_crafting/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.not_incapacitated_turf_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
+		cur_category = categories[1]
+		if(islist(categories[cur_category]))
+			var/list/subcats = categories[cur_category]
+			cur_subcategory = subcats[1]
+		else
+			cur_subcategory = CAT_NONE
 		ui = new(user, src, ui_key, "personal_crafting", "Crafting Menu", 700, 800, master_ui, state)
 		ui.open()
 
 
 /datum/personal_crafting/ui_data(mob/user)
 	var/list/data = list()
-	var/list/subs = list()
-	var/cur_subcategory = CAT_NONE
-	var/cur_category = categories[viewing_category]
-	if (islist(subcategories[viewing_category]))
-		subs = subcategories[viewing_category]
-		cur_subcategory = subs[viewing_subcategory]
 	data["busy"] = busy
-	data["prev_cat"] = categories[prev_cat()]
-	data["prev_subcat"] = subs[prev_subcat()]
 	data["category"] = cur_category
 	data["subcategory"] = cur_subcategory
-	data["next_cat"] = categories[next_cat()]
-	data["next_subcat"] = subs[next_subcat()]
 	data["display_craftable_only"] = display_craftable_only
 	data["display_compact"] = display_compact
 
 	var/list/surroundings = get_surroundings(user)
-	var/list/can_craft = list()
-	var/list/cant_craft = list()
+	var/list/craftability = list()
 	for(var/rec in GLOB.crafting_recipes)
 		var/datum/crafting_recipe/R = rec
 		if(!R.always_availible && !(R.type in user?.mind?.learned_recipes)) //User doesn't actually know how to make this.
 			continue
 		if((R.category != cur_category) || (R.subcategory != cur_subcategory))
 			continue
-		if(check_contents(R, surroundings))
-			can_craft += list(build_recipe_data(R))
-		else
-			cant_craft += list(build_recipe_data(R))
-	data["can_craft"] = can_craft
-	data["cant_craft"] = cant_craft
+		craftability["[REF(R)]"] = check_contents(R, surroundings)
+	data["craftability"] = craftability
 	return data
 
 
+/datum/component/personal_crafting/ui_static_data(mob/user)
+	var/list/data = list()
+
+	var/list/crafting_recipes = list()
+	for(var/rec in GLOB.crafting_recipes)
+		var/datum/crafting_recipe/R = rec
+
+		if(R.name == "") //This is one of the invalid parents that sneaks in
+			continue
+
+		if(!R.always_availible && !(R.type in user?.mind?.learned_recipes)) //User doesn't actually know how to make this.
+			continue
+
+		if(isnull(crafting_recipes[R.category]))
+			crafting_recipes[R.category] = list()
+
+		if(R.subcategory == CAT_NONE)
+			crafting_recipes[R.category] += list(build_recipe_data(R))
+		else
+			if(isnull(crafting_recipes[R.category][R.subcategory]))
+				crafting_recipes[R.category][R.subcategory] = list()
+				crafting_recipes[R.category]["has_subcats"] = TRUE
+			crafting_recipes[R.category][R.subcategory] += list(build_recipe_data(R))
+
+	data["crafting_recipes"] = crafting_recipes
+	return data	
+
+/datum/component/personal_crafting/proc/build_recipe_data(datum/crafting_recipe/R)
+	var/list/data = list()
+	data["name"] = R.name
+	data["ref"] = "[REF(R)]"
+	var/req_text = ""
+	var/tool_text = ""
+	var/catalyst_text = ""
+
+	for(var/a in R.reqs)
+		//We just need the name, so cheat-typecast to /atom for speed (even tho Reagents are /datum they DO have a "name" var)
+		//Also these are typepaths so sadly we can't just do "[a]"
+		var/atom/A = a
+		req_text += " [R.reqs[A]] [initial(A.name)],"
+	req_text = replacetext(req_text,",","",-1)
+	data["req_text"] = req_text
+
+	for(var/a in R.chem_catalysts)
+		var/atom/A = a //cheat-typecast
+		catalyst_text += " [R.chem_catalysts[A]] [initial(A.name)],"
+	catalyst_text = replacetext(catalyst_text,",","",-1)
+	data["catalyst_text"] = catalyst_text
+
+	for(var/a in R.tools)
+		if(ispath(a, /obj/item))
+			var/obj/item/b = a
+			tool_text += " [initial(b.name)],"
+		else
+			tool_text += " [a],"
+	tool_text = replacetext(tool_text,",","",-1)
+	data["tool_text"] = tool_text
+
+	return data
+
 /datum/personal_crafting/ui_act(action, params)
 	if(..())
 		return
@@ -345,61 +393,18 @@
 				to_chat(usr, "<span class='warning'>Construction failed[fail_msg]</span>")
 			busy = FALSE
 			ui_interact(usr)
-		if("forwardCat") //Meow
-			viewing_category = next_cat(FALSE)
-			. = TRUE
-		if("backwardCat")
-			viewing_category = prev_cat(FALSE)
-			. = TRUE
-		if("forwardSubCat")
-			viewing_subcategory = next_subcat()
-			. = TRUE
-		if("backwardSubCat")
-			viewing_subcategory = prev_subcat()
-			. = TRUE
 		if("toggle_recipes")
 			display_craftable_only = !display_craftable_only
 			. = TRUE
 		if("toggle_compact")
 			display_compact = !display_compact
 			. = TRUE
-
-
-//Next works nicely with modular arithmetic
-/datum/personal_crafting/proc/next_cat(readonly = TRUE)
-	if (!readonly)
-		viewing_subcategory = 1
-	. = viewing_category % categories.len + 1
-
-/datum/personal_crafting/proc/next_subcat()
-	if(islist(subcategories[viewing_category]))
-		var/list/subs = subcategories[viewing_category]
-		. = viewing_subcategory % subs.len + 1
-
-
-//Previous can go fuck itself
-/datum/personal_crafting/proc/prev_cat(readonly = TRUE)
-	if (!readonly)
-		viewing_subcategory = 1
-	if(viewing_category == categories.len)
-		. = viewing_category-1
-	else
-		. = viewing_category % categories.len - 1
-	if(. <= 0)
-		. = categories.len
-
-/datum/personal_crafting/proc/prev_subcat()
-	if(islist(subcategories[viewing_category]))
-		var/list/subs = subcategories[viewing_category]
-		if(viewing_subcategory == subs.len)
-			. = viewing_subcategory-1
-		else
-			. = viewing_subcategory % subs.len - 1
-		if(. <= 0)
-			. = subs.len
-	else
-		. = null
-
+		if("set_category")
+			if(!isnull(params["category"]))
+				cur_category = params["category"]
+			if(!isnull(params["subcategory"]))
+				cur_subcategory = params["subcategory"]
+			. = TRUE
 
 /datum/personal_crafting/proc/build_recipe_data(datum/crafting_recipe/R)
 	var/list/data = list()

code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm

@@ -481,6 +481,8 @@ datum/crafting_recipe/food/donut/meat
 		/obj/item/reagent_containers/food/snacks/grown/oat = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/oatmealcookie
+	subcategory = CAT_PASTRY
+
 
 /datum/crafting_recipe/food/raisincookie
 	name = "Raisin cookie"

code/modules/goonchat/browserassets/css/browserOutput.css

@@ -101,7 +101,7 @@ a.popt {text-decoration: none;}
 #ping {
 	position: fixed;
 	top: 0;
-	right: 115px;
+	right: 135px;
 	width: 45px;
 	background: #d0d0d0;
 	height: 30px;
@@ -131,13 +131,13 @@ a.popt {text-decoration: none;}
 }
 #userBar .subCell:hover {background: #ccc;}
 #userBar .toggle {
-	width: 40px;
+	width: 45px;
     background: #ccc;
     border-top: 0;
     float: right;
     text-align: center;
 }
-#userBar .sub {clear: both; display: none; width: 160px;}
+#userBar .sub {clear: both; display: none; width: 180px;}
 #userBar .sub.scroll {overflow-y: scroll;}
 #userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;}
 #userBar .sub span {

code/modules/goonchat/browserassets/css/font-awesome.css

@@ -1,788 +0,0 @@
-@font-face{font-family:'FontAwesome';src:url('fontawesome-webfont.eot');src:url('fontawesome-webfont.eot') format('embedded-opentype'),url('fontawesome-webfont.woff') format('woff'),url('fontawesome-webfont.ttf') format('truetype'),url('fontawesome-webfont.svg') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;}
-[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;}
-.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;}
-a [class^="icon-"],a [class*=" icon-"]{display:inline;}
-[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em;}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em;}
-.icons-ul{margin-left:2.142857142857143em;list-style-type:none;}.icons-ul>li{position:relative;}
-.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit;}
-[class^="icon-"].hide,[class*=" icon-"].hide{display:none;}
-.icon-muted{color:#eeeeee;}
-.icon-light{color:#ffffff;}
-.icon-dark{color:#333333;}
-.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-.icon-2x{font-size:2em;}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.icon-3x{font-size:3em;}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
-.icon-4x{font-size:4em;}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
-.icon-5x{font-size:5em;}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px;}
-.pull-right{float:right;}
-.pull-left{float:left;}
-[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.3em;}
-[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em;}
-[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0;}
-.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none;}
-.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large{line-height:.9em;}
-.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block;}
-.nav-tabs [class^="icon-"],.nav-pills [class^="icon-"],.nav-tabs [class*=" icon-"],.nav-pills [class*=" icon-"],.nav-tabs [class^="icon-"].icon-large,.nav-pills [class^="icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large{line-height:.9em;}
-.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.18em;}
-.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{line-height:.8em;}
-.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.25em;}
-.btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0;}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;}
-.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;}
-.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;}
-.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{line-height:inherit;}
-.icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;}
-.icon-stack .icon-stack-base{font-size:2em;*line-height:1em;}
-.icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;}
-a .icon-stack,a .icon-spin{display:inline-block;text-decoration:none;}
-@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);} 100%{-moz-transform:rotate(359deg);}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);} 100%{-webkit-transform:rotate(359deg);}}@-o-keyframes spin{0%{-o-transform:rotate(0deg);} 100%{-o-transform:rotate(359deg);}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg);} 100%{-ms-transform:rotate(359deg);}}@keyframes spin{0%{transform:rotate(0deg);} 100%{transform:rotate(359deg);}}.icon-rotate-90:before{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);}
-.icon-rotate-180:before{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);}
-.icon-rotate-270:before{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);}
-.icon-flip-horizontal:before{-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1);}
-.icon-flip-vertical:before{-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1);}
-a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .icon-flip-horizontal:before,a .icon-flip-vertical:before{display:inline-block;}
-.icon-glass:before{content:"\f000";}
-.icon-music:before{content:"\f001";}
-.icon-search:before{content:"\f002";}
-.icon-envelope-alt:before{content:"\f003";}
-.icon-heart:before{content:"\f004";}
-.icon-star:before{content:"\f005";}
-.icon-star-empty:before{content:"\f006";}
-.icon-user:before{content:"\f007";}
-.icon-film:before{content:"\f008";}
-.icon-th-large:before{content:"\f009";}
-.icon-th:before{content:"\f00a";}
-.icon-th-list:before{content:"\f00b";}
-.icon-ok:before{content:"\f00c";}
-.icon-remove:before{content:"\f00d";}
-.icon-zoom-in:before{content:"\f00e";}
-.icon-zoom-out:before{content:"\f010";}
-.icon-power-off:before,.icon-off:before{content:"\f011";}
-.icon-signal:before{content:"\f012";}
-.icon-gear:before,.icon-cog:before{content:"\f013";}
-.icon-trash:before{content:"\f014";}
-.icon-home:before{content:"\f015";}
-.icon-file-alt:before{content:"\f016";}
-.icon-time:before{content:"\f017";}
-.icon-road:before{content:"\f018";}
-.icon-download-alt:before{content:"\f019";}
-.icon-download:before{content:"\f01a";}
-.icon-upload:before{content:"\f01b";}
-.icon-inbox:before{content:"\f01c";}
-.icon-play-circle:before{content:"\f01d";}
-.icon-rotate-right:before,.icon-repeat:before{content:"\f01e";}
-.icon-refresh:before{content:"\f021";}
-.icon-list-alt:before{content:"\f022";}
-.icon-lock:before{content:"\f023";}
-.icon-flag:before{content:"\f024";}
-.icon-headphones:before{content:"\f025";}
-.icon-volume-off:before{content:"\f026";}
-.icon-volume-down:before{content:"\f027";}
-.icon-volume-up:before{content:"\f028";}
-.icon-qrcode:before{content:"\f029";}
-.icon-barcode:before{content:"\f02a";}
-.icon-tag:before{content:"\f02b";}
-.icon-tags:before{content:"\f02c";}
-.icon-book:before{content:"\f02d";}
-.icon-bookmark:before{content:"\f02e";}
-.icon-print:before{content:"\f02f";}
-.icon-camera:before{content:"\f030";}
-.icon-font:before{content:"\f031";}
-.icon-bold:before{content:"\f032";}
-.icon-italic:before{content:"\f033";}
-.icon-text-height:before{content:"\f034";}
-.icon-text-width:before{content:"\f035";}
-.icon-align-left:before{content:"\f036";}
-.icon-align-center:before{content:"\f037";}
-.icon-align-right:before{content:"\f038";}
-.icon-align-justify:before{content:"\f039";}
-.icon-list:before{content:"\f03a";}
-.icon-indent-left:before{content:"\f03b";}
-.icon-indent-right:before{content:"\f03c";}
-.icon-facetime-video:before{content:"\f03d";}
-.icon-picture:before{content:"\f03e";}
-.icon-pencil:before{content:"\f040";}
-.icon-map-marker:before{content:"\f041";}
-.icon-adjust:before{content:"\f042";}
-.icon-tint:before{content:"\f043";}
-.icon-edit:before{content:"\f044";}
-.icon-share:before{content:"\f045";}
-.icon-check:before{content:"\f046";}
-.icon-move:before{content:"\f047";}
-.icon-step-backward:before{content:"\f048";}
-.icon-fast-backward:before{content:"\f049";}
-.icon-backward:before{content:"\f04a";}
-.icon-play:before{content:"\f04b";}
-.icon-pause:before{content:"\f04c";}
-.icon-stop:before{content:"\f04d";}
-.icon-forward:before{content:"\f04e";}
-.icon-fast-forward:before{content:"\f050";}
-.icon-step-forward:before{content:"\f051";}
-.icon-eject:before{content:"\f052";}
-.icon-chevron-left:before{content:"\f053";}
-.icon-chevron-right:before{content:"\f054";}
-.icon-plus-sign:before{content:"\f055";}
-.icon-minus-sign:before{content:"\f056";}
-.icon-remove-sign:before{content:"\f057";}
-.icon-ok-sign:before{content:"\f058";}
-.icon-question-sign:before{content:"\f059";}
-.icon-info-sign:before{content:"\f05a";}
-.icon-screenshot:before{content:"\f05b";}
-.icon-remove-circle:before{content:"\f05c";}
-.icon-ok-circle:before{content:"\f05d";}
-.icon-ban-circle:before{content:"\f05e";}
-.icon-arrow-left:before{content:"\f060";}
-.icon-arrow-right:before{content:"\f061";}
-.icon-arrow-up:before{content:"\f062";}
-.icon-arrow-down:before{content:"\f063";}
-.icon-mail-forward:before,.icon-share-alt:before{content:"\f064";}
-.icon-resize-full:before{content:"\f065";}
-.icon-resize-small:before{content:"\f066";}
-.icon-plus:before{content:"\f067";}
-.icon-minus:before{content:"\f068";}
-.icon-asterisk:before{content:"\f069";}
-.icon-exclamation-sign:before{content:"\f06a";}
-.icon-gift:before{content:"\f06b";}
-.icon-leaf:before{content:"\f06c";}
-.icon-fire:before{content:"\f06d";}
-.icon-eye-open:before{content:"\f06e";}
-.icon-eye-close:before{content:"\f070";}
-.icon-warning-sign:before{content:"\f071";}
-.icon-plane:before{content:"\f072";}
-.icon-calendar:before{content:"\f073";}
-.icon-random:before{content:"\f074";}
-.icon-comment:before{content:"\f075";}
-.icon-magnet:before{content:"\f076";}
-.icon-chevron-up:before{content:"\f077";}
-.icon-chevron-down:before{content:"\f078";}
-.icon-retweet:before{content:"\f079";}
-.icon-shopping-cart:before{content:"\f07a";}
-.icon-folder-close:before{content:"\f07b";}
-.icon-folder-open:before{content:"\f07c";}
-.icon-resize-vertical:before{content:"\f07d";}
-.icon-resize-horizontal:before{content:"\f07e";}
-.icon-bar-chart:before{content:"\f080";}
-.icon-twitter-sign:before{content:"\f081";}
-.icon-facebook-sign:before{content:"\f082";}
-.icon-camera-retro:before{content:"\f083";}
-.icon-key:before{content:"\f084";}
-.icon-gears:before,.icon-cogs:before{content:"\f085";}
-.icon-comments:before{content:"\f086";}
-.icon-thumbs-up-alt:before{content:"\f087";}
-.icon-thumbs-down-alt:before{content:"\f088";}
-.icon-star-half:before{content:"\f089";}
-.icon-heart-empty:before{content:"\f08a";}
-.icon-signout:before{content:"\f08b";}
-.icon-linkedin-sign:before{content:"\f08c";}
-.icon-pushpin:before{content:"\f08d";}
-.icon-external-link:before{content:"\f08e";}
-.icon-signin:before{content:"\f090";}
-.icon-trophy:before{content:"\f091";}
-.icon-github-sign:before{content:"\f092";}
-.icon-upload-alt:before{content:"\f093";}
-.icon-lemon:before{content:"\f094";}
-.icon-phone:before{content:"\f095";}
-.icon-unchecked:before,.icon-check-empty:before{content:"\f096";}
-.icon-bookmark-empty:before{content:"\f097";}
-.icon-phone-sign:before{content:"\f098";}
-.icon-twitter:before{content:"\f099";}
-.icon-facebook:before{content:"\f09a";}
-.icon-github:before{content:"\f09b";}
-.icon-unlock:before{content:"\f09c";}
-.icon-credit-card:before{content:"\f09d";}
-.icon-rss:before{content:"\f09e";}
-.icon-hdd:before{content:"\f0a0";}
-.icon-bullhorn:before{content:"\f0a1";}
-.icon-bell:before{content:"\f0a2";}
-.icon-certificate:before{content:"\f0a3";}
-.icon-hand-right:before{content:"\f0a4";}
-.icon-hand-left:before{content:"\f0a5";}
-.icon-hand-up:before{content:"\f0a6";}
-.icon-hand-down:before{content:"\f0a7";}
-.icon-circle-arrow-left:before{content:"\f0a8";}
-.icon-circle-arrow-right:before{content:"\f0a9";}
-.icon-circle-arrow-up:before{content:"\f0aa";}
-.icon-circle-arrow-down:before{content:"\f0ab";}
-.icon-globe:before{content:"\f0ac";}
-.icon-wrench:before{content:"\f0ad";}
-.icon-tasks:before{content:"\f0ae";}
-.icon-filter:before{content:"\f0b0";}
-.icon-briefcase:before{content:"\f0b1";}
-.icon-fullscreen:before{content:"\f0b2";}
-.icon-group:before{content:"\f0c0";}
-.icon-link:before{content:"\f0c1";}
-.icon-cloud:before{content:"\f0c2";}
-.icon-beaker:before{content:"\f0c3";}
-.icon-cut:before{content:"\f0c4";}
-.icon-copy:before{content:"\f0c5";}
-.icon-paperclip:before,.icon-paper-clip:before{content:"\f0c6";}
-.icon-save:before{content:"\f0c7";}
-.icon-sign-blank:before{content:"\f0c8";}
-.icon-reorder:before{content:"\f0c9";}
-.icon-list-ul:before{content:"\f0ca";}
-.icon-list-ol:before{content:"\f0cb";}
-.icon-strikethrough:before{content:"\f0cc";}
-.icon-underline:before{content:"\f0cd";}
-.icon-table:before{content:"\f0ce";}
-.icon-magic:before{content:"\f0d0";}
-.icon-truck:before{content:"\f0d1";}
-.icon-pinterest:before{content:"\f0d2";}
-.icon-pinterest-sign:before{content:"\f0d3";}
-.icon-google-plus-sign:before{content:"\f0d4";}
-.icon-google-plus:before{content:"\f0d5";}
-.icon-money:before{content:"\f0d6";}
-.icon-caret-down:before{content:"\f0d7";}
-.icon-caret-up:before{content:"\f0d8";}
-.icon-caret-left:before{content:"\f0d9";}
-.icon-caret-right:before{content:"\f0da";}
-.icon-columns:before{content:"\f0db";}
-.icon-sort:before{content:"\f0dc";}
-.icon-sort-down:before{content:"\f0dd";}
-.icon-sort-up:before{content:"\f0de";}
-.icon-envelope:before{content:"\f0e0";}
-.icon-linkedin:before{content:"\f0e1";}
-.icon-rotate-left:before,.icon-undo:before{content:"\f0e2";}
-.icon-legal:before{content:"\f0e3";}
-.icon-dashboard:before{content:"\f0e4";}
-.icon-comment-alt:before{content:"\f0e5";}
-.icon-comments-alt:before{content:"\f0e6";}
-.icon-bolt:before{content:"\f0e7";}
-.icon-sitemap:before{content:"\f0e8";}
-.icon-umbrella:before{content:"\f0e9";}
-.icon-paste:before{content:"\f0ea";}
-.icon-lightbulb:before{content:"\f0eb";}
-.icon-exchange:before{content:"\f0ec";}
-.icon-cloud-download:before{content:"\f0ed";}
-.icon-cloud-upload:before{content:"\f0ee";}
-.icon-user-md:before{content:"\f0f0";}
-.icon-stethoscope:before{content:"\f0f1";}
-.icon-suitcase:before{content:"\f0f2";}
-.icon-bell-alt:before{content:"\f0f3";}
-.icon-coffee:before{content:"\f0f4";}
-.icon-food:before{content:"\f0f5";}
-.icon-file-text-alt:before{content:"\f0f6";}
-.icon-building:before{content:"\f0f7";}
-.icon-hospital:before{content:"\f0f8";}
-.icon-ambulance:before{content:"\f0f9";}
-.icon-medkit:before{content:"\f0fa";}
-.icon-fighter-jet:before{content:"\f0fb";}
-.icon-beer:before{content:"\f0fc";}
-.icon-h-sign:before{content:"\f0fd";}
-.icon-plus-sign-alt:before{content:"\f0fe";}
-.icon-double-angle-left:before{content:"\f100";}
-.icon-double-angle-right:before{content:"\f101";}
-.icon-double-angle-up:before{content:"\f102";}
-.icon-double-angle-down:before{content:"\f103";}
-.icon-angle-left:before{content:"\f104";}
-.icon-angle-right:before{content:"\f105";}
-.icon-angle-up:before{content:"\f106";}
-.icon-angle-down:before{content:"\f107";}
-.icon-desktop:before{content:"\f108";}
-.icon-laptop:before{content:"\f109";}
-.icon-tablet:before{content:"\f10a";}
-.icon-mobile-phone:before{content:"\f10b";}
-.icon-circle-blank:before{content:"\f10c";}
-.icon-quote-left:before{content:"\f10d";}
-.icon-quote-right:before{content:"\f10e";}
-.icon-spinner:before{content:"\f110";}
-.icon-circle:before{content:"\f111";}
-.icon-mail-reply:before,.icon-reply:before{content:"\f112";}
-.icon-github-alt:before{content:"\f113";}
-.icon-folder-close-alt:before{content:"\f114";}
-.icon-folder-open-alt:before{content:"\f115";}
-.icon-expand-alt:before{content:"\f116";}
-.icon-collapse-alt:before{content:"\f117";}
-.icon-smile:before{content:"\f118";}
-.icon-frown:before{content:"\f119";}
-.icon-meh:before{content:"\f11a";}
-.icon-gamepad:before{content:"\f11b";}
-.icon-keyboard:before{content:"\f11c";}
-.icon-flag-alt:before{content:"\f11d";}
-.icon-flag-checkered:before{content:"\f11e";}
-.icon-terminal:before{content:"\f120";}
-.icon-code:before{content:"\f121";}
-.icon-reply-all:before{content:"\f122";}
-.icon-mail-reply-all:before{content:"\f122";}
-.icon-star-half-full:before,.icon-star-half-empty:before{content:"\f123";}
-.icon-location-arrow:before{content:"\f124";}
-.icon-crop:before{content:"\f125";}
-.icon-code-fork:before{content:"\f126";}
-.icon-unlink:before{content:"\f127";}
-.icon-question:before{content:"\f128";}
-.icon-info:before{content:"\f129";}
-.icon-exclamation:before{content:"\f12a";}
-.icon-superscript:before{content:"\f12b";}
-.icon-subscript:before{content:"\f12c";}
-.icon-eraser:before{content:"\f12d";}
-.icon-puzzle-piece:before{content:"\f12e";}
-.icon-microphone:before{content:"\f130";}
-.icon-microphone-off:before{content:"\f131";}
-.icon-shield:before{content:"\f132";}
-.icon-calendar-empty:before{content:"\f133";}
-.icon-fire-extinguisher:before{content:"\f134";}
-.icon-rocket:before{content:"\f135";}
-.icon-maxcdn:before{content:"\f136";}
-.icon-chevron-sign-left:before{content:"\f137";}
-.icon-chevron-sign-right:before{content:"\f138";}
-.icon-chevron-sign-up:before{content:"\f139";}
-.icon-chevron-sign-down:before{content:"\f13a";}
-.icon-html5:before{content:"\f13b";}
-.icon-css3:before{content:"\f13c";}
-.icon-anchor:before{content:"\f13d";}
-.icon-unlock-alt:before{content:"\f13e";}
-.icon-bullseye:before{content:"\f140";}
-.icon-ellipsis-horizontal:before{content:"\f141";}
-.icon-ellipsis-vertical:before{content:"\f142";}
-.icon-rss-sign:before{content:"\f143";}
-.icon-play-sign:before{content:"\f144";}
-.icon-ticket:before{content:"\f145";}
-.icon-minus-sign-alt:before{content:"\f146";}
-.icon-check-minus:before{content:"\f147";}
-.icon-level-up:before{content:"\f148";}
-.icon-level-down:before{content:"\f149";}
-.icon-check-sign:before{content:"\f14a";}
-.icon-edit-sign:before{content:"\f14b";}
-.icon-external-link-sign:before{content:"\f14c";}
-.icon-share-sign:before{content:"\f14d";}
-.icon-compass:before{content:"\f14e";}
-.icon-collapse:before{content:"\f150";}
-.icon-collapse-top:before{content:"\f151";}
-.icon-expand:before{content:"\f152";}
-.icon-euro:before,.icon-eur:before{content:"\f153";}
-.icon-gbp:before{content:"\f154";}
-.icon-dollar:before,.icon-usd:before{content:"\f155";}
-.icon-rupee:before,.icon-inr:before{content:"\f156";}
-.icon-yen:before,.icon-jpy:before{content:"\f157";}
-.icon-renminbi:before,.icon-cny:before{content:"\f158";}
-.icon-won:before,.icon-krw:before{content:"\f159";}
-.icon-bitcoin:before,.icon-btc:before{content:"\f15a";}
-.icon-file:before{content:"\f15b";}
-.icon-file-text:before{content:"\f15c";}
-.icon-sort-by-alphabet:before{content:"\f15d";}
-.icon-sort-by-alphabet-alt:before{content:"\f15e";}
-.icon-sort-by-attributes:before{content:"\f160";}
-.icon-sort-by-attributes-alt:before{content:"\f161";}
-.icon-sort-by-order:before{content:"\f162";}
-.icon-sort-by-order-alt:before{content:"\f163";}
-.icon-thumbs-up:before{content:"\f164";}
-.icon-thumbs-down:before{content:"\f165";}
-.icon-youtube-sign:before{content:"\f166";}
-.icon-youtube:before{content:"\f167";}
-.icon-xing:before{content:"\f168";}
-.icon-xing-sign:before{content:"\f169";}
-.icon-youtube-play:before{content:"\f16a";}
-.icon-dropbox:before{content:"\f16b";}
-.icon-stackexchange:before{content:"\f16c";}
-.icon-instagram:before{content:"\f16d";}
-.icon-flickr:before{content:"\f16e";}
-.icon-adn:before{content:"\f170";}
-.icon-bitbucket:before{content:"\f171";}
-.icon-bitbucket-sign:before{content:"\f172";}
-.icon-tumblr:before{content:"\f173";}
-.icon-tumblr-sign:before{content:"\f174";}
-.icon-long-arrow-down:before{content:"\f175";}
-.icon-long-arrow-up:before{content:"\f176";}
-.icon-long-arrow-left:before{content:"\f177";}
-.icon-long-arrow-right:before{content:"\f178";}
-.icon-apple:before{content:"\f179";}
-.icon-windows:before{content:"\f17a";}
-.icon-android:before{content:"\f17b";}
-.icon-linux:before{content:"\f17c";}
-.icon-dribbble:before{content:"\f17d";}
-.icon-skype:before{content:"\f17e";}
-.icon-foursquare:before{content:"\f180";}
-.icon-trello:before{content:"\f181";}
-.icon-female:before{content:"\f182";}
-.icon-male:before{content:"\f183";}
-.icon-gittip:before{content:"\f184";}
-.icon-sun:before{content:"\f185";}
-.icon-moon:before{content:"\f186";}
-.icon-archive:before{content:"\f187";}
-.icon-bug:before{content:"\f188";}
-.icon-vk:before{content:"\f189";}
-.icon-weibo:before{content:"\f18a";}
-.icon-renren:before{content:"\f18b";}
-
-.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle;}
-.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%;}
-.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px;}
-.btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit;}
-.btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em;}
-a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
-.icon-glass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-music{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-search{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-envelope-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-heart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-star{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-star-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-user{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-film{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-th-large{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-th{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-th-list{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-ok{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-remove{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-zoom-in{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-zoom-out{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-power-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-signal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-cog{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-gear{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-trash{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-home{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-file-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-time{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-road{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-download-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-download{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-upload{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-inbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-play-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-repeat{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-rotate-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-refresh{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-list-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-lock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-flag{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-headphones{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-volume-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-volume-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-volume-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-qrcode{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-barcode{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-tag{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-tags{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-book{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bookmark{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-print{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-camera{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-font{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bold{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-italic{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-text-height{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-text-width{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-align-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-align-center{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-align-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-align-justify{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-list{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-indent-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-indent-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-facetime-video{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-picture{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-pencil{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-map-marker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-adjust{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-tint{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-edit{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-share{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-check{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-move{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-step-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-fast-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-pause{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-stop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-fast-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-step-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-eject{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-chevron-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-chevron-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-plus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-minus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-remove-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-ok-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-question-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-info-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-screenshot{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-remove-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-ok-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-ban-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-share-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-mail-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-resize-full{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-resize-small{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-plus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-minus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-asterisk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-exclamation-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-gift{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-leaf{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-fire{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-eye-open{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-eye-close{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-warning-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-plane{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-calendar{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-random{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-comment{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-magnet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-chevron-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-chevron-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-retweet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-shopping-cart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-folder-close{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-folder-open{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-resize-vertical{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-resize-horizontal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bar-chart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-twitter-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-facebook-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-camera-retro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-key{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-cogs{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-gears{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-comments{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-thumbs-up-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-thumbs-down-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-star-half{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-heart-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-signout{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-linkedin-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-pushpin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-external-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-signin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-trophy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-github-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-upload-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-lemon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-check-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-unchecked{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bookmark-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-phone-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-twitter{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-facebook{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-github{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-credit-card{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-rss{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-hdd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bullhorn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bell{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-certificate{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-hand-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-hand-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-hand-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-hand-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-circle-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-circle-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-circle-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-circle-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-globe{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-wrench{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-tasks{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-filter{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-briefcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-fullscreen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-group{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-cloud{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-beaker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-cut{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-copy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-paper-clip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-paperclip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-save{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sign-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-reorder{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-list-ul{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-list-ol{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-strikethrough{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-underline{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-table{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-magic{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-truck{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-pinterest{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-pinterest-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-google-plus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-google-plus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-money{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-caret-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-caret-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-caret-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-caret-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-columns{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sort{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sort-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sort-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-envelope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-linkedin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-undo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-rotate-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-legal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-dashboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-comment-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-comments-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bolt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sitemap{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-umbrella{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-paste{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-lightbulb{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-exchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-cloud-download{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-cloud-upload{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-user-md{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-stethoscope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-suitcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bell-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-coffee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-food{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-file-text-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-building{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-hospital{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-ambulance{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-medkit{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-fighter-jet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-beer{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-h-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-plus-sign-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-double-angle-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-double-angle-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-double-angle-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-double-angle-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-angle-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-angle-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-angle-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-angle-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-desktop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-laptop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-tablet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-mobile-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-circle-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-quote-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-quote-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-spinner{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-reply{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-mail-reply{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-github-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-folder-close-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-folder-open-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-expand-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-collapse-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-smile{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-frown{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-meh{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-gamepad{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-keyboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-flag-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-flag-checkered{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-terminal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-code{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-reply-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-mail-reply-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-star-half-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-star-half-full{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-location-arrow{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-crop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-code-fork{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-unlink{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-question{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-info{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-exclamation{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-superscript{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-subscript{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-eraser{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-puzzle-piece{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-microphone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-microphone-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-shield{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-calendar-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-fire-extinguisher{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-rocket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-maxcdn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-chevron-sign-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-chevron-sign-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-chevron-sign-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-chevron-sign-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-html5{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-css3{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-anchor{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-unlock-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bullseye{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-ellipsis-horizontal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-ellipsis-vertical{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-rss-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-play-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-ticket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-minus-sign-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-check-minus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-level-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-level-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-check-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-edit-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-external-link-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-share-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-compass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-collapse{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-collapse-top{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-expand{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-eur{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-euro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-gbp{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-usd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-dollar{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-inr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-rupee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-jpy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-yen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-cny{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-renminbi{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-krw{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-won{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-btc{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bitcoin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-file{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-file-text{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sort-by-alphabet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sort-by-alphabet-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sort-by-attributes{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sort-by-attributes-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sort-by-order{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sort-by-order-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-thumbs-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-thumbs-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-youtube-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-youtube{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-xing{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-xing-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-youtube-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-dropbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-stackexchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-instagram{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-flickr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-adn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bitbucket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bitbucket-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-tumblr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-tumblr-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-long-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-long-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-long-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-long-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-apple{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-windows{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-android{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-linux{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-dribbble{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-skype{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-foursquare{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-trello{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-female{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-male{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-gittip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-sun{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-moon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-archive{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-bug{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-vk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-weibo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
-.icon-renren{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}

code/modules/goonchat/browserassets/html/browserOutput.html

@@ -14,7 +14,7 @@
 </head>
 <body>
 	<div id="loading">
-		<i class="icon-spinner icon-2x"></i>
+		<i class="fas fa-spinner fa-2x"></i>
 		<div>
 			Loading...<br><br>
 			If this takes longer than 30 seconds, it will automatically reload a maximum of 5 times.<br>
@@ -26,31 +26,31 @@
 	</div>
 	<div id="userBar" style="display: none;">
 		<div id="ping">
-			<i class="icon-circle" id="pingDot"></i>
+			<i class="fas fa-circle" id="pingDot"></i>
 			<span class="ms" id="pingMs">--ms</span>
 		</div>
 		<div id="darkmodething">
-			<a href="#" class="subCell toggle" id="changeColorPreset" title="Change color preset"><i class="icon-eye-open"></i></a>
+			<a href="#" class="subCell toggle" id="changeColorPreset" title="Change color preset"><i class="fas fa-eye-open"></i></a>
 		</div>
 		<div id="audio">
-			<a href="#" class="subCell toggle" id="toggleAudio" title="Audio"><i class="icon-volume-up"></i></a>
+			<a href="#" class="subCell toggle" id="toggleAudio" title="Audio"><i class="fas fa-volume-up"></i></a>
 		</div>
 		<div id="options">
-			<a href="#" class="subCell toggle" id="toggleOptions" title="Options"><i class="icon-cog"></i></a>
+			<a href="#" class="subCell toggle" id="toggleOptions" title="Options"><i class="fas fa-cog"></i></a>
 		</div>
 		<div class="sub" id="subOptions">
-			<a href="#" class="subCell decreaseFont topCell" id="decreaseFont"><span>Decrease font size</span> <i class="icon-font">-</i></a>
-			<a href="#" class="subCell increaseFont" id="increaseFont"><span>Increase font size</span> <i class="icon-font">+</i></a>
-			<a href="#" class="subCell decreaseLineHeight" id="decreaseLineHeight"><span>Decrease line height</span> <i class="icon-text-height">-</i></a>
-			<a href="#" class="subCell increaseLineHeight" id="increaseLineHeight"><span>Increase line height</span> <i class="icon-text-height">+</i></a>
-			<a href="#" class="subCell togglePing" id="togglePing"><span>Toggle ping display</span> <i class="icon-circle"></i></a>
-			<a href="#" class="subCell highlightTerm" id="highlightTerm"><span>Highlight string</span> <i class="icon-tag"></i></a>
-			<a href="#" class="subCell saveLog" id="saveLog"><span>Save chat log</span> <i class="icon-save"></i></a>
-			<a href="#" class="subCell toggleCombine" id="toggleCombine"><span>Toggle line combining</span> <i class="icon-filter"></i></a>
-			<a href="#" class="subCell clearMessages" id="clearMessages"><span>Clear all messages</span> <i class="icon-eraser"></i></a>
+			<a href="#" class="subCell decreaseFont topCell" id="decreaseFont"><span>Decrease font size</span> <i class="fas fa-font">-</i></a>
+			<a href="#" class="subCell increaseFont" id="increaseFont"><span>Increase font size</span> <i class="fas fa-font">+</i></a>
+			<a href="#" class="subCell decreaseLineHeight" id="decreaseLineHeight"><span>Decrease line height</span> <i class="fas fa-text-height">-</i></a>
+			<a href="#" class="subCell increaseLineHeight" id="increaseLineHeight"><span>Increase line height</span> <i class="fas fa-text-height">+</i></a>
+			<a href="#" class="subCell togglePing" id="togglePing"><span>Toggle ping display</span> <i class="fas fa-circle"></i></a>
+			<a href="#" class="subCell highlightTerm" id="highlightTerm"><span>Highlight string</span> <i class="fas fa-tag"></i></a>
+			<a href="#" class="subCell saveLog" id="saveLog"><span>Save chat log</span> <i class="fas fa-save"></i></a>
+			<a href="#" class="subCell toggleCombine" id="toggleCombine"><span>Toggle line combining</span> <i class="fas fa-filter"></i></a>
+			<a href="#" class="subCell clearMessages" id="clearMessages"><span>Clear all messages</span> <i class="fas fa-eraser"></i></a>
 		</div>
 		<div class="sub" id="subAudio">
-			<span class="subCell topCell" id="musicVolumeSpan"><input type="range" class="hidden" id="musicVolume"><span id="musicVolumeText">Admin music volume</span><i class="icon-music"></i></span>
+			<span class="subCell topCell" id="musicVolumeSpan"><input type="range" class="hidden" id="musicVolume"><span id="musicVolumeText">Admin music volume</span><i class="fas fa-music"></i></span>
 		</div>
 	</div>
 	<audio class="hidden" id="adminMusic" autoplay></audio>

code/modules/language/language_menu.dm

@@ -11,7 +11,7 @@
 /datum/language_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.language_menu_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "language_menu", "Language Menu", 700, 800, master_ui, state)
+		ui = new(user, src, ui_key, "language_menu", "Language Menu", 700, 600, master_ui, state)
 		ui.open()
 
 /datum/language_menu/ui_data(mob/user)

code/modules/mining/laborcamp/laborstacker.dm

@@ -1,157 +1,162 @@
-GLOBAL_LIST(labor_sheet_values)
-
-/**********************Prisoners' Console**************************/
-
-/obj/machinery/mineral/labor_claim_console
-	name = "point claim console"
-	desc = "A stacking console with an electromagnetic writer, used to track ore mined by prisoners."
-	icon = 'icons/obj/machines/mining_machines.dmi'
-	icon_state = "console"
-	density = FALSE
-	var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null
-	var/machinedir = SOUTH
-	var/obj/machinery/door/airlock/release_door
-	var/door_tag = "prisonshuttle"
-	var/obj/item/radio/Radio //needed to send messages to sec radio
-
-/obj/machinery/mineral/labor_claim_console/Initialize()
-	. = ..()
-	Radio = new/obj/item/radio(src)
-	Radio.listening = FALSE
-	locate_stacking_machine()
-
-	if(!GLOB.labor_sheet_values)
-		var/sheet_list = list()
-		for(var/sheet_type in subtypesof(/obj/item/stack/sheet))
-			var/obj/item/stack/sheet/sheet = sheet_type
-			if(!initial(sheet.point_value) || (initial(sheet.merge_type) && initial(sheet.merge_type) != sheet_type)) //ignore no-value sheets and x/fifty subtypes
-				continue
-			sheet_list += list(list("ore" = initial(sheet.name), "value" = initial(sheet.point_value)))
-		GLOB.labor_sheet_values = sortList(sheet_list, /proc/cmp_sheet_list)
-
-/proc/cmp_sheet_list(list/a, list/b)
-	return a["value"] - b["value"]
-
-/obj/machinery/mineral/labor_claim_console/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "labor_claim_console", name, 450, 475, master_ui, state)
-		ui.open()
-
-/obj/machinery/mineral/labor_claim_console/ui_data(mob/user)
-	var/list/data = list()
-	var/can_go_home = FALSE
-
-	data["emagged"] = (obj_flags & EMAGGED) ? 1 : 0
-	if(obj_flags & EMAGGED)
-		can_go_home = TRUE
-
-	data["status_info"] = "No Prisoner ID detected."
-	var/obj/item/card/id/I = user.get_idcard(TRUE)
-	if(istype(I, /obj/item/card/id/prisoner))
-		var/obj/item/card/id/prisoner/P = I
-		data["id_points"] = P.points
-		if(P.points >= P.goal)
-			can_go_home = TRUE
-			data["status_info"] = "Goal met!"
-		else
-			data["status_info"] = "You are [(P.goal - P.points)] points away."
-
-	if(stacking_machine)
-		data["unclaimed_points"] = stacking_machine.points
-
-	data["ores"] = GLOB.labor_sheet_values
-	data["can_go_home"] = can_go_home
-
-	return data
-
-/obj/machinery/mineral/labor_claim_console/ui_act(action, params)
-	if(..())
-		return
-	switch(action)
-		if("claim_points")
-			var/mob/M = usr
-			var/obj/item/card/id/I = M.get_idcard(TRUE)
-			if(istype(I, /obj/item/card/id/prisoner))
-				var/obj/item/card/id/prisoner/P = I
-				P.points += stacking_machine.points
-				stacking_machine.points = 0
-				to_chat(usr, "<span class='notice'>Points transferred.</span>")
-			else
-				to_chat(usr, "<span class='notice'>No valid id for point transfer detected.</span>")
-		if("move_shuttle")
-			if(!alone_in_area(get_area(src), usr))
-				to_chat(usr, "<span class='warning'>Prisoners are only allowed to be released while alone.</span>")
-			else
-				switch(SSshuttle.moveShuttle("laborcamp", "laborcamp_home", TRUE))
-					if(1)
-						to_chat(usr, "<span class='notice'>Shuttle not found.</span>")
-					if(2)
-						to_chat(usr, "<span class='notice'>Shuttle already at station.</span>")
-					if(3)
-						to_chat(usr, "<span class='notice'>No permission to dock could be granted.</span>")
-					else
-						if(!(obj_flags & EMAGGED))
-							Radio.set_frequency(FREQ_SECURITY)
-							Radio.talk_into(src, "A prisoner has returned to the station. Minerals and Prisoner ID card ready for retrieval.", FREQ_SECURITY)
-						to_chat(usr, "<span class='notice'>Shuttle received message and will be sent shortly.</span>")
-
-/obj/machinery/mineral/labor_claim_console/proc/locate_stacking_machine()
-	stacking_machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
-	if(stacking_machine)
-		stacking_machine.CONSOLE = src
-	else
-		qdel(src)
-
-/obj/machinery/mineral/labor_claim_console/emag_act(mob/user)
-	. = ..()
-	if(obj_flags & EMAGGED)
-		return
-	obj_flags |= EMAGGED
-	to_chat(user, "<span class='warning'>PZZTTPFFFT</span>")
-	return TRUE
-
-/**********************Prisoner Collection Unit**************************/
-
-/obj/machinery/mineral/stacking_machine/laborstacker
-	force_connect = TRUE
-	var/points = 0 //The unclaimed value of ore stacked.
-
-/obj/machinery/mineral/stacking_machine/laborstacker/process_sheet(obj/item/stack/sheet/inp)
-	points += inp.point_value * inp.amount
-	..()
-
-/obj/machinery/mineral/stacking_machine/laborstacker/attackby(obj/item/I, mob/living/user)
-	if(istype(I, /obj/item/stack/sheet) && user.canUnEquip(I))
-		var/obj/item/stack/sheet/inp = I
-		points += inp.point_value * inp.amount
-	return ..()
-
-/**********************Point Lookup Console**************************/
-
-/obj/machinery/mineral/labor_points_checker
-	name = "points checking console"
-	desc = "A console used by prisoners to check the progress on their quotas. Simply swipe a prisoner ID."
-	icon = 'icons/obj/machines/mining_machines.dmi'
-	icon_state = "console"
-	density = FALSE
-
-/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
-	user.examinate(src)
-
-/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/card/id))
-		if(istype(I, /obj/item/card/id/prisoner))
-			var/obj/item/card/id/prisoner/prisoner_id = I
-			to_chat(user, "<span class='notice'><B>ID: [prisoner_id.registered_name]</B></span>")
-			to_chat(user, "<span class='notice'>Points Collected:[prisoner_id.points]</span>")
-			to_chat(user, "<span class='notice'>Point Quota: [prisoner_id.goal]</span>")
-			to_chat(user, "<span class='notice'>Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.</span>")
-		else
-			to_chat(user, "<span class='warning'>Error: Invalid ID</span>")
-	else
-		return ..()
+GLOBAL_LIST(labor_sheet_values)
+
+/**********************Prisoners' Console**************************/
+
+/obj/machinery/mineral/labor_claim_console
+	name = "point claim console"
+	desc = "A stacking console with an electromagnetic writer, used to track ore mined by prisoners."
+	icon = 'icons/obj/machines/mining_machines.dmi'
+	icon_state = "console"
+	density = FALSE
+	var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null
+	var/machinedir = SOUTH
+	var/obj/machinery/door/airlock/release_door
+	var/door_tag = "prisonshuttle"
+	var/obj/item/radio/Radio //needed to send messages to sec radio
+
+/obj/machinery/mineral/labor_claim_console/Initialize()
+	. = ..()
+	Radio = new/obj/item/radio(src)
+	Radio.listening = FALSE
+	locate_stacking_machine()
+
+	if(!GLOB.labor_sheet_values)
+		var/sheet_list = list()
+		for(var/sheet_type in subtypesof(/obj/item/stack/sheet))
+			var/obj/item/stack/sheet/sheet = sheet_type
+			if(!initial(sheet.point_value) || (initial(sheet.merge_type) && initial(sheet.merge_type) != sheet_type)) //ignore no-value sheets and x/fifty subtypes
+				continue
+			sheet_list += list(list("ore" = initial(sheet.name), "value" = initial(sheet.point_value)))
+		GLOB.labor_sheet_values = sortList(sheet_list, /proc/cmp_sheet_list)
+
+/proc/cmp_sheet_list(list/a, list/b)
+	return a["value"] - b["value"]
+
+/obj/machinery/mineral/labor_claim_console/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "labor_claim_console", name, 315, 430, master_ui, state)
+		ui.open()
+
+/obj/machinery/mineral/labor_claim_console/ui_data(mob/user)
+	var/list/data = list()
+	var/can_go_home = FALSE
+
+	data["emagged"] = (obj_flags & EMAGGED) ? 1 : 0
+	if(obj_flags & EMAGGED)
+		can_go_home = TRUE
+
+	var/obj/item/card/id/I = user.get_idcard(TRUE)
+	if(istype(I, /obj/item/card/id/prisoner))
+		var/obj/item/card/id/prisoner/P = I
+		data["id_points"] = P.points
+		if(P.points >= P.goal)
+			can_go_home = TRUE
+			data["status_info"] = "Goal met!"
+		else
+			data["status_info"] = "You are [(P.goal - P.points)] points away."
+	else
+		data["status_info"] = "No Prisoner ID detected."
+		data["id_points"] = 0
+
+	if(stacking_machine)
+		data["unclaimed_points"] = stacking_machine.points
+
+	data["ores"] = GLOB.labor_sheet_values
+	data["can_go_home"] = can_go_home
+
+	return data
+
+/obj/machinery/mineral/labor_claim_console/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("claim_points")
+			var/mob/M = usr
+			var/obj/item/card/id/I = M.get_idcard(TRUE)
+			if(istype(I, /obj/item/card/id/prisoner))
+				var/obj/item/card/id/prisoner/P = I
+				P.points += stacking_machine.points
+				stacking_machine.points = 0
+				to_chat(usr, "<span class='notice'>Points transferred.</span>")
+				. = TRUE
+			else
+				to_chat(usr, "<span class='alert'>No valid id for point transfer detected.</span>")
+		if("move_shuttle")
+			if(!alone_in_area(get_area(src), usr))
+				to_chat(usr, "<span class='alert'>Prisoners are only allowed to be released while alone.</span>")
+			else
+				switch(SSshuttle.moveShuttle("laborcamp", "laborcamp_home", TRUE))
+					if(1)
+						to_chat(usr, "<span class='alert'>Shuttle not found.</span>")
+					if(2)
+						to_chat(usr, "<span class='alert'>Shuttle already at station.</span>")
+					if(3)
+						to_chat(usr, "<span class='alert'>No permission to dock could be granted.</span>")
+					else
+						if(!(obj_flags & EMAGGED))
+							Radio.set_frequency(FREQ_SECURITY)
+							Radio.talk_into(src, "A prisoner has returned to the station. Minerals and Prisoner ID card ready for retrieval.", FREQ_SECURITY)
+						to_chat(usr, "<span class='notice'>Shuttle received message and will be sent shortly.</span>")
+						. = TRUE
+						
+
+/obj/machinery/mineral/labor_claim_console/proc/locate_stacking_machine()
+	stacking_machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
+	if(stacking_machine)
+		stacking_machine.CONSOLE = src
+	else
+		qdel(src)
+
+/obj/machinery/mineral/labor_claim_console/emag_act(mob/user)
+	. = ..()
+	if(obj_flags & EMAGGED)
+		return
+	obj_flags |= EMAGGED
+	to_chat(user, "<span class='warning'>PZZTTPFFFT</span>")
+	return TRUE
+
+/**********************Prisoner Collection Unit**************************/
+
+/obj/machinery/mineral/stacking_machine/laborstacker
+	force_connect = TRUE
+	var/points = 0 //The unclaimed value of ore stacked.
+
+/obj/machinery/mineral/stacking_machine/laborstacker/process_sheet(obj/item/stack/sheet/inp)
+	points += inp.point_value * inp.amount
+	..()
+
+/obj/machinery/mineral/stacking_machine/laborstacker/attackby(obj/item/I, mob/living/user)
+	if(istype(I, /obj/item/stack/sheet) && user.canUnEquip(I))
+		var/obj/item/stack/sheet/inp = I
+		points += inp.point_value * inp.amount
+	return ..()
+
+/**********************Point Lookup Console**************************/
+
+/obj/machinery/mineral/labor_points_checker
+	name = "points checking console"
+	desc = "A console used by prisoners to check the progress on their quotas. Simply swipe a prisoner ID."
+	icon = 'icons/obj/machines/mining_machines.dmi'
+	icon_state = "console"
+	density = FALSE
+
+/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
+	user.examinate(src)
+
+/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/card/id))
+		if(istype(I, /obj/item/card/id/prisoner))
+			var/obj/item/card/id/prisoner/prisoner_id = I
+			to_chat(user, "<span class='notice'><B>ID: [prisoner_id.registered_name]</B></span>")
+			to_chat(user, "<span class='notice'>Points Collected:[prisoner_id.points]</span>")
+			to_chat(user, "<span class='notice'>Point Quota: [prisoner_id.goal]</span>")
+			to_chat(user, "<span class='notice'>Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.</span>")
+		else
+			to_chat(user, "<span class='warning'>Error: Invalid ID</span>")
+	else
+		return ..()

code/modules/mining/machine_redemption.dm

@@ -220,6 +220,7 @@
 		data["disconnected"] = "mineral withdrawal is on hold"
 
 	data["diskDesigns"] = list()
+	data["hasDisk"] = FALSE
 	if(inserted_disk)
 		data["hasDisk"] = TRUE
 		if(inserted_disk.blueprints.len)

code/modules/mining/mint.dm

@@ -1,105 +1,114 @@
-/**********************Mint**************************/
-
-
-/obj/machinery/mineral/mint
-	name = "coin press"
-	icon = 'icons/obj/economy.dmi'
-	icon_state = "coinpress0"
-	density = TRUE
-	var/newCoins = 0   //how many coins the machine made in it's last load
-	var/processing = FALSE
-	var/chosen = MAT_METAL //which material will be used to make coins
-	var/coinsToProduce = 10
-	speed_process = TRUE
-
-
-/obj/machinery/mineral/mint/Initialize()
-	. = ..()
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM), MINERAL_MATERIAL_AMOUNT * 50, FALSE, /obj/item/stack)
-
-/obj/machinery/mineral/mint/process()
-	var/turf/T = get_step(src, input_dir)
-	if(!T)
-		return
-
-	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
-	for(var/obj/item/stack/sheet/O in T)
-		materials.insert_stack(O, O.amount)
-
-/obj/machinery/mineral/mint/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
-	var/dat = "<b>Coin Press</b><br>"
-
-	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
-	for(var/mat_id in materials.materials)
-		var/datum/material/M = materials.materials[mat_id]
-		if(!M.amount && chosen != mat_id)
-			continue
-		dat += "<br><b>[M.name] amount:</b> [M.amount] cm<sup>3</sup> "
-		if (chosen == mat_id)
-			dat += "<b>Chosen</b>"
-		else
-			dat += "<A href='?src=[REF(src)];choose=[mat_id]'>Choose</A>"
-
-	var/datum/material/M = materials.materials[chosen]
-
-	dat += "<br><br>Will produce [coinsToProduce] [lowertext(M.name)] coins if enough materials are available.<br>"
-	dat += "<A href='?src=[REF(src)];chooseAmt=-10'>-10</A> "
-	dat += "<A href='?src=[REF(src)];chooseAmt=-5'>-5</A> "
-	dat += "<A href='?src=[REF(src)];chooseAmt=-1'>-1</A> "
-	dat += "<A href='?src=[REF(src)];chooseAmt=1'>+1</A> "
-	dat += "<A href='?src=[REF(src)];chooseAmt=5'>+5</A> "
-	dat += "<A href='?src=[REF(src)];chooseAmt=10'>+10</A> "
-
-	dat += "<br><br>In total this machine produced <font color='green'><b>[newCoins]</b></font> coins."
-	dat += "<br><A href='?src=[REF(src)];makeCoins=[1]'>Make coins</A>"
-	user << browse(dat, "window=mint")
-
-/obj/machinery/mineral/mint/Topic(href, href_list)
-	if(..())
-		return
-	usr.set_machine(src)
-	src.add_fingerprint(usr)
-	if(processing==1)
-		to_chat(usr, "<span class='notice'>The machine is processing.</span>")
-		return
-	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
-	if(href_list["choose"])
-		if(materials.materials[href_list["choose"]])
-			chosen = href_list["choose"]
-	if(href_list["chooseAmt"])
-		coinsToProduce = CLAMP(coinsToProduce + text2num(href_list["chooseAmt"]), 0, 1000)
-	if(href_list["makeCoins"])
-		var/temp_coins = coinsToProduce
-		processing = TRUE
-		icon_state = "coinpress1"
-		var/coin_mat = MINERAL_MATERIAL_AMOUNT * 0.2
-		var/datum/material/M = materials.materials[chosen]
-		if(!M || !M.coin_type)
-			updateUsrDialog()
-			return
-
-		while(coinsToProduce > 0 && materials.use_amount_type(coin_mat, chosen))
-			create_coins(M.coin_type)
-			coinsToProduce--
-			newCoins++
-			src.updateUsrDialog()
-			sleep(5)
-
-		icon_state = "coinpress0"
-		processing = FALSE
-		coinsToProduce = temp_coins
-	src.updateUsrDialog()
-	return
-
-/obj/machinery/mineral/mint/proc/create_coins(P)
-	var/turf/T = get_step(src,output_dir)
-	if(T)
-		var/obj/item/O = new P(src)
-		var/obj/item/storage/bag/money/M = locate(/obj/item/storage/bag/money, T)
-		if(!M)
-			M = new /obj/item/storage/bag/money(src)
-			unload_mineral(M)
-		O.forceMove(M)
+/**********************Mint**************************/
+
+
+/obj/machinery/mineral/mint
+	name = "coin press"
+	icon = 'icons/obj/economy.dmi'
+	icon_state = "coinpress0"
+	density = TRUE
+	input_dir = EAST
+
+	var/produced_coins = 0 // how many coins the machine has made in it's last cycle
+	var/processing = FALSE
+	var/chosen = MAT_METAL //which material will be used to make coins
+
+
+/obj/machinery/mineral/mint/Initialize()
+	. = ..()
+	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM), MINERAL_MATERIAL_AMOUNT * 75, FALSE, /obj/item/stack)
+
+/obj/machinery/mineral/mint/process()
+	var/turf/T = get_step(src, input_dir)
+	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+	
+	for(var/obj/item/stack/O in T)
+		var/inserted = materials.insert_item(O)
+		if(inserted)
+			qdel(O)
+
+	if(processing)
+		var/datum/material/M = chosen
+
+		if(!M)
+			processing = FALSE
+			icon_state = "coinpress0"
+			return
+
+		icon_state = "coinpress1"
+		var/coin_mat = MINERAL_MATERIAL_AMOUNT
+
+		for(var/sheets in 1 to 2)
+			if(materials.use_amount_mat(coin_mat, chosen))
+				for(var/coin_to_make in 1 to 5)
+					create_coins()
+					produced_coins++
+			else 
+				var/found_new = FALSE
+				for(var/datum/material/inserted_material in materials.materials)
+					var/amount = materials.get_material_amount(inserted_material)
+
+					if(amount)
+						chosen = inserted_material
+						found_new = TRUE
+				
+				if(!found_new)
+					processing = FALSE
+	else
+		icon_state = "coinpress0"
+
+/obj/machinery/mineral/mint/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "mint", name, 300, 250, master_ui, state)
+		ui.open()
+
+/obj/machinery/mineral/mint/ui_data()
+	var/list/data = list()
+	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+
+	for(var/datum/material/inserted_material in materials.materials)
+		var/amount = materials.get_material_amount(inserted_material)
+		
+		if(!amount)
+			continue
+
+		data["inserted_materials"] += list(list(
+			"material" = inserted_material.name,
+			"amount" = amount
+		))
+
+		if(chosen == inserted_material)
+			data["chosen_material"] = inserted_material.name
+
+	data["produced_coins"] = produced_coins
+	data["processing"] = processing
+
+	return data;
+
+/obj/machinery/mineral/mint/ui_act(action, params, datum/tgui/ui)
+	switch(action)
+		if ("startpress")
+			if (!processing)
+				produced_coins = 0
+			processing = TRUE
+		if ("stoppress")
+			processing = FALSE
+		if ("changematerial")
+			var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+			for(var/datum/material/mat in materials.materials)
+				if (params["material_name"] == mat.name)
+					chosen = mat
+
+/obj/machinery/mineral/mint/proc/create_coins()
+	var/turf/T = get_step(src,output_dir)
+	var/temp_list = list()
+	temp_list[chosen] = 400
+	if(T)
+		var/obj/item/O = new /obj/item/coin(src)
+		var/obj/item/storage/bag/money/B = locate(/obj/item/storage/bag/money, T)
+		O.set_custom_materials(temp_list)
+		if(!B)
+			B = new /obj/item/storage/bag/money(src)
+			unload_mineral(B)
+		O.forceMove(B)

code/modules/mining/satchel_ore_boxdm.dm

@@ -1,89 +1,98 @@
-
-/**********************Ore box**************************/
-
-/obj/structure/ore_box
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "orebox"
-	name = "ore box"
-	desc = "A heavy wooden box, which can be filled with a lot of ores."
-	density = TRUE
-	pressure_resistance = 5*ONE_ATMOSPHERE
-
-/obj/structure/ore_box/attackby(obj/item/W, mob/user, params)
-	if (istype(W, /obj/item/stack/ore))
-		user.transferItemToLoc(W, src)
-	else if(SEND_SIGNAL(W, COMSIG_CONTAINS_STORAGE))
-		SEND_SIGNAL(W, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/stack/ore, src)
-		to_chat(user, "<span class='notice'>You empty the ore in [W] into \the [src].</span>")
-	else
-		return ..()
-
-/obj/structure/ore_box/crowbar_act(mob/living/user, obj/item/I)
-	if(I.use_tool(src, user, 50, volume=50))
-		user.visible_message("[user] pries \the [src] apart.",
-			"<span class='notice'>You pry apart \the [src].</span>",
-			"<span class='italics'>You hear splitting wood.</span>")
-		deconstruct(TRUE, user)
-	return TRUE
-
-/obj/structure/ore_box/examine(mob/living/user)
-	if(Adjacent(user) && istype(user))
-		show_contents(user)
-	return ..()
-
-/obj/structure/ore_box/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
-	if(Adjacent(user))
-		show_contents(user)
-
-/obj/structure/ore_box/attack_robot(mob/user)
-	if(Adjacent(user))
-		show_contents(user)
-
-/obj/structure/ore_box/proc/show_contents(mob/user)
-	var/dat = text("<b>The contents of the ore box reveal...</b><br>")
-	var/list/assembled = list()
-	for(var/obj/item/stack/ore/O in src)
-		assembled[O.type] += O.amount
-	for(var/type in assembled)
-		var/obj/item/stack/ore/O = type
-		dat += "[initial(O.name)] - [assembled[type]]<br>"
-	dat += text("<br><br><A href='?src=[REF(src)];removeall=1'>Empty box</A>")
-	user << browse(dat, "window=orebox")
-
-/obj/structure/ore_box/proc/dump_box_contents()
-	var/drop = drop_location()
-	for(var/obj/item/stack/ore/O in src)
-		if(QDELETED(O))
-			continue
-		if(QDELETED(src))
-			break
-		O.forceMove(drop)
-		if(TICK_CHECK)
-			stoplag()
-			drop = drop_location()
-
-/obj/structure/ore_box/Topic(href, href_list)
-	if(..())
-		return
-	if(!Adjacent(usr))
-		return
-
-	usr.set_machine(src)
-	add_fingerprint(usr)
-	if(href_list["removeall"])
-		dump_box_contents()
-		to_chat(usr, "<span class='notice'>You open the release hatch on the box..</span>")
-	updateUsrDialog()
-
-/obj/structure/ore_box/deconstruct(disassembled = TRUE, mob/user)
-	var/obj/item/stack/sheet/mineral/wood/WD = new (loc, 4)
-	if(user)
-		WD.add_fingerprint(user)
-	dump_box_contents()
-	qdel(src)
-
-/obj/structure/ore_box/onTransitZ()
-	return
+
+/**********************Ore box**************************/
+
+/obj/structure/ore_box
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "orebox"
+	name = "ore box"
+	desc = "A heavy wooden box, which can be filled with a lot of ores."
+	density = TRUE
+	pressure_resistance = 5*ONE_ATMOSPHERE
+
+/obj/structure/ore_box/attackby(obj/item/W, mob/user, params)
+	if (istype(W, /obj/item/stack/ore))
+		user.transferItemToLoc(W, src)
+	else if(SEND_SIGNAL(W, COMSIG_CONTAINS_STORAGE))
+		SEND_SIGNAL(W, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/stack/ore, src)
+		to_chat(user, "<span class='notice'>You empty the ore in [W] into \the [src].</span>")
+	else
+		return ..()
+
+/obj/structure/ore_box/crowbar_act(mob/living/user, obj/item/I)
+	if(I.use_tool(src, user, 50, volume=50))
+		user.visible_message("[user] pries \the [src] apart.",
+			"<span class='notice'>You pry apart \the [src].</span>",
+			"<span class='italics'>You hear splitting wood.</span>")
+		deconstruct(TRUE, user)
+	return TRUE
+
+/obj/structure/ore_box/examine(mob/living/user)
+	if(Adjacent(user) && istype(user))
+		ui_interact(user)
+	return ..()
+
+/obj/structure/ore_box/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
+	if(Adjacent(user))
+		ui_interact(user)
+
+/obj/structure/ore_box/attack_robot(mob/user)
+	if(Adjacent(user))
+		ui_interact(user)
+
+/obj/structure/ore_box/proc/dump_box_contents()
+	var/drop = drop_location()
+	for(var/obj/item/stack/ore/O in src)
+		if(QDELETED(O))
+			continue
+		if(QDELETED(src))
+			break
+		O.forceMove(drop)
+		if(TICK_CHECK)
+			stoplag()
+			drop = drop_location()
+
+/obj/structure/ore_box/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "ore_box", name, 335, 415, master_ui, state)
+		ui.open()
+
+/obj/structure/ore_box/ui_data()
+	var/contents = list()
+	for(var/obj/item/stack/ore/O in src)
+		contents[O.type] += O.amount
+
+	var/data = list()
+	data["materials"] = list()
+	for(var/type in contents)
+		var/obj/item/stack/ore/O = type
+		var/name = initial(O.name)
+		data["materials"] += list(list("name" = name, "amount" = contents[type], "id" = type))
+
+	return data
+
+/obj/structure/ore_box/ui_act(action, params)
+	if(..())
+		return
+	if(!Adjacent(usr))
+		return
+	add_fingerprint(usr)
+	usr.set_machine(src)
+	switch(action)
+		if("removeall")
+			dump_box_contents()
+			to_chat(usr, "<span class='notice'>You open the release hatch on the box..</span>")
+
+/obj/structure/ore_box/deconstruct(disassembled = TRUE, mob/user)
+	var/obj/item/stack/sheet/mineral/wood/WD = new (loc, 4)
+	if(user)
+		WD.add_fingerprint(user)
+	dump_box_contents()
+	qdel(src)
+
+/obj/structure/ore_box/onTransitZ()
+	return

code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm

@@ -130,10 +130,6 @@
 	hacked = TRUE
 	visualAppearence = CLOCKDRONE
 	can_be_held = FALSE
-	mouse_opacity = MOUSE_OPACITY_OPAQUE
-	flavortext = "<b><span class='nezbere'>You are a cogscarab,</span> a tiny building construct of Ratvar. While you're weak and can't recite scripture, \
-	you have a set of quick tools, as well as a replica fabricator that can create brass and convert objects.<br><br>Work with the servants of Ratvar \
-	to construct and maintain defenses at the City of Cogs. If there are no servants, use this time to experiment with base designs!"
 
 /mob/living/simple_animal/drone/cogscarab/ratvar //a subtype for spawning when ratvar is alive, has a slab that it can use and a normal fabricator
 	default_storage = /obj/item/storage/toolbox/brass/prefilled/ratvar

code/modules/modular_computers/computers/item/computer.dm

@@ -316,7 +316,7 @@
 				data["PC_batteryicon"] = "batt_20.gif"
 			else
 				data["PC_batteryicon"] = "batt_5.gif"
-		data["PC_batterypercent"] = "[round(battery_module.battery.percent())] %"
+		data["PC_batterypercent"] = "[round(battery_module.battery.percent())]%"
 		data["PC_showbatteryicon"] = 1
 	else
 		data["PC_batteryicon"] = "batt_5.gif"

code/modules/modular_computers/computers/item/computer_ui.dm

@@ -38,7 +38,8 @@
 		var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
 		assets.send(user)
 
-		ui = new(user, src, ui_key, "ntos_main", "NTOS Main menu", 400, 500, master_ui, state)
+		ui = new(user, src, ui_key, "ntos_main", "NtOS Main menu", 400, 500, master_ui, state)
+		ui.set_style("ntos")
 		ui.open()
 		ui.set_autoupdate(state = 1)
 
@@ -68,10 +69,10 @@
 	switch(action)
 		if("PC_exit")
 			kill_program()
-			return 1
+			return TRUE
 		if("PC_shutdown")
 			shutdown_computer()
-			return 1
+			return TRUE
 		if("PC_minimize")
 			var/mob/user = usr
 			if(!active_program || !all_components[MC_CPU])
@@ -156,6 +157,7 @@
 			comp_light_color = new_color
 			light_color = new_color
 			update_light()
+			return TRUE
 		else
 			return
 

code/modules/modular_computers/file_system/program.dm

@@ -16,9 +16,9 @@
 	var/network_destination = null			// Optional string that describes what NTNet server/system this program connects to. Used in default logging.
 	var/available_on_ntnet = 1				// Whether the program can be downloaded from NTNet. Set to 0 to disable.
 	var/available_on_syndinet = 0			// Whether the program can be downloaded from SyndiNet (accessible via emagging the computer). Set to 1 to enable.
-	var/tgui_id								// ID of TG UI interface
-	var/ui_style							// ID of custom TG UI style (optional)
-	var/ui_x = 575							// Default size of TG UI window, in pixels
+	var/tgui_id								// ID of TGUI interface
+	var/ui_style							// ID of custom TGUI style (optional)
+	var/ui_x = 575							// Default size of TGUI window, in pixels
 	var/ui_y = 700
 	var/ui_header = null					// Example: "something.gif" - a header image that will be rendered in computer's UI when this program is running at background. Images are taken from /icons/program_icons. Be careful not to use too large images!
 

code/modules/modular_computers/file_system/programs/powermonitor.dm

@@ -12,8 +12,9 @@
 	network_destination = "power monitoring system"
 	size = 9
 	tgui_id = "ntos_power_monitor"
-	ui_x = 1200
-	ui_y = 1000
+	ui_style = "ntos"
+	ui_x = 550
+	ui_y = 700
 
 	var/has_alert = 0
 	var/obj/structure/cable/attached_wire

code/modules/modular_computers/file_system/programs/sm_monitor.dm

@@ -9,8 +9,9 @@
 	network_destination = "supermatter monitoring system"
 	size = 5
 	tgui_id = "ntos_supermatter_monitor"
+	ui_style = "ntos"
 	ui_x = 600
-	ui_y = 400
+	ui_y = 350
 	var/last_status = SUPERMATTER_INACTIVE
 	var/list/supermatters
 	var/obj/machinery/power/supermatter_crystal/active		// Currently selected supermatter crystal.

code/modules/modular_computers/laptop_vendor.dm

@@ -46,7 +46,7 @@
 	dev_card = 0
 
 // Recalculates the price and optionally even fabricates the device.
-/obj/machinery/lapvend/proc/fabricate_and_recalc_price(fabricate = 0)
+/obj/machinery/lapvend/proc/fabricate_and_recalc_price(fabricate = FALSE)
 	total_price = 0
 	if(devtype == 1) 		// Laptop, generally cheaper to make it accessible for most station roles
 		var/obj/item/computer_hardware/battery/battery_module = null
@@ -160,7 +160,7 @@
 			if(fabricate)
 				fabricated_tablet.install_component(new/obj/item/computer_hardware/card_slot)
 		return total_price
-	return 0
+	return FALSE
 
 
 
@@ -168,79 +168,78 @@
 
 /obj/machinery/lapvend/ui_act(action, params)
 	if(..())
-		return 1
+		return TRUE
 
 	switch(action)
 		if("pick_device")
 			if(state) // We've already picked a device type
-				return 0
+				return TRUE
 			devtype = text2num(params["pick"])
 			state = 1
-			fabricate_and_recalc_price(0)
-			return 1
+			fabricate_and_recalc_price(FALSE)
+			return TRUE
 		if("clean_order")
 			reset_order()
-			return 1
+			return TRUE
 		if("purchase")
 			try_purchase()
-			return 1
+			return TRUE
 	if((state != 1) && devtype) // Following IFs should only be usable when in the Select Loadout mode
-		return 0
+		return TRUE
 	switch(action)
 		if("confirm_order")
 			state = 2 // Wait for ID swipe for payment processing
-			fabricate_and_recalc_price(0)
-			return 1
+			fabricate_and_recalc_price(FALSE)
+			return TRUE
 		if("hw_cpu")
 			dev_cpu = text2num(params["cpu"])
-			fabricate_and_recalc_price(0)
-			return 1
+			fabricate_and_recalc_price(FALSE)
+			return TRUE
 		if("hw_battery")
 			dev_battery = text2num(params["battery"])
-			fabricate_and_recalc_price(0)
-			return 1
+			fabricate_and_recalc_price(FALSE)
+			return TRUE
 		if("hw_disk")
 			dev_disk = text2num(params["disk"])
-			fabricate_and_recalc_price(0)
-			return 1
+			fabricate_and_recalc_price(FALSE)
+			return TRUE
 		if("hw_netcard")
 			dev_netcard = text2num(params["netcard"])
-			fabricate_and_recalc_price(0)
-			return 1
+			fabricate_and_recalc_price(FALSE)
+			return TRUE
 		if("hw_tesla")
 			dev_apc_recharger = text2num(params["tesla"])
-			fabricate_and_recalc_price(0)
-			return 1
+			fabricate_and_recalc_price(FALSE)
+			return TRUE
 		if("hw_nanoprint")
 			dev_printer = text2num(params["print"])
-			fabricate_and_recalc_price(0)
-			return 1
+			fabricate_and_recalc_price(FALSE)
+			return TRUE
 		if("hw_card")
 			dev_card = text2num(params["card"])
-			fabricate_and_recalc_price(0)
-			return 1
-	return 0
+			fabricate_and_recalc_price(FALSE)
+			return TRUE
+	return TRUE
 
 /obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	if(stat & (BROKEN | NOPOWER | MAINT))
 		if(ui)
 			ui.close()
-		return 0
+		return TRUE
 
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if (!ui)
 		ui = new(user, src, ui_key, "computer_fabricator", "Personal Computer Vendor", 500, 400, state = state)
 		ui.open()
-		ui.set_autoupdate(state = 1)
 
-/obj/machinery/lapvend/attackby(obj/item/I as obj, mob/user as mob)
+/obj/machinery/lapvend/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/stack/spacecash))
 		var/obj/item/stack/spacecash/c = I
 
 		if(!user.temporarilyRemoveItemFromInventory(c))
 			return
 		credits += c.value
-		visible_message("<span class='info'><span class='name'>[usr]</span> inserts [c.value] credits into [src].</span>")
+		visible_message("<span class='info'><span class='name'>[user]</span> inserts [c.value] credits into [src].</span>")
 		qdel(c)
 		return
 	return ..()
@@ -249,9 +248,9 @@
 /obj/machinery/lapvend/proc/process_payment()
 	if(total_price > credits)
 		say("Insufficient credits.")
-		return 0
+		return TRUE
 	else
-		return 1
+		return TRUE
 
 /obj/machinery/lapvend/ui_data(mob/user)
 
@@ -287,5 +286,6 @@
 			credits -= total_price
 			say("Enjoy your new product!")
 			state = 3
-			return 1
-		return 0
+			addtimer(CALLBACK(src, .proc/reset_order), 100)
+			return TRUE
+		return TRUE

code/modules/power/apc.dm

@@ -846,7 +846,7 @@
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 
 	if(!ui)
-		ui = new(user, src, ui_key, "apc", name, 535, 515, master_ui, state)
+		ui = new(user, src, ui_key, "apc", name, 450, 460, master_ui, state)
 		ui.open()
 
 /obj/machinery/power/apc/ui_data(mob/user)

code/modules/power/gravitygenerator.dm

@@ -1,417 +1,409 @@
-
-//
-// Gravity Generator
-//
-
-GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding new gravity generators to the list, and keying it with the z level.
-
-#define POWER_IDLE 0
-#define POWER_UP 1
-#define POWER_DOWN 2
-
-#define GRAV_NEEDS_SCREWDRIVER 0
-#define GRAV_NEEDS_WELDING 1
-#define GRAV_NEEDS_PLASTEEL 2
-#define GRAV_NEEDS_WRENCH 3
-
-//
-// Abstract Generator
-//
-
-/obj/machinery/gravity_generator
-	name = "gravitational generator"
-	desc = "A device which produces a graviton field when set up."
-	icon = 'icons/obj/machines/gravity_generator.dmi'
-	density = TRUE
-	use_power = NO_POWER_USE
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-	var/sprite_number = 0
-
-/obj/machinery/gravity_generator/safe_throw_at()
-	return FALSE
-
-/obj/machinery/gravity_generator/ex_act(severity, target)
-	if(severity == 1) // Very sturdy.
-		set_broken()
-
-/obj/machinery/gravity_generator/blob_act(obj/structure/blob/B)
-	if(prob(20))
-		set_broken()
-
-/obj/machinery/gravity_generator/tesla_act(power, tesla_flags)
-	..()
-	if(tesla_flags & TESLA_MACHINE_EXPLOSIVE)
-		qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over
-
-/obj/machinery/gravity_generator/update_icon()
-	..()
-	icon_state = "[get_status()]_[sprite_number]"
-
-/obj/machinery/gravity_generator/proc/get_status()
-	return "off"
-
-// You aren't allowed to move.
-/obj/machinery/gravity_generator/Move()
-	. = ..()
-	qdel(src)
-
-/obj/machinery/gravity_generator/proc/set_broken()
-	stat |= BROKEN
-
-/obj/machinery/gravity_generator/proc/set_fix()
-	stat &= ~BROKEN
-
-/obj/machinery/gravity_generator/part/Destroy()
-	if(main_part)
-		qdel(main_part)
-	set_broken()
-	return ..()
-
-//
-// Part generator which is mostly there for looks
-//
-
-/obj/machinery/gravity_generator/part
-	var/obj/machinery/gravity_generator/main/main_part = null
-
-/obj/machinery/gravity_generator/part/attackby(obj/item/I, mob/user, params)
-	return main_part.attackby(I, user)
-
-/obj/machinery/gravity_generator/part/get_status()
-	return main_part.get_status()
-
-/obj/machinery/gravity_generator/part/attack_hand(mob/user)
-	return main_part.attack_hand(user)
-
-/obj/machinery/gravity_generator/part/set_broken()
-	..()
-	if(main_part && !(main_part.stat & BROKEN))
-		main_part.set_broken()
-
-//
-// Generator which spawns with the station.
-//
-
-/obj/machinery/gravity_generator/main/station/Initialize()
-	. = ..()
-	setup_parts()
-	middle.add_overlay("activated")
-	update_list()
-
-//
-// Generator an admin can spawn
-//
-/obj/machinery/gravity_generator/main/station/admin
-	use_power = NO_POWER_USE
-
-//
-// Main Generator with the main code
-//
-
-/obj/machinery/gravity_generator/main
-	icon_state = "on_8"
-	idle_power_usage = 0
-	active_power_usage = 3000
-	power_channel = ENVIRON
-	sprite_number = 8
-	use_power = IDLE_POWER_USE
-	interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OFFLINE
-	var/on = TRUE
-	var/breaker = TRUE
-	var/list/parts = list()
-	var/obj/middle = null
-	var/charging_state = POWER_IDLE
-	var/charge_count = 100
-	var/current_overlay = null
-	var/broken_state = 0
-	var/setting = 1	//Gravity value when on
-
-/obj/machinery/gravity_generator/main/Destroy() // If we somehow get deleted, remove all of our other parts.
-	investigate_log("was destroyed!", INVESTIGATE_GRAVITY)
-	on = FALSE
-	update_list()
-	for(var/obj/machinery/gravity_generator/part/O in parts)
-		O.main_part = null
-		if(!QDESTROYING(O))
-			qdel(O)
-	return ..()
-
-/obj/machinery/gravity_generator/main/proc/setup_parts()
-	var/turf/our_turf = get_turf(src)
-	// 9x9 block obtained from the bottom middle of the block
-	var/list/spawn_turfs = block(locate(our_turf.x - 1, our_turf.y + 2, our_turf.z), locate(our_turf.x + 1, our_turf.y, our_turf.z))
-	var/count = 10
-	for(var/turf/T in spawn_turfs)
-		count--
-		if(T == our_turf) // Skip our turf.
-			continue
-		var/obj/machinery/gravity_generator/part/part = new(T)
-		if(count == 5) // Middle
-			middle = part
-		if(count <= 3) // Their sprite is the top part of the generator
-			part.density = FALSE
-			part.layer = WALL_OBJ_LAYER
-		part.sprite_number = count
-		part.main_part = src
-		parts += part
-		part.update_icon()
-
-/obj/machinery/gravity_generator/main/proc/connected_parts()
-	return parts.len == 8
-
-/obj/machinery/gravity_generator/main/set_broken()
-	..()
-	for(var/obj/machinery/gravity_generator/M in parts)
-		if(!(M.stat & BROKEN))
-			M.set_broken()
-	middle.cut_overlays()
-	charge_count = 0
-	breaker = FALSE
-	set_power()
-	set_state(0)
-	investigate_log("has broken down.", INVESTIGATE_GRAVITY)
-
-/obj/machinery/gravity_generator/main/set_fix()
-	..()
-	for(var/obj/machinery/gravity_generator/M in parts)
-		if(M.stat & BROKEN)
-			M.set_fix()
-	broken_state = FALSE
-	update_icon()
-	set_power()
-
-// Interaction
-
-// Fixing the gravity generator.
-/obj/machinery/gravity_generator/main/attackby(obj/item/I, mob/user, params)
-	switch(broken_state)
-		if(GRAV_NEEDS_SCREWDRIVER)
-			if(istype(I, /obj/item/screwdriver))
-				to_chat(user, "<span class='notice'>You secure the screws of the framework.</span>")
-				I.play_tool_sound(src)
-				broken_state++
-				update_icon()
-				return
-		if(GRAV_NEEDS_WELDING)
-			if(istype(I, /obj/item/weldingtool))
-				if(I.use_tool(src, user, 0, volume=50, amount=1))
-					to_chat(user, "<span class='notice'>You mend the damaged framework.</span>")
-					broken_state++
-					update_icon()
-				return
-		if(GRAV_NEEDS_PLASTEEL)
-			if(istype(I, /obj/item/stack/sheet/plasteel))
-				var/obj/item/stack/sheet/plasteel/PS = I
-				if(PS.get_amount() >= 10)
-					PS.use(10)
-					to_chat(user, "<span class='notice'>You add the plating to the framework.</span>")
-					playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
-					broken_state++
-					update_icon()
-				else
-					to_chat(user, "<span class='warning'>You need 10 sheets of plasteel!</span>")
-				return
-		if(GRAV_NEEDS_WRENCH)
-			if(istype(I, /obj/item/wrench))
-				to_chat(user, "<span class='notice'>You secure the plating to the framework.</span>")
-				I.play_tool_sound(src)
-				set_fix()
-				return
-	return ..()
-
-/obj/machinery/gravity_generator/main/ui_interact(mob/user)
-	if(stat & BROKEN)
-		return
-	var/dat = "Gravity Generator Breaker: "
-	if(breaker)
-		dat += "<span class='linkOn'>ON</span> <A href='?src=[REF(src)];gentoggle=1'>OFF</A>"
-	else
-		dat += "<A href='?src=[REF(src)];gentoggle=1'>ON</A> <span class='linkOn'>OFF</span> "
-
-	dat += "<br>Generator Status:<br><div class='statusDisplay'>"
-	if(charging_state != POWER_IDLE)
-		dat += "<font class='bad'>WARNING</font> Radiation Detected. <br>[charging_state == POWER_UP ? "Charging..." : "Discharging..."]"
-	else if(on)
-		dat += "Powered."
-	else
-		dat += "Unpowered."
-
-	dat += "<br>Gravity Charge: [charge_count]%</div>"
-
-	var/datum/browser/popup = new(user, "gravgen", name)
-	popup.set_content(dat)
-	popup.open()
-
-
-/obj/machinery/gravity_generator/main/Topic(href, href_list)
-
-	if(..())
-		return
-
-	if(href_list["gentoggle"])
-		breaker = !breaker
-		investigate_log("was toggled [breaker ? "<font color='green'>ON</font>" : "<font color='red'>OFF</font>"] by [key_name(usr)].", INVESTIGATE_GRAVITY)
-		set_power()
-		src.updateUsrDialog()
-
-// Power and Icon States
-
-/obj/machinery/gravity_generator/main/power_change()
-	..()
-	investigate_log("has [stat & NOPOWER ? "lost" : "regained"] power.", INVESTIGATE_GRAVITY)
-	set_power()
-
-/obj/machinery/gravity_generator/main/get_status()
-	if(stat & BROKEN)
-		return "fix[min(broken_state, 3)]"
-	return on || charging_state != POWER_IDLE ? "on" : "off"
-
-/obj/machinery/gravity_generator/main/update_icon()
-	..()
-	for(var/obj/O in parts)
-		O.update_icon()
-
-// Set the charging state based on power/breaker.
-/obj/machinery/gravity_generator/main/proc/set_power()
-	var/new_state = FALSE
-	if(stat & (NOPOWER|BROKEN) || !breaker)
-		new_state = FALSE
-	else if(breaker)
-		new_state = TRUE
-
-	charging_state = new_state ? POWER_UP : POWER_DOWN // Startup sequence animation.
-	investigate_log("is now [charging_state == POWER_UP ? "charging" : "discharging"].", INVESTIGATE_GRAVITY)
-	update_icon()
-
-// Set the state of the gravity.
-/obj/machinery/gravity_generator/main/proc/set_state(new_state)
-	charging_state = POWER_IDLE
-	on = new_state
-	use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE
-	// Sound the alert if gravity was just enabled or disabled.
-	var/alert = FALSE
-	if(SSticker.IsRoundInProgress())
-		if(on) // If we turned on and the game is live.
-			if(gravity_in_level() == FALSE)
-				alert = TRUE
-				investigate_log("was brought online and is now producing gravity for this level.", INVESTIGATE_GRAVITY)
-				message_admins("The gravity generator was brought online [ADMIN_VERBOSEJMP(src)]")
-		else
-			if(gravity_in_level() == TRUE)
-				alert = TRUE
-				investigate_log("was brought offline and there is now no gravity for this level.", INVESTIGATE_GRAVITY)
-				message_admins("The gravity generator was brought offline with no backup generator. [ADMIN_VERBOSEJMP(src)]")
-
-	update_icon()
-	update_list()
-	src.updateUsrDialog()
-	if(alert)
-		shake_everyone()
-
-// Charge/Discharge and turn on/off gravity when you reach 0/100 percent.
-// Also emit radiation and handle the overlays.
-/obj/machinery/gravity_generator/main/process()
-	if(stat & BROKEN)
-		return
-	if(charging_state != POWER_IDLE)
-		if(charging_state == POWER_UP && charge_count >= 100)
-			set_state(1)
-		else if(charging_state == POWER_DOWN && charge_count <= 0)
-			set_state(0)
-		else
-			if(charging_state == POWER_UP)
-				charge_count += 2
-			else if(charging_state == POWER_DOWN)
-				charge_count -= 2
-
-			if(charge_count % 4 == 0 && prob(75)) // Let them know it is charging/discharging.
-				playsound(src.loc, 'sound/effects/empulse.ogg', 100, 1)
-
-			updateDialog()
-			if(prob(25)) // To help stop "Your clothes feel warm." spam.
-				pulse_radiation()
-
-			var/overlay_state = null
-			switch(charge_count)
-				if(0 to 20)
-					overlay_state = null
-				if(21 to 40)
-					overlay_state = "startup"
-				if(41 to 60)
-					overlay_state = "idle"
-				if(61 to 80)
-					overlay_state = "activating"
-				if(81 to 100)
-					overlay_state = "activated"
-
-			if(overlay_state != current_overlay)
-				if(middle)
-					middle.cut_overlays()
-					if(overlay_state)
-						middle.add_overlay(overlay_state)
-					current_overlay = overlay_state
-
-
-/obj/machinery/gravity_generator/main/proc/pulse_radiation()
-	radiation_pulse(src, 200)
-
-// Shake everyone on the z level to let them know that gravity was enagaged/disenagaged.
-/obj/machinery/gravity_generator/main/proc/shake_everyone()
-	var/turf/T = get_turf(src)
-	var/sound/alert_sound = sound('sound/effects/alert.ogg')
-	for(var/i in GLOB.mob_list)
-		var/mob/M = i
-		if(M.z != z && !(SSmapping.level_trait(z, ZTRAITS_STATION) && SSmapping.level_trait(M.z, ZTRAITS_STATION)))
-			continue
-		M.update_gravity(M.mob_has_gravity())
-		if(M.client)
-			shake_camera(M, 15, 1)
-			M.playsound_local(T, null, 100, 1, 0.5, S = alert_sound)
-
-/obj/machinery/gravity_generator/main/proc/gravity_in_level()
-	var/turf/T = get_turf(src)
-	if(!T)
-		return FALSE
-	if(GLOB.gravity_generators["[T.z]"])
-		return length(GLOB.gravity_generators["[T.z]"])
-	return FALSE
-
-/obj/machinery/gravity_generator/main/proc/update_list()
-	var/turf/T = get_turf(src.loc)
-	if(T)
-		var/list/z_list = list()
-		// Multi-Z, station gravity generator generates gravity on all ZTRAIT_STATION z-levels.
-		if(SSmapping.level_trait(T.z, ZTRAIT_STATION))
-			for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
-				z_list += z
-		else
-			z_list += T.z
-		for(var/z in z_list)
-			if(!GLOB.gravity_generators["[z]"])
-				GLOB.gravity_generators["[z]"] = list()
-			if(on)
-				GLOB.gravity_generators["[z]"] |= src
-			else
-				GLOB.gravity_generators["[z]"] -= src
-
-/obj/machinery/gravity_generator/main/proc/change_setting(value)
-	if(value != setting)
-		setting = value
-		shake_everyone()
-
-// Misc
-
-/obj/item/paper/guides/jobs/engi/gravity_gen
-	name = "paper- 'Generate your own gravity!'"
-	info = {"<h1>Gravity Generator Instructions For Dummies</h1>
-	<p>Surprisingly, gravity isn't that hard to make! All you have to do is inject deadly radioactive minerals into a ball of
-	energy and you have yourself gravity! You can turn the machine on or off when required but you must remember that the generator
-	will EMIT RADIATION when charging or discharging, you can tell it is charging or discharging by the noise it makes, so please WEAR PROTECTIVE CLOTHING.</p>
-	<br>
-	<h3>It blew up!</h3>
-	<p>Don't panic! The gravity generator was designed to be easily repaired. If, somehow, the sturdy framework did not survive then
-	please proceed to panic; otherwise follow these steps.</p><ol>
-	<li>Secure the screws of the framework with a screwdriver.</li>
-	<li>Mend the damaged framework with a welding tool.</li>
-	<li>Add additional plasteel plating.</li>
-	<li>Secure the additional plating with a wrench.</li></ol>"}
+
+//
+// Gravity Generator
+//
+
+GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding new gravity generators to the list, and keying it with the z level.
+
+#define POWER_IDLE 0
+#define POWER_UP 1
+#define POWER_DOWN 2
+
+#define GRAV_NEEDS_SCREWDRIVER 0
+#define GRAV_NEEDS_WELDING 1
+#define GRAV_NEEDS_PLASTEEL 2
+#define GRAV_NEEDS_WRENCH 3
+
+//
+// Abstract Generator
+//
+
+/obj/machinery/gravity_generator
+	name = "gravitational generator"
+	desc = "A device which produces a graviton field when set up."
+	icon = 'icons/obj/machines/gravity_generator.dmi'
+	density = TRUE
+	use_power = NO_POWER_USE
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	var/sprite_number = 0
+
+/obj/machinery/gravity_generator/safe_throw_at()
+	return FALSE
+
+/obj/machinery/gravity_generator/ex_act(severity, target)
+	if(severity == 1) // Very sturdy.
+		set_broken()
+
+/obj/machinery/gravity_generator/blob_act(obj/structure/blob/B)
+	if(prob(20))
+		set_broken()
+
+/obj/machinery/gravity_generator/tesla_act(power, tesla_flags)
+	..()
+	if(tesla_flags & TESLA_MACHINE_EXPLOSIVE)
+		qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over
+
+/obj/machinery/gravity_generator/update_icon()
+	..()
+	icon_state = "[get_status()]_[sprite_number]"
+
+/obj/machinery/gravity_generator/proc/get_status()
+	return "off"
+
+// You aren't allowed to move.
+/obj/machinery/gravity_generator/Move()
+	. = ..()
+	qdel(src)
+
+/obj/machinery/gravity_generator/proc/set_broken()
+	stat |= BROKEN
+
+/obj/machinery/gravity_generator/proc/set_fix()
+	stat &= ~BROKEN
+
+/obj/machinery/gravity_generator/part/Destroy()
+	if(main_part)
+		qdel(main_part)
+	set_broken()
+	return ..()
+
+//
+// Part generator which is mostly there for looks
+//
+
+/obj/machinery/gravity_generator/part
+	var/obj/machinery/gravity_generator/main/main_part = null
+
+/obj/machinery/gravity_generator/part/attackby(obj/item/I, mob/user, params)
+	return main_part.attackby(I, user)
+
+/obj/machinery/gravity_generator/part/get_status()
+	return main_part.get_status()
+
+/obj/machinery/gravity_generator/part/attack_hand(mob/user)
+	return main_part.attack_hand(user)
+
+/obj/machinery/gravity_generator/part/set_broken()
+	..()
+	if(main_part && !(main_part.stat & BROKEN))
+		main_part.set_broken()
+
+//
+// Generator which spawns with the station.
+//
+
+/obj/machinery/gravity_generator/main/station/Initialize()
+	. = ..()
+	setup_parts()
+	middle.add_overlay("activated")
+	update_list()
+
+//
+// Generator an admin can spawn
+//
+/obj/machinery/gravity_generator/main/station/admin
+	use_power = NO_POWER_USE
+
+//
+// Main Generator with the main code
+//
+
+/obj/machinery/gravity_generator/main
+	icon_state = "on_8"
+	idle_power_usage = 0
+	active_power_usage = 3000
+	power_channel = ENVIRON
+	sprite_number = 8
+	use_power = IDLE_POWER_USE
+	interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OFFLINE
+	var/on = TRUE
+	var/breaker = TRUE
+	var/list/parts = list()
+	var/obj/middle = null
+	var/charging_state = POWER_IDLE
+	var/charge_count = 100
+	var/current_overlay = null
+	var/broken_state = 0
+	var/setting = 1	//Gravity value when on
+
+/obj/machinery/gravity_generator/main/Destroy() // If we somehow get deleted, remove all of our other parts.
+	investigate_log("was destroyed!", INVESTIGATE_GRAVITY)
+	on = FALSE
+	update_list()
+	for(var/obj/machinery/gravity_generator/part/O in parts)
+		O.main_part = null
+		if(!QDESTROYING(O))
+			qdel(O)
+	return ..()
+
+/obj/machinery/gravity_generator/main/proc/setup_parts()
+	var/turf/our_turf = get_turf(src)
+	// 9x9 block obtained from the bottom middle of the block
+	var/list/spawn_turfs = block(locate(our_turf.x - 1, our_turf.y + 2, our_turf.z), locate(our_turf.x + 1, our_turf.y, our_turf.z))
+	var/count = 10
+	for(var/turf/T in spawn_turfs)
+		count--
+		if(T == our_turf) // Skip our turf.
+			continue
+		var/obj/machinery/gravity_generator/part/part = new(T)
+		if(count == 5) // Middle
+			middle = part
+		if(count <= 3) // Their sprite is the top part of the generator
+			part.density = FALSE
+			part.layer = WALL_OBJ_LAYER
+		part.sprite_number = count
+		part.main_part = src
+		parts += part
+		part.update_icon()
+
+/obj/machinery/gravity_generator/main/proc/connected_parts()
+	return parts.len == 8
+
+/obj/machinery/gravity_generator/main/set_broken()
+	..()
+	for(var/obj/machinery/gravity_generator/M in parts)
+		if(!(M.stat & BROKEN))
+			M.set_broken()
+	middle.cut_overlays()
+	charge_count = 0
+	breaker = FALSE
+	set_power()
+	set_state(0)
+	investigate_log("has broken down.", INVESTIGATE_GRAVITY)
+
+/obj/machinery/gravity_generator/main/set_fix()
+	..()
+	for(var/obj/machinery/gravity_generator/M in parts)
+		if(M.stat & BROKEN)
+			M.set_fix()
+	broken_state = FALSE
+	update_icon()
+	set_power()
+
+// Interaction
+
+// Fixing the gravity generator.
+/obj/machinery/gravity_generator/main/attackby(obj/item/I, mob/user, params)
+	switch(broken_state)
+		if(GRAV_NEEDS_SCREWDRIVER)
+			if(istype(I, /obj/item/screwdriver))
+				to_chat(user, "<span class='notice'>You secure the screws of the framework.</span>")
+				I.play_tool_sound(src)
+				broken_state++
+				update_icon()
+				return
+		if(GRAV_NEEDS_WELDING)
+			if(istype(I, /obj/item/weldingtool))
+				if(I.use_tool(src, user, 0, volume=50, amount=1))
+					to_chat(user, "<span class='notice'>You mend the damaged framework.</span>")
+					broken_state++
+					update_icon()
+				return
+		if(GRAV_NEEDS_PLASTEEL)
+			if(istype(I, /obj/item/stack/sheet/plasteel))
+				var/obj/item/stack/sheet/plasteel/PS = I
+				if(PS.get_amount() >= 10)
+					PS.use(10)
+					to_chat(user, "<span class='notice'>You add the plating to the framework.</span>")
+					playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
+					broken_state++
+					update_icon()
+				else
+					to_chat(user, "<span class='warning'>You need 10 sheets of plasteel!</span>")
+				return
+		if(GRAV_NEEDS_WRENCH)
+			if(istype(I, /obj/item/wrench))
+				to_chat(user, "<span class='notice'>You secure the plating to the framework.</span>")
+				I.play_tool_sound(src)
+				set_fix()
+				return
+	return ..()
+
+/obj/machinery/gravity_generator/main/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "gravity_generator", name, 400, 200, master_ui, state)
+		ui.open()
+
+/obj/machinery/gravity_generator/main/ui_data(mob/user)
+	var/list/data = list()
+
+	data["breaker"] = breaker
+	data["charge_count"] = charge_count
+	data["charging_state"] = charging_state
+	data["on"] = on
+	data["operational"] = (stat & BROKEN) ? FALSE : TRUE
+	
+	return data
+
+/obj/machinery/gravity_generator/main/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("gentoggle")
+			breaker = !breaker
+			investigate_log("was toggled [breaker ? "<font color='green'>ON</font>" : "<font color='red'>OFF</font>"] by [key_name(usr)].", INVESTIGATE_GRAVITY)
+			set_power()
+
+// Power and Icon States
+
+/obj/machinery/gravity_generator/main/power_change()
+	..()
+	investigate_log("has [stat & NOPOWER ? "lost" : "regained"] power.", INVESTIGATE_GRAVITY)
+	set_power()
+
+/obj/machinery/gravity_generator/main/get_status()
+	if(stat & BROKEN)
+		return "fix[min(broken_state, 3)]"
+	return on || charging_state != POWER_IDLE ? "on" : "off"
+
+/obj/machinery/gravity_generator/main/update_icon()
+	..()
+	for(var/obj/O in parts)
+		O.update_icon()
+
+// Set the charging state based on power/breaker.
+/obj/machinery/gravity_generator/main/proc/set_power()
+	var/new_state = FALSE
+	if(stat & (NOPOWER|BROKEN) || !breaker)
+		new_state = FALSE
+	else if(breaker)
+		new_state = TRUE
+
+	charging_state = new_state ? POWER_UP : POWER_DOWN // Startup sequence animation.
+	investigate_log("is now [charging_state == POWER_UP ? "charging" : "discharging"].", INVESTIGATE_GRAVITY)
+	update_icon()
+
+// Set the state of the gravity.
+/obj/machinery/gravity_generator/main/proc/set_state(new_state)
+	charging_state = POWER_IDLE
+	on = new_state
+	use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE
+	// Sound the alert if gravity was just enabled or disabled.
+	var/alert = FALSE
+	if(SSticker.IsRoundInProgress())
+		if(on) // If we turned on and the game is live.
+			if(gravity_in_level() == FALSE)
+				alert = TRUE
+				investigate_log("was brought online and is now producing gravity for this level.", INVESTIGATE_GRAVITY)
+				message_admins("The gravity generator was brought online [ADMIN_VERBOSEJMP(src)]")
+		else
+			if(gravity_in_level() == TRUE)
+				alert = TRUE
+				investigate_log("was brought offline and there is now no gravity for this level.", INVESTIGATE_GRAVITY)
+				message_admins("The gravity generator was brought offline with no backup generator. [ADMIN_VERBOSEJMP(src)]")
+
+	update_icon()
+	update_list()
+	src.updateUsrDialog()
+	if(alert)
+		shake_everyone()
+
+// Charge/Discharge and turn on/off gravity when you reach 0/100 percent.
+// Also emit radiation and handle the overlays.
+/obj/machinery/gravity_generator/main/process()
+	if(stat & BROKEN)
+		return
+	if(charging_state != POWER_IDLE)
+		if(charging_state == POWER_UP && charge_count >= 100)
+			set_state(1)
+		else if(charging_state == POWER_DOWN && charge_count <= 0)
+			set_state(0)
+		else
+			if(charging_state == POWER_UP)
+				charge_count += 2
+			else if(charging_state == POWER_DOWN)
+				charge_count -= 2
+
+			if(charge_count % 4 == 0 && prob(75)) // Let them know it is charging/discharging.
+				playsound(src.loc, 'sound/effects/empulse.ogg', 100, 1)
+
+			updateDialog()
+			if(prob(25)) // To help stop "Your clothes feel warm." spam.
+				pulse_radiation()
+
+			var/overlay_state = null
+			switch(charge_count)
+				if(0 to 20)
+					overlay_state = null
+				if(21 to 40)
+					overlay_state = "startup"
+				if(41 to 60)
+					overlay_state = "idle"
+				if(61 to 80)
+					overlay_state = "activating"
+				if(81 to 100)
+					overlay_state = "activated"
+
+			if(overlay_state != current_overlay)
+				if(middle)
+					middle.cut_overlays()
+					if(overlay_state)
+						middle.add_overlay(overlay_state)
+					current_overlay = overlay_state
+
+
+/obj/machinery/gravity_generator/main/proc/pulse_radiation()
+	radiation_pulse(src, 200)
+
+// Shake everyone on the z level to let them know that gravity was enagaged/disenagaged.
+/obj/machinery/gravity_generator/main/proc/shake_everyone()
+	var/turf/T = get_turf(src)
+	var/sound/alert_sound = sound('sound/effects/alert.ogg')
+	for(var/i in GLOB.mob_list)
+		var/mob/M = i
+		if(M.z != z && !(SSmapping.level_trait(z, ZTRAITS_STATION) && SSmapping.level_trait(M.z, ZTRAITS_STATION)))
+			continue
+		M.update_gravity(M.mob_has_gravity())
+		if(M.client)
+			shake_camera(M, 15, 1)
+			M.playsound_local(T, null, 100, 1, 0.5, S = alert_sound)
+
+/obj/machinery/gravity_generator/main/proc/gravity_in_level()
+	var/turf/T = get_turf(src)
+	if(!T)
+		return FALSE
+	if(GLOB.gravity_generators["[T.z]"])
+		return length(GLOB.gravity_generators["[T.z]"])
+	return FALSE
+
+/obj/machinery/gravity_generator/main/proc/update_list()
+	var/turf/T = get_turf(src.loc)
+	if(T)
+		var/list/z_list = list()
+		// Multi-Z, station gravity generator generates gravity on all ZTRAIT_STATION z-levels.
+		if(SSmapping.level_trait(T.z, ZTRAIT_STATION))
+			for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+				z_list += z
+		else
+			z_list += T.z
+		for(var/z in z_list)
+			if(!GLOB.gravity_generators["[z]"])
+				GLOB.gravity_generators["[z]"] = list()
+			if(on)
+				GLOB.gravity_generators["[z]"] |= src
+			else
+				GLOB.gravity_generators["[z]"] -= src
+
+/obj/machinery/gravity_generator/main/proc/change_setting(value)
+	if(value != setting)
+		setting = value
+		shake_everyone()
+
+// Misc
+
+/obj/item/paper/guides/jobs/engi/gravity_gen
+	name = "paper- 'Generate your own gravity!'"
+	info = {"<h1>Gravity Generator Instructions For Dummies</h1>
+	<p>Surprisingly, gravity isn't that hard to make! All you have to do is inject deadly radioactive minerals into a ball of
+	energy and you have yourself gravity! You can turn the machine on or off when required but you must remember that the generator
+	will EMIT RADIATION when charging or discharging, you can tell it is charging or discharging by the noise it makes, so please WEAR PROTECTIVE CLOTHING.</p>
+	<br>
+	<h3>It blew up!</h3>
+	<p>Don't panic! The gravity generator was designed to be easily repaired. If, somehow, the sturdy framework did not survive then
+	please proceed to panic; otherwise follow these steps.</p><ol>
+	<li>Secure the screws of the framework with a screwdriver.</li>
+	<li>Mend the damaged framework with a welding tool.</li>
+	<li>Add additional plasteel plating.</li>
+	<li>Secure the additional plating with a wrench.</li></ol>"}

code/modules/power/monitor.dm

@@ -1,121 +1,123 @@
-//modular computer program version is located in code\modules\modular_computers\file_system\programs\powermonitor.dm, /datum/computer_file/program/power_monitor
-
-/obj/machinery/computer/monitor
-	name = "power monitoring console"
-	desc = "It monitors power levels across the station."
-	icon_screen = "power"
-	icon_keyboard = "power_key"
-	light_color = LIGHT_COLOR_YELLOW
-	use_power = ACTIVE_POWER_USE
-	idle_power_usage = 20
-	active_power_usage = 100
-	circuit = /obj/item/circuitboard/computer/powermonitor
-
-	var/obj/structure/cable/attached_wire
-	var/obj/machinery/power/apc/local_apc
-
-	var/list/history = list()
-	var/record_size = 60
-	var/record_interval = 50
-	var/next_record = 0
-	var/is_secret_monitor = FALSE
-
-/obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming.
-	name = "outdated power monitoring console"
-	desc = "It monitors power levels across the local powernet."
-	circuit = /obj/item/circuitboard/computer/powermonitor/secret
-	is_secret_monitor = TRUE
-
-/obj/machinery/computer/monitor/secret/examine(mob/user)
-	. = ..()
-	. += "<span class='notice'>It's operating system seems quite outdated... It doesn't seem like it'd be compatible with the latest remote NTOS monitoring systems.</span>"
-
-/obj/machinery/computer/monitor/Initialize()
-	. = ..()
-	search()
-	history["supply"] = list()
-	history["demand"] = list()
-
-/obj/machinery/computer/monitor/process()
-	if(!get_powernet())
-		use_power = IDLE_POWER_USE
-		search()
-	else
-		use_power = ACTIVE_POWER_USE
-		record()
-
-/obj/machinery/computer/monitor/proc/search() //keep in sync with /datum/computer_file/program/power_monitor's version
-	var/turf/T = get_turf(src)
-	attached_wire = locate(/obj/structure/cable) in T
-	if(attached_wire)
-		return
-	var/area/A = get_area(src) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead
-	if(!A)
-		return
-	local_apc = A.get_apc()
-	if(!local_apc)
-		return
-	if(!local_apc.terminal) //this really shouldn't happen without badminnery.
-		local_apc = null
-
-/obj/machinery/computer/monitor/proc/get_powernet() //keep in sync with /datum/computer_file/program/power_monitor's version
-	if(attached_wire || (local_apc && local_apc.terminal))
-		return attached_wire ? attached_wire.powernet : local_apc.terminal.powernet
-	return FALSE
-
-/obj/machinery/computer/monitor/proc/record() //keep in sync with /datum/computer_file/program/power_monitor's version
-	if(world.time >= next_record)
-		next_record = world.time + record_interval
-
-		var/datum/powernet/connected_powernet = get_powernet()
-
-		var/list/supply = history["supply"]
-		if(connected_powernet)
-			supply += connected_powernet.viewavail
-		if(supply.len > record_size)
-			supply.Cut(1, 2)
-
-		var/list/demand = history["demand"]
-		if(connected_powernet)
-			demand += connected_powernet.viewload
-		if(demand.len > record_size)
-			demand.Cut(1, 2)
-
-/obj/machinery/computer/monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "power_monitor", name, 1200, 1000, master_ui, state)
-		ui.open()
-
-/obj/machinery/computer/monitor/ui_data()
-	var/datum/powernet/connected_powernet = get_powernet()
-	var/list/data = list()
-	data["stored"] = record_size
-	data["interval"] = record_interval / 10
-	data["attached"] = connected_powernet ? TRUE : FALSE
-	data["history"] = history
-	data["areas"] = list()
-
-	if(connected_powernet)
-		data["supply"] = DisplayPower(connected_powernet.viewavail)
-		data["demand"] = DisplayPower(connected_powernet.viewload)
-		for(var/obj/machinery/power/terminal/term in connected_powernet.nodes)
-			var/obj/machinery/power/apc/A = term.master
-			if(istype(A))
-				var/cell_charge
-				if(!A.cell)
-					cell_charge = 0
-				else
-					cell_charge = A.cell.percent()
-				data["areas"] += list(list(
-					"name" = A.area.name,
-					"charge" = cell_charge,
-					"load" = DisplayPower(A.lastused_total),
-					"charging" = A.charging,
-					"eqp" = A.equipment,
-					"lgt" = A.lighting,
-					"env" = A.environ
-				))
-
-	return data
+//modular computer program version is located in code\modules\modular_computers\file_system\programs\powermonitor.dm, /datum/computer_file/program/power_monitor
+
+/obj/machinery/computer/monitor
+	name = "power monitoring console"
+	desc = "It monitors power levels across the station."
+	icon_screen = "power"
+	icon_keyboard = "power_key"
+	light_color = LIGHT_COLOR_YELLOW
+	use_power = ACTIVE_POWER_USE
+	idle_power_usage = 20
+	active_power_usage = 100
+	circuit = /obj/item/circuitboard/computer/powermonitor
+
+	var/obj/structure/cable/attached_wire
+	var/obj/machinery/power/apc/local_apc
+
+	var/list/history = list()
+	var/record_size = 60
+	var/record_interval = 50
+	var/next_record = 0
+	var/is_secret_monitor = FALSE
+	tgui_id = "power_monitor"
+	ui_style = "ntos"
+
+/obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming.
+	name = "outdated power monitoring console"
+	desc = "It monitors power levels across the local powernet."
+	circuit = /obj/item/circuitboard/computer/powermonitor/secret
+	is_secret_monitor = TRUE
+
+/obj/machinery/computer/monitor/secret/examine(mob/user)
+	. = ..()
+	. += "<span class='notice'>It's operating system seems quite outdated... It doesn't seem like it'd be compatible with the latest remote NTOS monitoring systems.</span>"
+
+/obj/machinery/computer/monitor/Initialize()
+	. = ..()
+	search()
+	history["supply"] = list()
+	history["demand"] = list()
+
+/obj/machinery/computer/monitor/process()
+	if(!get_powernet())
+		use_power = IDLE_POWER_USE
+		search()
+	else
+		use_power = ACTIVE_POWER_USE
+		record()
+
+/obj/machinery/computer/monitor/proc/search() //keep in sync with /datum/computer_file/program/power_monitor's version
+	var/turf/T = get_turf(src)
+	attached_wire = locate(/obj/structure/cable) in T
+	if(attached_wire)
+		return
+	var/area/A = get_area(src) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead
+	if(!A)
+		return
+	local_apc = A.get_apc()
+	if(!local_apc)
+		return
+	if(!local_apc.terminal) //this really shouldn't happen without badminnery.
+		local_apc = null
+
+/obj/machinery/computer/monitor/proc/get_powernet() //keep in sync with /datum/computer_file/program/power_monitor's version
+	if(attached_wire || (local_apc && local_apc.terminal))
+		return attached_wire ? attached_wire.powernet : local_apc.terminal.powernet
+	return FALSE
+
+/obj/machinery/computer/monitor/proc/record() //keep in sync with /datum/computer_file/program/power_monitor's version
+	if(world.time >= next_record)
+		next_record = world.time + record_interval
+
+		var/datum/powernet/connected_powernet = get_powernet()
+
+		var/list/supply = history["supply"]
+		if(connected_powernet)
+			supply += connected_powernet.viewavail
+		if(supply.len > record_size)
+			supply.Cut(1, 2)
+
+		var/list/demand = history["demand"]
+		if(connected_powernet)
+			demand += connected_powernet.viewload
+		if(demand.len > record_size)
+			demand.Cut(1, 2)
+
+/obj/machinery/computer/monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, tgui_id, name, 550, 700, master_ui, state)
+		ui.open()
+
+/obj/machinery/computer/monitor/ui_data()
+	var/datum/powernet/connected_powernet = get_powernet()
+	var/list/data = list()
+	data["stored"] = record_size
+	data["interval"] = record_interval / 10
+	data["attached"] = connected_powernet ? TRUE : FALSE
+	data["history"] = history
+	data["areas"] = list()
+
+	if(connected_powernet)
+		data["supply"] = DisplayPower(connected_powernet.viewavail)
+		data["demand"] = DisplayPower(connected_powernet.viewload)
+		for(var/obj/machinery/power/terminal/term in connected_powernet.nodes)
+			var/obj/machinery/power/apc/A = term.master
+			if(istype(A))
+				var/cell_charge
+				if(!A.cell)
+					cell_charge = 0
+				else
+					cell_charge = A.cell.percent()
+				data["areas"] += list(list(
+					"name" = A.area.name,
+					"charge" = cell_charge,
+					"load" = DisplayPower(A.lastused_total),
+					"charging" = A.charging,
+					"eqp" = A.equipment,
+					"lgt" = A.lighting,
+					"env" = A.environ
+				))
+
+	return data

code/modules/power/solar.dm

@@ -342,7 +342,7 @@
 												datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "solar_control", name, 500, 400, master_ui, state)
+		ui = new(user, src, ui_key, "solar_control", name, 380, 230, master_ui, state)
 		ui.open()
 
 /obj/machinery/power/solar_control/ui_data()
@@ -363,39 +363,47 @@
 /obj/machinery/power/solar_control/ui_act(action, params)
 	if(..())
 		return
-	switch(action)
-		if("angle")
-			var/adjust = text2num(params["adjust"])
-			if(adjust)
-				currentdir = CLAMP((360 + adjust + currentdir) % 360, 0, 359)
-				targetdir = currentdir
-				set_panels(currentdir)
-				. = TRUE
-		if("rate")
-			var/adjust = text2num(params["adjust"])
-			if(adjust)
-				trackrate = CLAMP(trackrate + adjust, -7200, 7200)
-				if(trackrate)
-					nexttime = world.time + 36000 / abs(trackrate)
-				. = TRUE
-		if("tracking")
-			var/mode = text2num(params["mode"])
-			track = mode
-			if(mode == 2 && connected_tracker)
-				connected_tracker.set_angle(SSsun.angle)
-				set_panels(currentdir)
-			else if(mode == 1)
-				targetdir = currentdir
-				if(trackrate)
-					nexttime = world.time + 36000 / abs(trackrate)
-				set_panels(targetdir)
-			. = TRUE
-		if("refresh")
-			search_for_connected()
-			if(connected_tracker && track == 2)
-				connected_tracker.set_angle(SSsun.angle)
+	if(action == "angle")
+		var/adjust = text2num(params["adjust"])
+		var/value = text2num(params["value"])
+		if(adjust)
+			value = currentdir + adjust
+		if(value != null)
+			currentdir = CLAMP((360 + value) % 360, 0, 359)
+			targetdir = currentdir
 			set_panels(currentdir)
-			. = TRUE
+			return TRUE
+		return FALSE
+	if(action == "rate")
+		var/adjust = text2num(params["adjust"])
+		var/value = text2num(params["value"])
+		if(adjust)
+			value = trackrate + adjust
+		if(value != null)
+			trackrate = CLAMP(value, -7200, 7200)
+			if(trackrate)
+				nexttime = world.time + 36000 / abs(trackrate)
+			return TRUE
+		return FALSE
+	if(action == "tracking")
+		var/mode = text2num(params["mode"])
+		track = mode
+		if(mode == 2 && connected_tracker)
+			connected_tracker.set_angle(SSsun.angle)
+			set_panels(currentdir)
+		else if(mode == 1)
+			targetdir = currentdir
+			if(trackrate)
+				nexttime = world.time + 36000 / abs(trackrate)
+			set_panels(targetdir)
+		return TRUE
+	if(action == "refresh")
+		search_for_connected()
+		if(connected_tracker && track == 2)
+			connected_tracker.set_angle(SSsun.angle)
+		set_panels(currentdir)
+		return TRUE
+	return FALSE
 
 /obj/machinery/power/solar_control/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/screwdriver))

code/modules/power/turbine.dm

@@ -57,15 +57,6 @@
 	var/lastgen
 	var/productivity = 1
 
-/obj/machinery/computer/turbine_computer
-	name = "gas turbine control computer"
-	desc = "A computer to remotely control a gas turbine."
-	icon_screen = "turbinecomp"
-	icon_keyboard = "tech_key"
-	circuit = /obj/item/circuitboard/computer/turbine_computer
-	var/obj/machinery/power/compressor/compressor
-	var/id = 0
-
 // the inlet stage of the gas turbine electricity generator
 
 /obj/machinery/power/compressor/Initialize()
@@ -113,12 +104,13 @@
 	default_deconstruction_crowbar(I)
 
 /obj/machinery/power/compressor/process()
-	if(!turbine)
-		stat = BROKEN
-	if(stat & BROKEN || panel_open)
-		return
 	if(!starter)
 		return
+	if(!turbine || (turbine.stat & BROKEN))
+		starter = FALSE
+	if(stat & BROKEN || panel_open)
+		starter = FALSE
+		return
 	cut_overlays()
 
 	rpm = 0.9* rpm + 0.1 * rpmtarget
@@ -288,7 +280,14 @@
 
 // COMPUTER NEEDS A SERIOUS REWRITE.
 
-
+/obj/machinery/computer/turbine_computer
+	name = "gas turbine control computer"
+	desc = "A computer to remotely control a gas turbine."
+	icon_screen = "turbinecomp"
+	icon_keyboard = "tech_key"
+	circuit = /obj/item/circuitboard/computer/turbine_computer
+	var/obj/machinery/power/compressor/compressor
+	var/id = 0
 
 /obj/machinery/computer/turbine_computer/Initialize()
 	. = ..()
@@ -304,27 +303,27 @@
 				compressor = C
 				return
 	else
-		compressor = locate(/obj/machinery/power/compressor) in range(5, src)
+		compressor = locate(/obj/machinery/power/compressor) in range(7, src)
 
 /obj/machinery/computer/turbine_computer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "turbine_computer", name, 350, 280, master_ui, state)
+		ui = new(user, src, ui_key, "turbine_computer", name, 300, 200, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/turbine_computer/ui_data(mob/user)
 	var/list/data = list()
 
-	data["connected"] = (compressor && compressor.turbine) ? TRUE : FALSE
+	data["compressor"] = compressor ? TRUE : FALSE
 	data["compressor_broke"] = (!compressor || (compressor.stat & BROKEN)) ? TRUE : FALSE
+	data["turbine"] = compressor?.turbine ? TRUE : FALSE
 	data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.stat & BROKEN)) ? TRUE : FALSE
-	data["broken"] = (data["compressor_broke"] || data["turbine_broke"])
-	data["online"] = compressor.starter
+	data["online"] = compressor?.starter
 
-	data["power"] = DisplayPower(compressor.turbine.lastgen)
-	data["rpm"] = compressor.rpm
-	data["temp"] = compressor.gas_contained.temperature
+	data["power"] = DisplayPower(compressor?.turbine?.lastgen)
+	data["rpm"] = compressor?.rpm
+	data["temp"] = compressor?.gas_contained.temperature
 
 	return data
 
@@ -332,13 +331,9 @@
 	if(..())
 		return
 	switch(action)
-		if("power-on")
+		if("toggle_power")
 			if(compressor && compressor.turbine)
-				compressor.starter = TRUE
-				. = TRUE
-		if("power-off")
-			if(compressor && compressor.turbine)
-				compressor.starter = FALSE
+				compressor.starter = !compressor.starter
 				. = TRUE
 		if("reconnect")
 			locate_machinery()

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -188,7 +188,7 @@
 											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "chem_dispenser", name, 565, 550, master_ui, state)
+		ui = new(user, src, ui_key, "chem_dispenser", name, 565, 620, master_ui, state)
 		if(user.hallucinating())
 			ui.set_autoupdate(FALSE) //to not ruin the immersion by constantly changing the fake chemicals
 		ui.open()

code/modules/reagents/chemistry/machinery/chem_heater.dm

@@ -98,7 +98,7 @@
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "chem_heater", name, 275, 400, master_ui, state)
+		ui = new(user, src, ui_key, "chem_heater", name, 275, 320, master_ui, state)
 		ui.open()
 
 /obj/machinery/chem_heater/ui_data()

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -29,10 +29,10 @@
 	//Calculate the span tags and ids fo all the available pill icons
 	var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills)
 	pillStyles = list()
-	for (var/x in 1 to PILL_STYLE_COUNT)
+	for(var/x in 1 to PILL_STYLE_COUNT)
 		var/list/SL = list()
 		SL["id"] = x
-		SL["htmltag"] = assets.icon_tag("pill[x]")
+		SL["className"] = assets.icon_class_name("pill[x]")
 		pillStyles += list(SL)
 
 	. = ..()
@@ -158,7 +158,7 @@
 	if(!ui)
 		var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills)
 		assets.send(user)
-		ui = new(user, src, ui_key, "chem_master", name, 500, 550, master_ui, state)
+		ui = new(user, src, ui_key, "chem_master", name, 465, 550, master_ui, state)
 		ui.open()
 
 //Insert our custom spritesheet css link into the html
@@ -180,8 +180,8 @@
 	data["isPillBottleLoaded"] = bottle ? 1 : 0
 	if(bottle)
 		var/datum/component/storage/STRB = bottle.GetComponent(/datum/component/storage)
-		data["pillBotContent"] = bottle.contents.len
-		data["pillBotMaxContent"] = STRB.max_items
+		data["pillBottleCurrentAmount"] = bottle.contents.len
+		data["pillBottleMaxAmount"] = STRB.max_items
 
 	var/beakerContents[0]
 	if(beaker)
@@ -480,7 +480,248 @@
 			screen = params["screen"]
 			. = TRUE
 
+/obj/machinery/chem_master/ui_act(action, params)
+	if(..())
+		return
 
+	if(action == "eject")
+		replace_beaker(usr)
+		return TRUE
+
+	if(action == "ejectPillBottle")
+		if(!bottle)
+			return FALSE
+		bottle.forceMove(drop_location())
+		adjust_item_drop_location(bottle)
+		bottle = null
+		return TRUE
+
+	if(action == "transfer")
+		if(!beaker)
+			return FALSE
+		var/reagent = GLOB.name2reagent[params["id"]]
+		var/amount = text2num(params["amount"])
+		var/to_container = params["to"]
+		// Custom amount
+		if (amount == -1)
+			amount = text2num(input(
+				"Enter the amount you want to transfer:",
+				name, ""))
+		if (amount == null || amount <= 0)
+			return FALSE
+		if (to_container == "buffer")
+			beaker.reagents.trans_id_to(src, reagent, amount)
+			return TRUE
+		if (to_container == "beaker" && mode)
+			reagents.trans_id_to(beaker, reagent, amount)
+			return TRUE
+		if (to_container == "beaker" && !mode)
+			reagents.remove_reagent(reagent, amount)
+			return TRUE
+		return FALSE
+
+	if(action == "toggleMode")
+		mode = !mode
+		return TRUE
+
+	if(action == "createVial")
+		var/many = params["many"]
+		if(reagents.total_volume == 0)
+			return
+
+		var/amount_full = 0
+		var/vol_part = min(reagents.total_volume, 60)
+		if(text2num(many))
+			amount_full = round(reagents.total_volume / 60)
+			vol_part = reagents.total_volume % 60
+		var/name = stripped_input(usr, "Name:","Name your hypovial!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
+		if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
+			return
+
+		var/obj/item/reagent_containers/glass/bottle/vial/small/P
+		for(var/i = 0; i < amount_full; i++)
+			P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location())
+			P.name = trim("[name] hypovial")
+			adjust_item_drop_location(P)
+			reagents.trans_to(P, 60)
+
+		if(vol_part)
+			P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location())
+			P.name = trim("[name] hypovial")
+			adjust_item_drop_location(P)
+			reagents.trans_to(P, vol_part)
+		. = TRUE
+
+	if(action == "createDart")
+		for(var/datum/reagent/R in reagents.reagent_list)
+			if(!(istype(R, /datum/reagent/medicine)))
+				visible_message("<b>The [src]</b> beeps, \"<span class='warning'>SmartDarts are insoluble with non-medicinal compounds.\"</span>")
+				return
+
+		var/many = params["many"]
+		if(reagents.total_volume == 0)
+			return
+		var/amount = 1
+		var/vol_each = min(reagents.total_volume, 20)
+		if(text2num(many))
+			amount = CLAMP(round(input(usr, "Max 10. Buffer content will be split evenly.", "How many darts?", amount) as num|null), 0, 10)
+			if(!amount)
+				return
+			vol_each = min(reagents.total_volume / amount, 20)
+
+		var/name = stripped_input(usr,"Name:","Name your SmartDart!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN)
+		if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
+			return
+
+		var/obj/item/reagent_containers/syringe/dart/D
+		for(var/i = 0; i < amount; i++)
+			D = new /obj/item/reagent_containers/syringe/dart(drop_location())
+			D.name = trim("[name] SmartDart")
+			adjust_item_drop_location(D)
+			reagents.trans_to(D, vol_each)
+			D.mode=!mode
+			D.update_icon()
+		. = TRUE
+
+	if(action == "pillStyle")
+		var/id = text2num(params["id"])
+		chosenPillStyle = id
+		return TRUE
+
+	if(action == "create")
+		if(reagents.total_volume == 0)
+			return FALSE
+		var/item_type = params["type"]
+		// Get amount of items
+		var/amount = text2num(params["amount"])
+		if(amount == null)
+			amount = text2num(input(usr,
+				"Max 10. Buffer content will be split evenly.",
+				"How many to make?", 1))
+		amount = CLAMP(round(amount), 0, 10)
+		if (amount <= 0)
+			return FALSE
+		// Get units per item
+		var/vol_each = text2num(params["volume"])
+		var/vol_each_text = params["volume"]
+		var/vol_each_max = reagents.total_volume / amount
+		if (item_type == "pill")
+			vol_each_max = min(50, vol_each_max)
+		else if (item_type == "patch")
+			vol_each_max = min(40, vol_each_max)
+		else if (item_type == "bottle")
+			vol_each_max = min(30, vol_each_max)
+		else if (item_type == "condimentPack")
+			vol_each_max = min(10, vol_each_max)
+		else if (item_type == "condimentBottle")
+			vol_each_max = min(50, vol_each_max)
+		else
+			return FALSE
+		if(vol_each_text == "auto")
+			vol_each = vol_each_max
+		if(vol_each == null)
+			vol_each = text2num(input(usr,
+				"Maximum [vol_each_max] units per item.",
+				"How many units to fill?",
+				vol_each_max))
+		vol_each = CLAMP(round(vol_each), 0, vol_each_max)
+		if(vol_each <= 0)
+			return FALSE
+		// Get item name
+		var/name = params["name"]
+		var/name_has_units = item_type == "pill" || item_type == "patch"
+		if(!name)
+			var/name_default = reagents.get_master_reagent_name()
+			if (name_has_units)
+				name_default += " ([vol_each]u)"
+			name = stripped_input(usr,
+				"Name:",
+				"Give it a name!",
+				name_default,
+				MAX_NAME_LEN)
+		if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
+			return FALSE
+		// Start filling
+		if(item_type == "pill")
+			var/obj/item/reagent_containers/pill/P
+			var/target_loc = drop_location()
+			var/drop_threshold = INFINITY
+			if(bottle)
+				var/datum/component/storage/STRB = bottle.GetComponent(
+					/datum/component/storage)
+				if(STRB)
+					drop_threshold = STRB.max_items - bottle.contents.len
+			for(var/i = 0; i < amount; i++)
+				if(i < drop_threshold)
+					P = new/obj/item/reagent_containers/pill(target_loc)
+				else
+					P = new/obj/item/reagent_containers/pill(drop_location())
+				P.name = trim("[name] pill")
+				if(chosenPillStyle == RANDOM_PILL_STYLE)
+					P.icon_state ="pill[rand(1,21)]"
+				else
+					P.icon_state = "pill[chosenPillStyle]"
+				if(P.icon_state == "pill4")
+					P.desc = "A tablet or capsule, but not just any, a red one, one taken by the ones not scared of knowledge, freedom, uncertainty and the brutal truths of reality."
+				adjust_item_drop_location(P)
+				reagents.trans_to(P, vol_each, transfered_by = usr)
+			return TRUE
+		if(item_type == "patch")
+			var/obj/item/reagent_containers/pill/patch/P
+			for(var/i = 0; i < amount; i++)
+				P = new/obj/item/reagent_containers/pill/patch(drop_location())
+				P.name = trim("[name] patch")
+				adjust_item_drop_location(P)
+				reagents.trans_to(P, vol_each, transfered_by = usr)
+			return TRUE
+		if(item_type == "bottle")
+			var/obj/item/reagent_containers/glass/bottle/P
+			for(var/i = 0; i < amount; i++)
+				P = new/obj/item/reagent_containers/glass/bottle(drop_location())
+				P.name = trim("[name] bottle")
+				adjust_item_drop_location(P)
+				reagents.trans_to(P, vol_each, transfered_by = usr)
+			return TRUE
+		if(item_type == "condimentPack")
+			var/obj/item/reagent_containers/food/condiment/pack/P
+			for(var/i = 0; i < amount; i++)
+				P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
+				P.originalname = name
+				P.name = trim("[name] pack")
+				P.desc = "A small condiment pack. The label says it contains [name]."
+				reagents.trans_to(P, vol_each, transfered_by = usr)
+			return TRUE
+		if(item_type == "condimentBottle")
+			var/obj/item/reagent_containers/food/condiment/P
+			for(var/i = 0; i < amount; i++)
+				P = new/obj/item/reagent_containers/food/condiment(drop_location())
+				P.originalname = name
+				P.name = trim("[name] bottle")
+				reagents.trans_to(P, vol_each, transfered_by = usr)
+			return TRUE
+		return FALSE
+
+	if(action == "analyze")
+		var/datum/reagent/R = GLOB.name2reagent[params["id"]]
+		if(R)
+			var/state = "Unknown"
+			if(initial(R.reagent_state) == 1)
+				state = "Solid"
+			else if(initial(R.reagent_state) == 2)
+				state = "Liquid"
+			else if(initial(R.reagent_state) == 3)
+				state = "Gas"
+			var/const/P = 3 //The number of seconds between life ticks
+			var/T = initial(R.metabolization_rate) * (60 / P)
+			analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold))
+			screen = "analyze"
+			return TRUE
+
+	if(action == "goScreen")
+		screen = params["screen"]
+		return TRUE
+
+	return FALSE
 
 /obj/machinery/chem_master/proc/end_fermi_reaction()//Ends any reactions upon moving.
 	if(beaker.reagents.fermiIsReacting)

code/modules/reagents/chemistry/machinery/pandemic.dm

@@ -12,7 +12,6 @@
 	idle_power_usage = 20
 	resistance_flags = ACID_PROOF
 	var/wait
-	var/mode = MAIN_SCREEN
 	var/datum/symptom/selected_symptom
 	var/obj/item/reagent_containers/beaker
 
@@ -56,18 +55,14 @@
 		if(istype(D, /datum/disease/advance))
 			var/datum/disease/advance/A = D
 			var/disease_name = SSdisease.get_disease_name(A.GetDiseaseID())
-			if((disease_name == "Unknown") && A.mutable)
-				this["can_rename"] = TRUE
+			this["can_rename"] = ((disease_name == "Unknown") && A.mutable)
 			this["name"] = disease_name
 			this["is_adv"] = TRUE
 			this["symptoms"] = list()
-			var/symptom_index = 1
 			for(var/symptom in A.symptoms)
 				var/datum/symptom/S = symptom
 				var/list/this_symptom = list()
-				this_symptom["name"] = S.name
-				this_symptom["sym_index"] = symptom_index
-				symptom_index++
+				this_symptom = get_symptom_data(S)
 				this["symptoms"] += list(this_symptom)
 			this["resistance"] = A.totalResistance()
 			this["stealth"] = A.totalStealth()
@@ -128,29 +123,28 @@
 /obj/machinery/computer/pandemic/ui_interact(mob/user, ui_key = "main", datum/tgui/ui, force_open = FALSE, datum/tgui/master_ui, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "pandemic", name, 700, 500, master_ui, state)
+		ui = new(user, src, ui_key, "pandemic", name, 520, 550, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/pandemic/ui_data(mob/user)
 	var/list/data = list()
 	data["is_ready"] = !wait
-	data["mode"] = mode
-	switch(mode)
-		if(MAIN_SCREEN)
-			if(beaker)
-				data["has_beaker"] = TRUE
-				if(!beaker.reagents.total_volume || !beaker.reagents.reagent_list)
-					data["beaker_empty"] = TRUE
-				var/datum/reagent/blood/B = locate() in beaker.reagents.reagent_list
-				if(B)
-					data["has_blood"] = TRUE
-					data[/datum/reagent/blood] = list()
-					data[/datum/reagent/blood]["dna"] = B.data["blood_DNA"] || "none"
-					data[/datum/reagent/blood]["type"] = B.data["blood_type"] || "none"
-					data["viruses"] = get_viruses_data(B)
-					data["resistances"] = get_resistance_data(B)
-		if(SYMPTOM_DETAILS)
-			data["symptom"] = get_symptom_data(selected_symptom)
+	if(beaker)
+		data["has_beaker"] = TRUE
+		data["beaker_empty"] = (!beaker.reagents.total_volume || !beaker.reagents.reagent_list)
+		var/datum/reagent/blood/B = locate() in beaker.reagents.reagent_list
+		if(B)
+			data["has_blood"] = TRUE
+			data[/datum/reagent/blood] = list()
+			data[/datum/reagent/blood]["dna"] = B.data["blood_DNA"] || "none"
+			data[/datum/reagent/blood]["type"] = B.data["blood_type"] || "none"
+			data["viruses"] = get_viruses_data(B)
+			data["resistances"] = get_resistance_data(B)
+		else
+			data["has_blood"] = FALSE
+	else
+		data["has_beaker"] = FALSE
+		data["has_blood"] = FALSE
 
 	return data
 
@@ -209,19 +203,6 @@
 			update_icon()
 			addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 200)
 			. = TRUE
-		if("symptom_details")
-			var/picked_symptom_index = text2num(params["picked_symptom"])
-			var/index = text2num(params["index"])
-			var/datum/disease/advance/A = get_by_index("viruses", index)
-			var/datum/symptom/S = A.symptoms[picked_symptom_index]
-			mode = SYMPTOM_DETAILS
-			selected_symptom = S
-			. = TRUE
-		if("back")
-			mode = MAIN_SCREEN
-			selected_symptom = null
-			. = TRUE
-
 
 /obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())

code/modules/reagents/chemistry/machinery/smoke_machine.dm

@@ -105,7 +105,7 @@
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "smoke_machine", name, 450, 350, master_ui, state)
+		ui = new(user, src, ui_key, "smoke_machine", name, 350, 350, master_ui, state)
 		ui.open()
 
 /obj/machinery/smoke_machine/ui_data(mob/user)

code/modules/recycling/disposal/bin.dm

@@ -286,59 +286,57 @@
 	var/datum/oracle_ui/themed/nano/ui
 	obj_flags = CAN_BE_HIT | USES_TGUI | SHOVABLE_ONTO
 
-/obj/machinery/disposal/bin/Initialize(mapload, obj/structure/disposalconstruct/make_from)
-	. = ..()
-	ui = new /datum/oracle_ui/themed/nano(src, 330, 190, "disposal_bin")
-	ui.auto_refresh = TRUE
-	ui.can_resize = FALSE
 
 // attack by item places it in to disposal
 /obj/machinery/disposal/bin/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/storage/bag/trash))	//Not doing component overrides because this is a specific type.
-		var/obj/item/storage/bag/trash/T = I
-		var/datum/component/storage/STR = T.GetComponent(/datum/component/storage)
-		to_chat(user, "<span class='warning'>You empty the bag.</span>")
-		for(var/obj/item/O in T.contents)
-			STR.remove_from_storage(O,src)
-		T.update_icon()
+	add_fingerprint(user)
+	if(!pressure_charging && !full_pressure && !flush)
+		if(I.tool_behaviour == TOOL_SCREWDRIVER)
+			panel_open = !panel_open
+			I.play_tool_sound(src)
+			to_chat(user, "<span class='notice'>You [panel_open ? "remove":"attach"] the screws around the power connection.</span>")
+			return
+		else if(I.tool_behaviour == TOOL_WELDER && panel_open)
+			if(!I.tool_start_check(user, amount=0))
+				return
+
+			to_chat(user, "<span class='notice'>You start slicing the floorweld off \the [src]...</span>")
+			if(I.use_tool(src, user, 20, volume=100) && panel_open)
+				to_chat(user, "<span class='notice'>You slice the floorweld off \the [src].</span>")
+				deconstruct()
+			return
+
+	if(user.a_intent != INTENT_HARM)
+		if((I.item_flags & ABSTRACT) || !user.temporarilyRemoveItemFromInventory(I))
+			return
+		place_item_in_disposal(I, user)
 		update_icon()
-		ui.soft_update_fields()
+		return TRUE //no afterattack
 	else
-		ui.soft_update_fields()
 		return ..()
 
 // handle machine interaction
 
-/obj/machinery/disposal/bin/ui_interact(mob/user, state)
+/obj/machinery/disposal/bin/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
 	if(stat & BROKEN)
 		return
-	if(user.loc == src)
-		to_chat(user, "<span class='warning'>You cannot reach the controls from inside!</span>")
-		return
-	ui.render(user)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "disposal_unit", name, ui_x, ui_y, master_ui, state)
+		ui.open()
 
-/obj/machinery/disposal/bin/oui_canview(mob/user)
-	if(user.loc == src)
-		return FALSE
-	if(stat & BROKEN)
-		return FALSE
-	if(Adjacent(user))
-		return TRUE
-	return ..()
-
-
-/obj/machinery/disposal/bin/oui_data(mob/user)
+/obj/machinery/disposal/bin/ui_data(mob/user)
 	var/list/data = list()
-	data["flush"] = flush ? ui.act("Disengage", user, "handle-0", class="active") : ui.act("Engage", user, "handle-1")
-	data["full_pressure"] = full_pressure ? "Ready" : (pressure_charging ? "Pressurizing" : "Off")
-	data["pressure_charging"] = pressure_charging ? ui.act("Turn Off", user, "pump-0", class="active", disabled=full_pressure) : ui.act("Turn On", user, "pump-1", disabled=full_pressure)
-	var/per = full_pressure ? 100 : CLAMP(100* air_contents.return_pressure() / (SEND_PRESSURE), 0, 99)
-	data["per"] = "[round(per, 1)]%"
-	data["contents"] = ui.act("Eject Contents", user, "eject", disabled=contents.len < 1)
+	data["flush"] = flush
+	data["full_pressure"] = full_pressure
+	data["pressure_charging"] = pressure_charging
+	data["panel_open"] = panel_open
+	data["per"] = CLAMP01(air_contents.return_pressure() / (SEND_PRESSURE))
 	data["isai"] = isAI(user)
 	return data
 
-/obj/machinery/disposal/bin/oui_act(mob/user, action, list/params)
+/obj/machinery/disposal/bin/ui_act(action, params)
 	if(..())
 		return
 
@@ -365,7 +363,6 @@
 		if("eject")
 			eject()
 			. = TRUE
-	ui.soft_update_fields()
 
 /obj/machinery/disposal/bin/alt_attack_hand(mob/user)
 	if(can_interact(usr))

code/modules/ruins/lavaland_ruin_code.dm

@@ -115,7 +115,9 @@
 	job_description = "Off-station Syndicate Scientist"
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper_s"
-	flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. <b>Continue your research as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!</b>"
+	short_desc = "You are a syndicate science technician, employed in a top secret research facility developing biological weapons."
+	flavour_text = "Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Continue your research as best you can, and try to keep a low profile."
+	important_info = "The base is rigged with explosives, DO NOT abandon it or let it fall into enemy hands!"
 	outfit = /datum/outfit/lavaland_syndicate
 	assignedrole = "Lavaland Syndicate"
 
@@ -142,7 +144,9 @@
 /obj/effect/mob_spawn/human/lavaland_syndicate/comms
 	name = "Syndicate Comms Agent"
 	job_description = "Off-station Syndicate Comms Agent"
-	flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. <b>Monitor enemy activity as best you can, and try to keep a low profile. <font size=6>DON'T</font> abandon the base without good cause.</b> Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!</b>"
+	short_desc = "You are a syndicate comms agent, employed in a top secret research facility developing biological weapons."
+	flavour_text = "Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!"
+	important_info = "DO NOT abandon the base."
 	outfit = /datum/outfit/lavaland_syndicate/comms
 
 /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space/Initialize()

code/modules/station_goals/bsa.dm

@@ -223,7 +223,7 @@
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "bsa", name, 400, 305, master_ui, state)
+		ui = new(user, src, ui_key, "bsa", name, 400, 220, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/bsa_control/ui_data()
@@ -252,6 +252,8 @@
 	update_icon()
 
 /obj/machinery/computer/bsa_control/proc/calibrate(mob/user)
+	if(!GLOB.bsa_unlock)
+		return
 	var/list/gps_locators = list()
 	for(var/obj/item/gps/G in GLOB.GPS_list) //nulls on the list somehow
 		if(G.tracking)

code/modules/tgui/external.dm

@@ -33,6 +33,37 @@
 /datum/proc/ui_data(mob/user)
 	return list() // Not implemented.
 
+ /**
+  * public
+  *
+  * Static Data to be sent to the UI.
+  * Static data differs from normal data in that it's large data that should be sent infrequently
+  * This is implemented optionally for heavy uis that would be sending a lot of redundant data
+  * frequently.
+  * Gets squished into one object on the frontend side, but the static part is cached.
+  *
+  * required user mob The mob interacting with the UI.
+  *
+  * return list Statuic Data to be sent to the UI.
+ **/
+/datum/proc/ui_static_data(mob/user)
+	return list()
+
+/**
+  * public
+  *
+  * Forces an update on static data. Should be done manually whenever something happens to change static data.
+  *
+  * required user the mob currently interacting with the ui
+  * optional ui ui to be updated
+  * optional ui_key ui key of ui to be updated
+  *
+**/
+/datum/proc/update_static_data(mob/user, datum/tgui/ui, ui_key = "main")
+	ui = SStgui.try_update_ui(user, src, ui_key, ui)
+	if(!ui)
+		return //If there was no ui to update, there's no static data to update either.
+	ui.push_data(null, ui_static_data(), TRUE)
 
  /**
   * public
@@ -80,7 +111,6 @@
   * Used to track UIs for a mob.
  **/
 /mob/var/list/open_uis = list()
-
  /**
   * public
   *
@@ -111,4 +141,4 @@
 		ui.close()
 		// Unset machine just to be sure.
 		if(src && src.mob)
-			src.mob.unset_machine()
+			src.mob.unset_machine()

code/modules/tgui/tgui.dm

@@ -1,387 +1,364 @@
- /**
-  * tgui
-  *
-  * /tg/station user interface library
- **/
-
- /**
-  * tgui datum (represents a UI).
- **/
-/datum/tgui
-	var/mob/user // The mob who opened/is using the UI.
-	var/datum/src_object // The object which owns the UI.
-	var/title // The title of te UI.
-	var/ui_key // The ui_key of the UI. This allows multiple UIs for one src_object.
-	var/window_id // The window_id for browse() and onclose().
-	var/width = 0 // The window width.
-	var/height = 0 // The window height
-	var/window_options = list( // Extra options to winset().
-	  "focus" = FALSE,
-	  "titlebar" = TRUE,
-	  "can_resize" = TRUE,
-	  "can_minimize" = TRUE,
-	  "can_maximize" = FALSE,
-	  "can_close" = TRUE,
-	  "auto_format" = FALSE
-	)
-	var/style = "nanotrasen" // The style to be used for this UI.
-	var/interface // The interface (template) to be used for this UI.
-	var/autoupdate = TRUE // Update the UI every MC tick.
-	var/initialized = FALSE // If the UI has been initialized yet.
-	var/list/initial_data // The data (and datastructure) used to initialize the UI.
-	var/status = UI_INTERACTIVE // The status/visibility of the UI.
-	var/datum/ui_state/state = null // Topic state used to determine status/interactability.
-	var/datum/tgui/master_ui // The parent UI.
-	var/list/datum/tgui/children = list() // Children of this UI.
-	var/titlebar = TRUE
-	var/custom_browser_id = FALSE
-	var/ui_screen = "home"
-
- /**
-  * public
-  *
-  * Create a new UI.
-  *
-  * required user mob The mob who opened/is using the UI.
-  * required src_object datum The object or datum which owns the UI.
-  * required ui_key string The ui_key of the UI.
-  * required interface string The interface used to render the UI.
-  * optional title string The title of the UI.
-  * optional width int The window width.
-  * optional height int The window height.
-  * optional master_ui datum/tgui The parent UI.
-  * optional state datum/ui_state The state used to determine status.
-  *
-  * return datum/tgui The requested UI.
- **/
-/datum/tgui/New(mob/user, datum/src_object, ui_key, interface, title, width = 0, height = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state, browser_id = null)
-	src.user = user
-	src.src_object = src_object
-	src.ui_key = ui_key
-	src.window_id = browser_id ? browser_id : "[REF(src_object)]-[ui_key]"
-	src.custom_browser_id = browser_id ? TRUE : FALSE
-
-	set_interface(interface)
-
-	if(title)
-		src.title = sanitize(title)
-	if(width)
-		src.width = width
-	if(height)
-		src.height = height
-
-	src.master_ui = master_ui
-	if(master_ui)
-		master_ui.children += src
-	src.state = state
-
-	var/datum/asset/assets = get_asset_datum(/datum/asset/simple/tgui)
-	assets.send(user)
-
- /**
-  * public
-  *
-  * Open this UI (and initialize it with data).
- **/
-/datum/tgui/proc/open()
-	if(!user.client)
-		return // Bail if there is no client.
-
-	update_status(push = 0) // Update the window status.
-	if(status < UI_UPDATE)
-		return // Bail if we're not supposed to open.
-
-	if(!initial_data)
-		set_initial_data(src_object.ui_data(user)) // Get the UI data.
-
-	var/window_size = ""
-	if(width && height) // If we have a width and height, use them.
-		window_size = "size=[width]x[height];"
-
-	var/debugable = check_rights_for(user.client, R_DEBUG)
-	user << browse(get_html(debugable), "window=[window_id];[window_size][list2params(window_options)]") // Open the window.
-	if (!custom_browser_id)
-		winset(user, window_id, "on-close=\"uiclose [REF(src)]\"") // Instruct the client to signal UI when the window is closed.
-	SStgui.on_open(src)
-
- /**
-  * public
-  *
-  * Reinitialize the UI.
-  * (Possibly with a new interface and/or data).
-  *
-  * optional template string The name of the new interface.
-  * optional data list The new initial data.
- **/
-/datum/tgui/proc/reinitialize(interface, list/data)
-	if(interface)
-		set_interface(interface) // Set a new interface.
-	if(data)
-		set_initial_data(data) // Replace the initial_data.
-	open()
-
- /**
-  * public
-  *
-  * Close the UI, and all its children.
- **/
-/datum/tgui/proc/close()
-	user << browse(null, "window=[window_id]") // Close the window.
-	src_object.ui_close()
-	SStgui.on_close(src)
-	for(var/datum/tgui/child in children) // Loop through and close all children.
-		child.close()
-	children.Cut()
-	state = null
-	master_ui = null
-	qdel(src)
-
- /**
-  * public
-  *
-  * Sets the browse() window options for this UI.
-  *
-  * required window_options list The window options to set.
- **/
-/datum/tgui/proc/set_window_options(list/window_options)
-	src.window_options = window_options
-
- /**
-  * public
-  *
-  * Set the style for this UI.
-  *
-  * required style string The new UI style.
- **/
-/datum/tgui/proc/set_style(style)
-	src.style = lowertext(style)
-
- /**
-  * public
-  *
-  * Set the interface (template) for this UI.
-  *
-  * required interface string The new UI interface.
- **/
-/datum/tgui/proc/set_interface(interface)
-	src.interface = lowertext(interface)
-
- /**
-  * public
-  *
-  * Enable/disable auto-updating of the UI.
-  *
-  * required state bool Enable/disable auto-updating.
- **/
-/datum/tgui/proc/set_autoupdate(state = 1)
-	autoupdate = state
-
- /**
-  * private
-  *
-  * Set the data to initialize the UI with.
-  * The datastructure cannot be changed by subsequent updates.
-  *
-  * optional data list The data/datastructure to initialize the UI with.
- **/
-/datum/tgui/proc/set_initial_data(list/data)
-	initial_data = data
-
- /**
-  * private
-  *
-  * Generate HTML for this UI.
-  *
-  * optional bool inline If the JSON should be inlined into the HTML (for debugging).
-  *
-  * return string UI HTML output.
- **/
-/datum/tgui/proc/get_html(var/inline)
-	var/html
-	html = SStgui.basehtml
-
-	//Allow the src object to override the html if needed
-	html = src_object.ui_base_html(html)
-	//Strip out any remaining custom tags that are used in ui_base_html
-	html = replacetext(html, "<!--customheadhtml-->", "")
-
-	// Poplate HTML with JSON if we're supposed to inline.
-	if(inline)
-		html = replacetextEx(html, "{}", get_json(initial_data))
-
-
-	//Setup for tgui stuff, including styles
-	html = replacetextEx(html, "\[ref]", "[REF(src)]")
-	html = replacetextEx(html, "\[style]", style)
-	return html
-
- /**
-  * private
-  *
-  * Get the config data/datastructure to initialize the UI with.
-  *
-  * return list The config data.
- **/
-/datum/tgui/proc/get_config_data()
-	var/list/config_data = list(
-			"title"     = title,
-			"status"    = status,
-			"screen"	= ui_screen,
-			"style"     = style,
-			"interface" = interface,
-			"fancy"     = user.client.prefs.tgui_fancy,
-			"locked"    = user.client.prefs.tgui_lock && !custom_browser_id,
-			"window"    = window_id,
-			"ref"       = "[REF(src)]",
-			"user"      = list(
-				"name"  = user.name,
-				"ref"   = "[REF(user)]"
-			),
-			"srcObject" = list(
-				"name" = "[src_object]",
-				"ref"  = "[REF(src_object)]"
-			),
-			"titlebar" = titlebar
-		)
-	return config_data
-
- /**
-  * private
-  *
-  * Package the data to send to the UI, as JSON.
-  * This includes the UI data and config_data.
-  *
-  * return string The packaged JSON.
- **/
-/datum/tgui/proc/get_json(list/data)
-	var/list/json_data = list()
-
-	json_data["config"] = get_config_data()
-	if(!isnull(data))
-		json_data["data"] = data
-
-	// Generate the JSON.
-	var/json = json_encode(json_data)
-	// Strip #255/improper.
-	json = replacetext(json, "\proper", "")
-	json = replacetext(json, "\improper", "")
-	return json
-
- /**
-  * private
-  *
-  * Handle clicks from the UI.
-  * Call the src_object's ui_act() if status is UI_INTERACTIVE.
-  * If the src_object's ui_act() returns 1, update all UIs attacked to it.
- **/
-/datum/tgui/Topic(href, href_list)
-	if(user != usr)
-		return // Something is not right here.
-
-	var/action = href_list["action"]
-	var/params = href_list; params -= "action"
-
-	switch(action)
-		if("tgui:initialize")
-			user << output(url_encode(get_json(initial_data)), "[custom_browser_id ? window_id : "[window_id].browser"]:initialize")
-			initialized = TRUE
-		if("tgui:view")
-			if(params["screen"])
-				ui_screen = params["screen"]
-			SStgui.update_uis(src_object)
-		if("tgui:link")
-			user << link(params["url"])
-		if("tgui:fancy")
-			user.client.prefs.tgui_fancy = TRUE
-		if("tgui:nofrills")
-			user.client.prefs.tgui_fancy = FALSE
-		else
-			update_status(push = 0) // Update the window state.
-			if(src_object.ui_act(action, params, src, state)) // Call ui_act() on the src_object.
-				SStgui.update_uis(src_object) // Update if the object requested it.
-
- /**
-  * private
-  *
-  * Update the UI.
-  * Only updates the data if update is true, otherwise only updates the status.
-  *
-  * optional force bool If the UI should be forced to update.
- **/
-/datum/tgui/process(force = 0)
-	var/datum/host = src_object.ui_host(user)
-	if(!src_object || !host || !user) // If the object or user died (or something else), abort.
-		close()
-		return
-
-	if(status && (force || autoupdate))
-		update() // Update the UI if the status and update settings allow it.
-	else
-		update_status(push = 1) // Otherwise only update status.
-
- /**
-  * private
-  *
-  * Push data to an already open UI.
-  *
-  * required data list The data to send.
-  * optional force bool If the update should be sent regardless of state.
- **/
-/datum/tgui/proc/push_data(data, force = 0)
-	update_status(push = 0) // Update the window state.
-	if(!initialized)
-		return // Cannot update UI if it is not set up yet.
-	if(status <= UI_DISABLED && !force)
-		return // Cannot update UI, we have no visibility.
-
-	// Send the new JSON to the update() Javascript function.
-	user << output(url_encode(get_json(data)), "[custom_browser_id ? window_id : "[window_id].browser"]:update")
-
- /**
-  * private
-  *
-  * Updates the UI by interacting with the src_object again, which will hopefully
-  * call try_ui_update on it.
-  *
-  * optional force_open bool If force_open should be passed to ui_interact.
- **/
-/datum/tgui/proc/update(force_open = FALSE)
-	src_object.ui_interact(user, ui_key, src, force_open, master_ui, state)
-
- /**
-  * private
-  *
-  * Update the status/visibility of the UI for its user.
-  *
-  * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
- **/
-/datum/tgui/proc/update_status(push = 0)
-	var/status = src_object.ui_status(user, state)
-	if(master_ui)
-		status = min(status, master_ui.status)
-
-	set_status(status, push)
-	if(status == UI_CLOSE)
-		close()
-
- /**
-  * private
-  *
-  * Set the status/visibility of the UI.
-  *
-  * required status int The status to set (UI_CLOSE/UI_DISABLED/UI_UPDATE/UI_INTERACTIVE).
-  * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
- **/
-/datum/tgui/proc/set_status(status, push = 0)
-	if(src.status != status) // Only update if status has changed.
-		if(src.status == UI_DISABLED)
-			src.status = status
-			if(push)
-				update()
-		else
-			src.status = status
-			if(status == UI_DISABLED || push) // Update if the UI just because disabled, or a push is requested.
-				push_data(null, force = 1)
-
-/datum/tgui/proc/set_titlebar(value)
-	titlebar = value
+ /**
+  * tgui
+  *
+  * /tg/station user interface library
+ **/
+
+ /**
+  * tgui datum (represents a UI).
+ **/
+/datum/tgui
+	/// The mob who opened/is using the UI.
+	var/mob/user
+	/// The object which owns the UI.
+	var/datum/src_object
+	/// The title of te UI.
+	var/title
+	/// The ui_key of the UI. This allows multiple UIs for one src_object.
+	var/ui_key
+	/// The window_id for browse() and onclose().
+	var/window_id
+	/// The window width.
+	var/width = 0
+	/// The window height
+	var/height = 0
+	/// The style to be used for this UI.
+	var/style = "nanotrasen"
+	/// The interface (template) to be used for this UI.
+	var/interface
+	/// Update the UI every MC tick.
+	var/autoupdate = TRUE
+	/// If the UI has been initialized yet.
+	var/initialized = FALSE
+	/// The data (and datastructure) used to initialize the UI.
+	var/list/initial_data
+	/// The static data used to initialize the UI.
+	var/list/initial_static_data
+	/// The status/visibility of the UI.
+	var/status = UI_INTERACTIVE
+	/// Topic state used to determine status/interactability.
+	var/datum/ui_state/state = null
+	/// The parent UI.
+	var/datum/tgui/master_ui
+	/// Children of this UI.
+	var/list/datum/tgui/children = list()
+	var/custom_browser_id = FALSE
+	var/ui_screen = "home"
+
+ /**
+  * public
+  *
+  * Create a new UI.
+  *
+  * required user mob The mob who opened/is using the UI.
+  * required src_object datum The object or datum which owns the UI.
+  * required ui_key string The ui_key of the UI.
+  * required interface string The interface used to render the UI.
+  * optional title string The title of the UI.
+  * optional width int The window width.
+  * optional height int The window height.
+  * optional master_ui datum/tgui The parent UI.
+  * optional state datum/ui_state The state used to determine status.
+  *
+  * return datum/tgui The requested UI.
+ **/
+/datum/tgui/New(mob/user, datum/src_object, ui_key, interface, title, width = 0, height = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state, browser_id = null)
+	src.user = user
+	src.src_object = src_object
+	src.ui_key = ui_key
+	src.window_id = browser_id ? browser_id : "[REF(src_object)]-[ui_key]" // DO NOT replace with \ref here. src_object could potentially be tagged
+	src.custom_browser_id = browser_id ? TRUE : FALSE
+
+	set_interface(interface)
+
+	if(title)
+		src.title = sanitize(title)
+	if(width)
+		src.width = width
+	if(height)
+		src.height = height
+
+	src.master_ui = master_ui
+	if(master_ui)
+		master_ui.children += src
+	src.state = state
+
+	var/datum/asset/assets = get_asset_datum(/datum/asset/group/tgui)
+	assets.send(user)
+
+ /**
+  * public
+  *
+  * Open this UI (and initialize it with data).
+ **/
+/datum/tgui/proc/open()
+	if(!user.client)
+		return // Bail if there is no client.
+
+	update_status(push = FALSE) // Update the window status.
+	if(status < UI_UPDATE)
+		return // Bail if we're not supposed to open.
+
+	var/window_size
+	if(width && height) // If we have a width and height, use them.
+		window_size = "size=[width]x[height];"
+	else
+		window_size = ""
+
+	// Remove titlebar and resize handles for a fancy window
+	var/have_title_bar
+	if(user.client.prefs.tgui_fancy)
+		have_title_bar = "titlebar=0;can_resize=0;"
+	else
+		have_title_bar = "titlebar=1;can_resize=1;"
+
+	// Generate page html
+	var/html
+	html = SStgui.basehtml
+	// Allow the src object to override the html if needed
+	html = src_object.ui_base_html(html)
+	// Replace template tokens with important UI data
+	// NOTE: Intentional \ref usage; tgui datums can't/shouldn't
+	// be tagged, so this is an effective unwrap
+	html = replacetextEx(html, "\[ref]", "\ref[src]")
+	html = replacetextEx(html, "\[style]", style)
+
+	// Open the window.
+	user << browse(html, "window=[window_id];can_minimize=0;auto_format=0;[window_size][have_title_bar]")
+	if (!custom_browser_id)
+		// Instruct the client to signal UI when the window is closed.
+		// NOTE: Intentional \ref usage; tgui datums can't/shouldn't
+		// be tagged, so this is an effective unwrap
+		winset(user, window_id, "on-close=\"uiclose \ref[src]\"")
+
+	if(!initial_data)
+		initial_data = src_object.ui_data(user)
+	if(!initial_static_data)
+		initial_static_data = src_object.ui_static_data(user)
+
+	SStgui.on_open(src)
+
+ /**
+  * public
+  *
+  * Reinitialize the UI.
+  * (Possibly with a new interface and/or data).
+  *
+  * optional template string The name of the new interface.
+  * optional data list The new initial data.
+ **/
+/datum/tgui/proc/reinitialize(interface, list/data, list/static_data)
+	if(interface)
+		set_interface(interface) // Set a new interface.
+	if(data)
+		initial_data = data
+	if(static_data)
+		initial_static_data = static_data
+	open()
+
+ /**
+  * public
+  *
+  * Close the UI, and all its children.
+ **/
+/datum/tgui/proc/close()
+	user << browse(null, "window=[window_id]") // Close the window.
+	src_object.ui_close()
+	SStgui.on_close(src)
+	for(var/datum/tgui/child in children) // Loop through and close all children.
+		child.close()
+	children.Cut()
+	state = null
+	master_ui = null
+	qdel(src)
+
+ /**
+  * public
+  *
+  * Set the style for this UI.
+  *
+  * required style string The new UI style.
+ **/
+/datum/tgui/proc/set_style(style)
+	src.style = lowertext(style)
+
+ /**
+  * public
+  *
+  * Set the interface (template) for this UI.
+  *
+  * required interface string The new UI interface.
+ **/
+/datum/tgui/proc/set_interface(interface)
+	src.interface = lowertext(interface)
+
+ /**
+  * public
+  *
+  * Enable/disable auto-updating of the UI.
+  *
+  * required state bool Enable/disable auto-updating.
+ **/
+/datum/tgui/proc/set_autoupdate(state = TRUE)
+	autoupdate = state
+
+ /**
+  * private
+  *
+  * Package the data to send to the UI, as JSON.
+  * This includes the UI data and config_data.
+  *
+  * return string The packaged JSON.
+ **/
+/datum/tgui/proc/get_json(list/data, list/static_data)
+	var/list/json_data = list()
+
+	json_data["config"] = list(
+		"title" = title,
+		"status" = status,
+		"screen" = ui_screen,
+		"style" = style,
+		"interface" = interface,
+		"fancy" = user.client.prefs.tgui_fancy,
+		"locked" = user.client.prefs.tgui_lock && !custom_browser_id,
+		"observer" = isobserver(user),
+		"window" = window_id,
+		// NOTE: Intentional \ref usage; tgui datums can't/shouldn't
+		// be tagged, so this is an effective unwrap
+		"ref" = "\ref[src]"
+	)
+	
+	if(!isnull(data))
+		json_data["data"] = data
+	if(!isnull(static_data))
+		json_data["static_data"] = static_data
+
+	// Generate the JSON.
+	var/json = json_encode(json_data)
+	// Strip #255/improper.
+	json = replacetext(json, "\proper", "")
+	json = replacetext(json, "\improper", "")
+	return json
+
+ /**
+  * private
+  *
+  * Handle clicks from the UI.
+  * Call the src_object's ui_act() if status is UI_INTERACTIVE.
+  * If the src_object's ui_act() returns 1, update all UIs attacked to it.
+ **/
+/datum/tgui/Topic(href, href_list)
+	if(user != usr)
+		return // Something is not right here.
+
+	var/action = href_list["action"]
+	var/params = href_list; params -= "action"
+
+	switch(action)
+		if("tgui:initialize")
+			user << output(url_encode(get_json(initial_data, initial_static_data)), "[custom_browser_id ? window_id : "[window_id].browser"]:initialize")
+			initialized = TRUE
+		if("tgui:view")
+			if(params["screen"])
+				ui_screen = params["screen"]
+			SStgui.update_uis(src_object)
+		if("tgui:log")
+			// Force window to show frills on fatal errors
+			if(params["fatal"])
+				winset(user, window_id, "titlebar=1;can-resize=1;size=600x600")
+		if("tgui:link")
+			user << link(params["url"])
+		if("tgui:fancy")
+			user.client.prefs.tgui_fancy = TRUE
+		if("tgui:nofrills")
+			user.client.prefs.tgui_fancy = FALSE
+		else
+			update_status(push = FALSE) // Update the window state.
+			if(src_object.ui_act(action, params, src, state)) // Call ui_act() on the src_object.
+				SStgui.update_uis(src_object) // Update if the object requested it.
+
+ /**
+  * private
+  *
+  * Update the UI.
+  * Only updates the data if update is true, otherwise only updates the status.
+  *
+  * optional force bool If the UI should be forced to update.
+ **/
+/datum/tgui/process(force = FALSE)
+	var/datum/host = src_object.ui_host(user)
+	if(!src_object || !host || !user) // If the object or user died (or something else), abort.
+		close()
+		return
+
+	if(status && (force || autoupdate))
+		update() // Update the UI if the status and update settings allow it.
+	else
+		update_status(push = TRUE) // Otherwise only update status.
+
+ /**
+  * private
+  *
+  * Push data to an already open UI.
+  *
+  * required data list The data to send.
+  * optional force bool If the update should be sent regardless of state.
+ **/
+/datum/tgui/proc/push_data(data, static_data, force = FALSE)
+	update_status(push = FALSE) // Update the window state.
+	if(!initialized)
+		return // Cannot update UI if it is not set up yet.
+	if(status <= UI_DISABLED && !force)
+		return // Cannot update UI, we have no visibility.
+
+	// Send the new JSON to the update() Javascript function.
+	user << output(url_encode(get_json(data, static_data)), "[custom_browser_id ? window_id : "[window_id].browser"]:update")
+
+ /**
+  * private
+  *
+  * Updates the UI by interacting with the src_object again, which will hopefully
+  * call try_ui_update on it.
+  *
+  * optional force_open bool If force_open should be passed to ui_interact.
+ **/
+/datum/tgui/proc/update(force_open = FALSE)
+	src_object.ui_interact(user, ui_key, src, force_open, master_ui, state)
+
+ /**
+  * private
+  *
+  * Update the status/visibility of the UI for its user.
+  *
+  * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
+ **/
+/datum/tgui/proc/update_status(push = FALSE)
+	var/status = src_object.ui_status(user, state)
+	if(master_ui)
+		status = min(status, master_ui.status)
+	set_status(status, push)
+	if(status == UI_CLOSE)
+		close()
+
+ /**
+  * private
+  *
+  * Set the status/visibility of the UI.
+  *
+  * required status int The status to set (UI_CLOSE/UI_DISABLED/UI_UPDATE/UI_INTERACTIVE).
+  * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
+ **/
+/datum/tgui/proc/set_status(status, push = FALSE)
+	if(src.status != status) // Only update if status has changed.
+		if(src.status == UI_DISABLED)
+			src.status = status
+			if(push)
+				update()
+		else
+			src.status = status
+			if(status == UI_DISABLED || push) // Update if the UI just because disabled, or a push is requested.
+				push_data(null, force = TRUE)
+
+/datum/tgui/proc/log_message(message)
+	log_tgui("[user] ([user.ckey]) using \"[title]\":\n[message]")
+

code/modules/uplink/uplink_items.dm

@@ -117,37 +117,37 @@
 	category = "Holiday"
 
 /datum/uplink_item/bundles_TC
-	category = "Bundles and Telecrystals"
+	category = "Telecrystals and Bundles"
 	surplus = 0
 	cant_discount = TRUE
 
 /datum/uplink_item/dangerous
-	category = "Conspicuous and Dangerous Weapons"
+	category = "Conspicuous Weapons"
 
 /datum/uplink_item/stealthy_weapons
-	category = "Stealthy and Inconspicuous Weapons"
+	category = "Stealthy Weapons"
 
 /datum/uplink_item/ammo
 	category = "Ammunition"
 	surplus = 40
 
 /datum/uplink_item/explosives
-	category = "Grenades and Explosives"
+	category = "Explosives"
 
 /datum/uplink_item/support
-	category = "Support and Mechanized Exosuits"
+	category = "Support and Exosuits"
 	surplus = 0
 	include_modes = list(/datum/game_mode/nuclear)
 
 /datum/uplink_item/suits
-	category = "Space Suits, Hardsuits and Clothing"
+	category = "Clothing"
 	surplus = 40
 
 /datum/uplink_item/stealthy_tools
-	category = "Stealth and Camouflage Items"
+	category = "Stealth Gadgets"
 
 /datum/uplink_item/device_tools
-	category = "Devices and Tools"
+	category = "Misc. Gadgets"
 
 /datum/uplink_item/implants
 	category = "Implants"