Vore Updates and merges

code/controllers/Processes/nanoui.dm

@@ -4,10 +4,10 @@
 
 /datum/controller/process/nanoui/statProcess()
 	..()
-	stat(null, "[nanomanager.processing_uis.len] UIs")
+	stat(null, "[GLOB.nanomanager.processing_uis.len] UIs")
 
 /datum/controller/process/nanoui/doWork()
-	for(last_object in nanomanager.processing_uis)
+	for(last_object in GLOB.nanomanager.processing_uis)
 		var/datum/nanoui/NUI = last_object
 		if(istype(NUI) && !QDELETED(NUI))
 			try
@@ -16,4 +16,4 @@
 				catchException(e, NUI)
 		else
 			catchBadType(NUI)
-			nanomanager.processing_uis -= NUI
+			GLOB.nanomanager.processing_uis -= NUI

code/controllers/Processes/supply.dm

@@ -8,15 +8,22 @@
 //Computers are in /code/game/machinery/computer/supply.dm
 
 /datum/supply_order
-	var/ordernum
-	var/datum/supply_packs/object = null
-	var/orderedby = null
-	var/comment = null
+	var/ordernum							// Unfabricatable index
+	var/index								// Fabricatable index
+	var/datum/supply_pack/object = null
+	var/cost								// Cost of the supply pack (Fabricatable) (Changes not reflected when purchasing supply packs, this is cosmetic only)
+	var/name								// Name of the supply pack datum (Fabricatable)
+	var/ordered_by = null					// Who requested the order
+	var/comment = null						// What reason was given for the order
+	var/approved_by = null					// Who approved the order
+	var/ordered_at							// Date and time the order was requested at
+	var/approved_at							// Date and time the order was approved at
+	var/status								// [Requested, Accepted, Denied, Shipped]
 
 /datum/exported_crate
 	var/name
 	var/value
-
+	var/list/contents
 
 var/datum/controller/supply/supply_controller = new()
 
@@ -25,25 +32,29 @@ var/datum/controller/supply/supply_controller = new()
 	var/points = 50
 	var/points_per_process = 1.5
 	var/points_per_slip = 2
-	var/points_per_platinum = 5 // 5 points per sheet
-	var/points_per_phoron = 5
 	var/points_per_money = 0.02 // 1 point for $50
 	//control
 	var/ordernum
-	var/list/shoppinglist = list()
-	var/list/requestlist = list()
-	var/list/supply_packs = list()
-	var/list/exported_crates = list()
+	var/list/shoppinglist = list()			// Approved orders
+	var/list/supply_pack = list()			// All supply packs
+	var/list/exported_crates = list()		// Crates sent from the station
+	var/list/order_history = list()			// History of orders, showing edits made by users
+	var/list/adm_order_history = list() 	// Complete history of all orders, for admin use
+	var/list/adm_export_history = list()	// Complete history of all crates sent back on the shuttle, for admin use
 	//shuttle movement
 	var/movetime = 1200
 	var/datum/shuttle/ferry/supply/shuttle
+	var/list/material_points_conversion = list( // Any materials not named in this list are worth 0 points
+			"phoron" = 5,
+			"platinum" = 5
+		)
 
 /datum/controller/supply/New()
 	ordernum = rand(1,9000)
 
-	for(var/typepath in (typesof(/datum/supply_packs) - /datum/supply_packs))
-		var/datum/supply_packs/P = new typepath()
-		supply_packs[P.name] = P
+	for(var/typepath in subtypesof(/datum/supply_pack))
+		var/datum/supply_pack/P = new typepath()
+		supply_pack[P.name] = P
 
 /datum/controller/process/supply/setup()
 	name = "supply controller"
@@ -80,23 +91,17 @@ var/datum/controller/supply/supply_controller = new()
 
 	callHook("sell_shuttle", list(area_shuttle));
 
-	var/phoron_count = 0
-	var/plat_count = 0
-	var/money_count = 0
-
-	exported_crates = list()
-
 	for(var/atom/movable/MA in area_shuttle)
 		if(MA.anchored)
 			continue
 
+		var/datum/exported_crate/EC = new /datum/exported_crate()
+		EC.name = "\proper[MA.name]"
+		EC.value = 0
+		EC.contents = list()
+
 		// Must be in a crate!
 		if(istype(MA,/obj/structure/closet/crate))
-			var/oldpoints = points
-			var/oldphoron = phoron_count
-			var/oldplatinum = plat_count
-			var/oldmoney = money_count
-
 			var/obj/structure/closet/crate/CR = MA
 			callHook("sell_crate", list(CR, area_shuttle))
 
@@ -104,44 +109,63 @@ var/datum/controller/supply/supply_controller = new()
 			var/find_slip = 1
 
 			for(var/atom/A in CR)
+				EC.contents[++EC.contents.len] = list(
+						"object" = "\proper[A.name]",
+						"value" = 0,
+						"quantity" = 1
+					)
+
 				// Sell manifests
 				if(find_slip && istype(A,/obj/item/weapon/paper/manifest))
 					var/obj/item/weapon/paper/manifest/slip = A
 					if(!slip.is_copy && slip.stamped && slip.stamped.len) //yes, the clown stamp will work. clown is the highest authority on the station, it makes sense
 						points += points_per_slip
+						EC.contents[EC.contents.len]["value"] = points_per_slip
 						find_slip = 0
 					continue
 
 				// Sell phoron and platinum
 				if(istype(A, /obj/item/stack))
 					var/obj/item/stack/P = A
-					switch(P.get_material_name())
-						if("phoron")
-							phoron_count += P.get_amount()
-						if("platinum")
-							plat_count += P.get_amount()
+					if(material_points_conversion[P.get_material_name()])
+						EC.contents[EC.contents.len]["value"] = P.get_amount() * material_points_conversion[P.get_material_name()]
+					EC.contents[EC.contents.len]["quantity"] = P.get_amount()
+					EC.value += EC.contents[EC.contents.len]["value"]
 
 				//Sell spacebucks
 				if(istype(A, /obj/item/weapon/spacecash))
 					var/obj/item/weapon/spacecash/cashmoney = A
-					money_count += cashmoney.worth
+					EC.contents[EC.contents.len]["value"] = cashmoney.worth * points_per_money
+					EC.contents[EC.contents.len]["quantity"] = cashmoney.worth
+					EC.value += EC.contents[EC.contents.len]["value"]
 
-			var/datum/exported_crate/EC = new /datum/exported_crate()
-			EC.name = CR.name
-			EC.value = points - oldpoints
-			EC.value += (phoron_count - oldphoron) * points_per_phoron
-			EC.value += (plat_count - oldplatinum) * points_per_platinum
-			EC.value += (money_count - oldmoney) * points_per_money
-			exported_crates += EC
+
+
+		// Make a log of it, but it wasn't shipped properly, and so isn't worth anything
+		else
+			EC.contents = list(
+					"error" = "Error: Product was improperly packaged. Payment rendered null under terms of agreement."
+				)
+
+		exported_crates += EC
+		points += EC.value
+
+		// Duplicate the receipt for the admin-side log
+		var/datum/exported_crate/adm = new()
+		adm.name = EC.name
+		adm.value = EC.value
+		adm.contents = deepCopyList(EC.contents)
+		adm_export_history += adm
 
 		qdel(MA)
 
-	points += phoron_count * points_per_phoron
-	points += plat_count * points_per_platinum
-	points += money_count * points_per_money
-
 //Buying
 /datum/controller/supply/proc/buy()
+	var/list/shoppinglist = list()
+	for(var/datum/supply_order/SO in order_history)
+		if(SO.status == SUP_ORDER_APPROVED)
+			shoppinglist += SO
+
 	if(!shoppinglist.len)
 		return
 
@@ -165,17 +189,16 @@ var/datum/controller/supply/supply_controller = new()
 			continue
 		clear_turfs += T
 
-	for(var/S in shoppinglist)
+	for(var/datum/supply_order/SO in shoppinglist)
 		if(!clear_turfs.len)
 			break
 
 		var/i = rand(1,clear_turfs.len)
 		var/turf/pickedloc = clear_turfs[i]
 		clear_turfs.Cut(i,i+1)
-		shoppinglist -= S
 
-		var/datum/supply_order/SO = S
-		var/datum/supply_packs/SP = SO.object
+		SO.status = SUP_ORDER_SHIPPED
+		var/datum/supply_pack/SP = SO.object
 
 		var/obj/A = new SP.containertype(pickedloc)
 		A.name = "[SP.containername] [SO.comment ? "([SO.comment])":"" ]"
@@ -202,8 +225,8 @@ var/datum/controller/supply/supply_controller = new()
 				log_debug("<span class='danger'>Supply pack with invalid access restriction [SP.access] encountered!</span>")
 
 		var/list/contains
-		if(istype(SP,/datum/supply_packs/randomised))
-			var/datum/supply_packs/randomised/SPR = SP
+		if(istype(SP,/datum/supply_pack/randomised))
+			var/datum/supply_pack/randomised/SPR = SP
 			contains = list()
 			if(SPR.contains.len)
 				for(var/j=1,j<=SPR.num_contained,j++)
@@ -227,3 +250,141 @@ var/datum/controller/supply/supply_controller = new()
 			slip.info += "CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS<hr>"
 
 	return
+
+// Will attempt to purchase the specified order, returning TRUE on success, FALSE on failure
+/datum/controller/supply/proc/approve_order(var/datum/supply_order/O, var/mob/user)
+	// Not enough points to purchase the crate
+	if(supply_controller.points <= O.object.cost)
+		return FALSE
+
+	// Based on the current model, there shouldn't be any entries in order_history, requestlist, or shoppinglist, that aren't matched in adm_order_history
+	var/datum/supply_order/adm_order
+	for(var/datum/supply_order/temp in adm_order_history)
+		if(temp.ordernum == O.ordernum)
+			adm_order = temp
+			break
+
+	var/idname = "*None Provided*"
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		idname = H.get_authentification_name()
+	else if(issilicon(user))
+		idname = user.real_name
+
+	// Update order status
+	O.status = SUP_ORDER_APPROVED
+	O.approved_by = idname
+	O.approved_at = stationdate2text() + " - " + stationtime2text()
+	// Update admin-side mirror
+	adm_order.status = SUP_ORDER_APPROVED
+	adm_order.approved_by = idname
+	adm_order.approved_at = stationdate2text() + " - " + stationtime2text()
+
+	// Deduct cost
+	supply_controller.points -= O.object.cost
+	return TRUE
+
+// Will deny the specified order. Only useful if the order is currently requested, but available at any status
+/datum/controller/supply/proc/deny_order(var/datum/supply_order/O, var/mob/user)
+	// Based on the current model, there shouldn't be any entries in order_history, requestlist, or shoppinglist, that aren't matched in adm_order_history
+	var/datum/supply_order/adm_order
+	for(var/datum/supply_order/temp in adm_order_history)
+		if(temp.ordernum == O.ordernum)
+			adm_order = temp
+			break
+
+	var/idname = "*None Provided*"
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		idname = H.get_authentification_name()
+	else if(issilicon(user))
+		idname = user.real_name
+
+	// Update order status
+	O.status = SUP_ORDER_DENIED
+	O.approved_by = idname
+	O.approved_at = stationdate2text() + " - " + stationtime2text()
+	// Update admin-side mirror
+	adm_order.status = SUP_ORDER_DENIED
+	adm_order.approved_by = idname
+	adm_order.approved_at = stationdate2text() + " - " + stationtime2text()
+	return
+
+// Will deny all requested orders
+/datum/controller/supply/proc/deny_all_pending(var/mob/user)
+	for(var/datum/supply_order/O in order_history)
+		if(O.status == SUP_ORDER_REQUESTED)
+			deny_order(O, user)
+
+// Will delete the specified order from the user-side list
+/datum/controller/supply/proc/delete_order(var/datum/supply_order/O, var/mob/user)
+	// Making sure they know what they're doing
+	if(alert(user, "Are you sure you want to delete this record? If it has been approved, cargo points will NOT be refunded!", "Delete Record","No","Yes") == "Yes")
+		if(alert(user, "Are you really sure? There is no way to recover the order once deleted.", "Delete Record", "No", "Yes") == "Yes")
+			log_admin("[key_name(user)] has deleted supply order \ref[O] [O] from the user-side order history.")
+			supply_controller.order_history -= O
+	return
+
+// Will generate a new, requested order, for the given supply pack type
+/datum/controller/supply/proc/create_order(var/datum/supply_pack/S, var/mob/user, var/reason)
+	var/datum/supply_order/new_order = new()
+	var/datum/supply_order/adm_order = new() // Admin-recorded order must be a separate copy in memory, or user-made edits will corrupt it
+
+	var/idname = "*None Provided*"
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		idname = H.get_authentification_name()
+	else if(issilicon(user))
+		idname = user.real_name
+
+	new_order.ordernum = ++ordernum // Ordernum is used to track the order between the playerside list of orders and the adminside list
+	new_order.index = new_order.ordernum // Index can be fabricated, or falsified. Ordernum is a permanent marker used to track the order
+	new_order.object = S
+	new_order.name = S.name
+	new_order.cost = S.cost
+	new_order.ordered_by = idname
+	new_order.comment = reason
+	new_order.ordered_at = stationdate2text() + " - " + stationtime2text()
+	new_order.status = SUP_ORDER_REQUESTED
+
+	adm_order.ordernum = new_order.ordernum
+	adm_order.index = new_order.index
+	adm_order.object = new_order.object
+	adm_order.name = new_order.name
+	adm_order.cost = new_order.cost
+	adm_order.ordered_by = new_order.ordered_by
+	adm_order.comment = new_order.comment
+	adm_order.ordered_at = new_order.ordered_at
+	adm_order.status = new_order.status
+
+	order_history += new_order
+	adm_order_history += adm_order
+
+// Will delete the specified export receipt from the user-side list
+/datum/controller/supply/proc/delete_export(var/datum/exported_crate/E, var/mob/user)
+	// Making sure they know what they're doing
+	if(alert(user, "Are you sure you want to delete this record?", "Delete Record","No","Yes") == "Yes")
+		if(alert(user, "Are you really sure? There is no way to recover the receipt once deleted.", "Delete Record", "No", "Yes") == "Yes")
+			log_admin("[key_name(user)] has deleted export receipt \ref[E] [E] from the user-side export history.")
+			supply_controller.exported_crates -= E
+	return
+
+// Will add an item entry to the specified export receipt on the user-side list
+/datum/controller/supply/proc/add_export_item(var/datum/exported_crate/E, var/mob/user)
+	var/new_name = input(user, "Name", "Please enter the name of the item.") as null|text
+	if(!new_name)
+		return
+
+	var/new_quantity = input(user, "Name", "Please enter the quantity of the item.") as null|num
+	if(!new_quantity)
+		return
+
+	var/new_value = input(user, "Name", "Please enter the value of the item.") as null|num
+	if(!new_value)
+		return
+
+	E.contents[++E.contents.len] = list(
+			"object" = new_name,
+			"quantity" = new_quantity,
+			"value" = new_value
+		)

code/controllers/globals.dm

@@ -14,14 +14,13 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
 
 	var/datum/controller/exclude_these = new
 	gvars_datum_in_built_vars = exclude_these.vars + list("gvars_datum_protected_varlist", "gvars_datum_in_built_vars", "gvars_datum_init_order")
-	qdel(exclude_these)
 
 	log_world("[vars.len - gvars_datum_in_built_vars.len] global variables")
 
-	Initialize()
+	Initialize(exclude_these)
 
 /datum/controller/global_vars/Destroy(force)
-	stack_trace("Some fucker qdel'd the global holder!")
+	crash_with("There was an attempt to qdel the global vars holder!")
 	if(!force)
 		return QDEL_HINT_LETMELIVE
 
@@ -39,31 +38,22 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
 
 	stat("Globals:", statclick.update("Edit"))
 
-/datum/controller/global_vars/can_vv_get(var_name)
-	if(gvars_datum_protected_varlist[var_name])
-		return FALSE
-	return ..()
+/datum/controller/global_vars/VV_hidden()
+	return ..() + gvars_datum_protected_varlist
 
-/datum/controller/global_vars/vv_edit_var(var_name, var_value)
-	if(gvars_datum_protected_varlist[var_name])
-		return FALSE
-	return ..()
-
-/datum/controller/global_vars/Initialize()
+/datum/controller/global_vars/Initialize(var/exclude_these)
 	gvars_datum_init_order = list()
-	gvars_datum_protected_varlist = list("gvars_datum_protected_varlist" = TRUE)
-	var/list/global_procs = typesof(/datum/controller/global_vars/proc)
-	var/expected_len = vars.len - gvars_datum_in_built_vars.len
-	if(global_procs.len != expected_len)
-		warning("Unable to detect all global initialization procs! Expected [expected_len] got [global_procs.len]!")
-		if(global_procs.len)
-			var/list/expected_global_procs = vars - gvars_datum_in_built_vars
-			for(var/I in global_procs)
-				expected_global_procs -= replacetext("[I]", "InitGlobal", "")
-			//log_world("Missing procs: [expected_global_procs.Join(", ")]")
-	for(var/I in global_procs)
+	gvars_datum_protected_varlist = list("gvars_datum_protected_varlist")
+
+	//See https://github.com/tgstation/tgstation/issues/26954
+	for(var/I in typesof(/datum/controller/global_vars/proc))
+		var/CLEANBOT_RETURNS = "[I]"
+		pass(CLEANBOT_RETURNS)
+
+	for(var/I in (vars - gvars_datum_in_built_vars))
 		var/start_tick = world.time
-		call(src, I)()
+		call(src, "InitGlobal[I]")()
 		var/end_tick = world.time
 		if(end_tick - start_tick)
-			warning("Global [replacetext("[I]", "InitGlobal", "")] slept during initialization!")
+			warning("Global [I] slept during initialization!")
+	QDEL_NULL(exclude_these)

code/controllers/master.dm

@@ -6,7 +6,21 @@
   * Odds are, there is a reason
   *
  **/
-var/datum/controller/master/Master = new()
+
+//This is the ABSOLUTE ONLY THING that should init globally like this
+GLOBAL_REAL(Master, /datum/controller/master) = new
+
+//THIS IS THE INIT ORDER
+//Master -> SSPreInit -> GLOB -> world -> config -> SSInit -> Failsafe
+//GOT IT MEMORIZED?
+GLOBAL_VAR_INIT(MC_restart_clear, 0)
+GLOBAL_VAR_INIT(MC_restart_timeout, 0)
+GLOBAL_VAR_INIT(MC_restart_count, 0)
+
+//current tick limit, assigned by the queue controller before running a subsystem.
+//used by check_tick as well so that the procs subsystems call can obey that SS's tick limits
+GLOBAL_VAR_INIT(CURRENT_TICKLIMIT, TICK_LIMIT_RUNNING)
+
 
 /datum/controller/master
 	name = "Master"
@@ -48,10 +62,6 @@ var/datum/controller/master/Master = new()
 	var/static/restart_timeout = 0
 	var/static/restart_count = 0
 
-	//current tick limit, assigned before running a subsystem.
-	//used by CHECK_TICK as well so that the procs subsystems call can obey that SS's tick limits
-	var/static/current_ticklimit = TICK_LIMIT_RUNNING
-
 /datum/controller/master/New()
 	// Highlander-style: there can only be one! Kill off the old and replace it with the new.
 	var/list/_subsystems = list()
@@ -67,6 +77,9 @@ var/datum/controller/master/Master = new()
 				_subsystems += new I
 		Master = src
 
+	if(!GLOB)
+		new /datum/controller/global_vars
+
 /datum/controller/master/Destroy()
 	..()
 	// Tell qdel() to Del() this object.
@@ -85,14 +98,14 @@ var/datum/controller/master/Master = new()
 //	-1 if we encountered a runtime trying to recreate it
 /proc/Recreate_MC()
 	. = -1 //so if we runtime, things know we failed
-	if (world.time < Master.restart_timeout)
+	if (world.time < GLOB.MC_restart_timeout)
 		return 0
-	if (world.time < Master.restart_clear)
-		Master.restart_count *= 0.5
+	if (world.time < GLOB.MC_restart_clear)
+		GLOB.MC_restart_count *= 0.5
 
-	var/delay = 50 * ++Master.restart_count
-	Master.restart_timeout = world.time + delay
-	Master.restart_clear = world.time + (delay * 2)
+	var/delay = 50 * ++GLOB.MC_restart_count
+	GLOB.MC_restart_timeout = world.time + delay
+	GLOB.MC_restart_clear = world.time + (delay * 2)
 	Master.processing = FALSE //stop ticking this one
 	try
 		new/datum/controller/master()
@@ -136,6 +149,7 @@ var/datum/controller/master/Master = new()
 	if (istype(Master.subsystems))
 		if(FireHim)
 			Master.subsystems += new BadBoy.type	//NEW_SS_GLOBAL will remove the old one
+
 		subsystems = Master.subsystems
 		current_runlevel = Master.current_runlevel
 		StartProcessing(10)
@@ -162,13 +176,13 @@ var/datum/controller/master/Master = new()
 
 	var/start_timeofday = REALTIMEOFDAY
 	// Initialize subsystems.
-	current_ticklimit = config.tick_limit_mc_init
+	GLOB.CURRENT_TICKLIMIT = config.tick_limit_mc_init
 	for (var/datum/controller/subsystem/SS in subsystems)
 		if (SS.flags & SS_NO_INIT)
 			continue
 		SS.Initialize(REALTIMEOFDAY)
 		CHECK_TICK
-	current_ticklimit = TICK_LIMIT_RUNNING
+	GLOB.CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING
 	var/time = (REALTIMEOFDAY - start_timeofday) / 10
 
 	var/msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!"
@@ -279,7 +293,7 @@ var/datum/controller/master/Master = new()
 		tickdrift = max(0, MC_AVERAGE_FAST(tickdrift, (((REALTIMEOFDAY - init_timeofday) - (world.time - init_time)) / world.tick_lag)))
 		var/starting_tick_usage = TICK_USAGE
 		if (processing <= 0)
-			current_ticklimit = TICK_LIMIT_RUNNING
+			GLOB.CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING
 			sleep(10)
 			continue
 
@@ -288,7 +302,7 @@ var/datum/controller/master/Master = new()
 		//	(because sleeps are processed in the order received, longer sleeps are more likely to run first)
 		if (starting_tick_usage > TICK_LIMIT_MC) //if there isn't enough time to bother doing anything this tick, sleep a bit.
 			sleep_delta *= 2
-			current_ticklimit = TICK_LIMIT_RUNNING * 0.5
+			GLOB.CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING * 0.5
 			sleep(world.tick_lag * (processing * sleep_delta))
 			continue
 
@@ -334,7 +348,7 @@ var/datum/controller/master/Master = new()
 			if (!error_level)
 				iteration++
 			error_level++
-			current_ticklimit = TICK_LIMIT_RUNNING
+			GLOB.CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING
 			sleep(10)
 			continue
 
@@ -346,7 +360,7 @@ var/datum/controller/master/Master = new()
 				if (!error_level)
 					iteration++
 				error_level++
-				current_ticklimit = TICK_LIMIT_RUNNING
+				GLOB.CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING
 				sleep(10)
 				continue
 		error_level--
@@ -357,9 +371,9 @@ var/datum/controller/master/Master = new()
 		iteration++
 		last_run = world.time
 		src.sleep_delta = MC_AVERAGE_FAST(src.sleep_delta, sleep_delta)
-		current_ticklimit = TICK_LIMIT_RUNNING
+		GLOB.CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING
 		if (processing * sleep_delta <= world.tick_lag)
-			current_ticklimit -= (TICK_LIMIT_RUNNING * 0.25) //reserve the tail 1/4 of the next tick for the mc if we plan on running next tick
+			GLOB.CURRENT_TICKLIMIT -= (TICK_LIMIT_RUNNING * 0.25) //reserve the tail 1/4 of the next tick for the mc if we plan on running next tick
 		sleep(world.tick_lag * (processing * sleep_delta))
 
 
@@ -451,7 +465,7 @@ var/datum/controller/master/Master = new()
 			// Reduce tick allocation for subsystems that overran on their last tick.
 			tick_precentage = max(tick_precentage*0.5, tick_precentage-queue_node.tick_overrun)
 
-			current_ticklimit = round(TICK_USAGE + tick_precentage)
+			GLOB.CURRENT_TICKLIMIT = round(TICK_USAGE + tick_precentage)
 
 			if (!(queue_node_flags & SS_TICKER))
 				ran_non_ticker = TRUE

code/controllers/master_controller.dm

@@ -53,4 +53,4 @@ datum/controller/game_controller/proc/setup_objects()
 	populate_antag_type_list()
 
 	//Set up spawn points.
-	populate_spawn_points()
+	populate_spawn_points()

code/controllers/subsystems/circuits.dm

@@ -0,0 +1,96 @@
+//
+// This is for custom circuits, mostly the initialization of global properties about them.
+// Might make this also process them in the future if its better to do that than using the obj ticker.
+//
+SUBSYSTEM_DEF(circuit)
+	name = "Circuit"
+	init_order = INIT_ORDER_CIRCUIT
+	flags = SS_NO_FIRE
+	var/list/all_components = list()								// Associative list of [component_name]:[component_path] pairs
+	var/list/cached_components = list()								// Associative list of [component_path]:[component] pairs
+	var/list/all_assemblies = list()								// Associative list of [assembly_name]:[assembly_path] pairs
+	var/list/cached_assemblies = list()								// Associative list of [assembly_path]:[assembly] pairs
+	var/list/all_circuits = list()									// Associative list of [circuit_name]:[circuit_path] pairs
+	var/list/circuit_fabricator_recipe_list = list()				// Associative list of [category_name]:[list_of_circuit_paths] pairs
+//	var/cost_multiplier = MINERAL_MATERIAL_AMOUNT / 10 // Each circuit cost unit is 200cm3
+
+/datum/controller/subsystem/circuit/Recover()
+	flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
+
+/datum/controller/subsystem/circuit/Initialize(timeofday)
+	circuits_init()
+	return ..()
+
+/datum/controller/subsystem/circuit/proc/circuits_init()
+	//Cached lists for free performance
+	for(var/path in typesof(/obj/item/integrated_circuit))
+		var/obj/item/integrated_circuit/IC = path
+		var/name = initial(IC.name)
+		all_components[name] = path // Populating the component lists
+		cached_components[IC] = new path
+
+		if(!(initial(IC.spawn_flags) & (IC_SPAWN_DEFAULT | IC_SPAWN_RESEARCH)))
+			continue
+
+		var/category = initial(IC.category_text)
+		if(!circuit_fabricator_recipe_list[category])
+			circuit_fabricator_recipe_list[category] = list()
+		var/list/category_list = circuit_fabricator_recipe_list[category]
+		category_list += IC // Populating the fabricator categories
+
+	for(var/path in typesof(/obj/item/device/electronic_assembly))
+		var/obj/item/device/electronic_assembly/A = path
+		var/name = initial(A.name)
+		all_assemblies[name] = path
+		cached_assemblies[A] = new path
+
+
+	circuit_fabricator_recipe_list["Assemblies"] = list(
+		/obj/item/device/electronic_assembly/default,
+		/obj/item/device/electronic_assembly/calc,
+		/obj/item/device/electronic_assembly/clam,
+		/obj/item/device/electronic_assembly/simple,
+		/obj/item/device/electronic_assembly/hook,
+		/obj/item/device/electronic_assembly/pda,
+		/obj/item/device/electronic_assembly/tiny/default,
+		/obj/item/device/electronic_assembly/tiny/cylinder,
+		/obj/item/device/electronic_assembly/tiny/scanner,
+		/obj/item/device/electronic_assembly/tiny/hook,
+		/obj/item/device/electronic_assembly/tiny/box,
+		/obj/item/device/electronic_assembly/medium/default,
+		/obj/item/device/electronic_assembly/medium/box,
+		/obj/item/device/electronic_assembly/medium/clam,
+		/obj/item/device/electronic_assembly/medium/medical,
+		/obj/item/device/electronic_assembly/medium/gun,
+		/obj/item/device/electronic_assembly/medium/radio,
+		/obj/item/device/electronic_assembly/large/default,
+		/obj/item/device/electronic_assembly/large/scope,
+		/obj/item/device/electronic_assembly/large/terminal,
+		/obj/item/device/electronic_assembly/large/arm,
+		/obj/item/device/electronic_assembly/large/tall,
+		/obj/item/device/electronic_assembly/large/industrial,
+		/obj/item/device/electronic_assembly/drone/default,
+		/obj/item/device/electronic_assembly/drone/arms,
+		/obj/item/device/electronic_assembly/drone/secbot,
+		/obj/item/device/electronic_assembly/drone/medbot,
+		/obj/item/device/electronic_assembly/drone/genbot,
+		/obj/item/device/electronic_assembly/drone/android,
+		/obj/item/device/electronic_assembly/wallmount/tiny,
+		/obj/item/device/electronic_assembly/wallmount/light,
+		/obj/item/device/electronic_assembly/wallmount,
+		/obj/item/device/electronic_assembly/wallmount/heavy,
+		/obj/item/weapon/implant/integrated_circuit,
+		/obj/item/clothing/under/circuitry,
+		/obj/item/clothing/gloves/circuitry,
+		/obj/item/clothing/glasses/circuitry,
+		/obj/item/clothing/shoes/circuitry,
+		/obj/item/clothing/head/circuitry,
+		/obj/item/clothing/ears/circuitry,
+		/obj/item/clothing/suit/circuitry
+		)
+
+	circuit_fabricator_recipe_list["Tools"] = list(
+		/obj/item/device/integrated_electronics/wirer,
+		/obj/item/device/integrated_electronics/debugger,
+		/obj/item/device/integrated_electronics/detailer
+		)

code/controllers/subsystems/planets.dm

@@ -57,6 +57,7 @@ SUBSYSTEM_DEF(planets)
 		else
 			P.planet_walls -= T
 		T.vis_contents -= P.weather_holder.visuals
+		T.vis_contents -= P.weather_holder.special_visuals
 
 /datum/controller/subsystem/planets/proc/allocateTurfs(var/initial = FALSE)
 	var/list/currentlist = new_outdoor_turfs
@@ -67,6 +68,7 @@ SUBSYSTEM_DEF(planets)
 			var/datum/planet/P = z_to_planet[OT.z]
 			P.planet_floors |= OT
 			OT.vis_contents |= P.weather_holder.visuals
+			OT.vis_contents |= P.weather_holder.special_visuals
 		if(!initial && MC_TICK_CHECK)
 			return
 
@@ -85,6 +87,7 @@ SUBSYSTEM_DEF(planets)
 		var/datum/planet/P = z_to_planet[T.z]
 		P.planet_floors -= T
 		T.vis_contents -= P.weather_holder.visuals
+		T.vis_contents -= P.weather_holder.special_visuals
 
 
 /datum/controller/subsystem/planets/fire(resumed = 0)

code/controllers/verbs.dm

@@ -125,7 +125,7 @@
 			debug_variables(alarm_manager)
 			feedback_add_details("admin_verb", "DAlarm")
 		if("Nano")
-			debug_variables(nanomanager)
+			debug_variables(GLOB.nanomanager)
 			feedback_add_details("admin_verb", "DNano")
 		if("Chemistry")
 			debug_variables(chemistryProcess)