Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool

code/__defines/supply.dm

@@ -0,0 +1,19 @@
+// Supply shuttle status defines
+#define SUP_SHUTTLE_ERROR -1	// Error state
+#define SUP_SHUTTLE_DOCKED 0
+#define SUP_SHUTTLE_UNDOCKED 1
+#define SUP_SHUTTLE_DOCKING 2
+#define SUP_SHUTTLE_UNDOCKING 3
+#define SUP_SHUTTLE_TRANSIT 4
+#define SUP_SHUTTLE_AWAY 5
+
+// Supply computer access levels
+#define SUP_SEND_SHUTTLE 0x1 // Send the shuttle back and forth
+#define SUP_ACCEPT_ORDERS 0x2 // Accept orders
+#define SUP_CONTRABAND	  0x4 // Able to order contraband supply packs
+
+// Supply_order status values
+#define SUP_ORDER_REQUESTED "Requested"
+#define SUP_ORDER_APPROVED  "Approved"
+#define SUP_ORDER_DENIED    "Denied"
+#define SUP_ORDER_SHIPPED   "Shipped"

code/controllers/Processes/supply.dm

@@ -8,15 +8,22 @@
 //Computers are in /code/game/machinery/computer/supply.dm
 
 /datum/supply_order
-	var/ordernum
+	var/ordernum							// Unfabricatable index
-	var/datum/supply_packs/object = null
+	var/index								// Fabricatable index
-	var/orderedby = null
+	var/datum/supply_pack/object = null
-	var/comment = 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,30 @@ 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/shoppinglist = list()			// Approved orders
-	var/list/requestlist = list()
+	var/list/supply_pack = list()			// All supply packs
-	var/list/supply_packs = list()
+	var/list/exported_crates = list()		// Crates sent from the station
-	var/list/exported_crates = list()
+	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))
+	for(var/typepath in subtypesof(/datum/supply_pack))
-		var/datum/supply_packs/P = new typepath()
+		var/datum/supply_pack/P = new typepath()
-		supply_packs[P.name] = P
+		supply_pack[P.name] = P
 
 /datum/controller/process/supply/setup()
 	name = "supply controller"
@@ -80,23 +92,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 +110,64 @@ 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(material_points_conversion[P.get_material_name()])
-						if("phoron")
+						EC.contents[EC.contents.len]["value"] = P.get_amount() * material_points_conversion[P.get_material_name()]
-							phoron_count += P.get_amount()
+					EC.contents[EC.contents.len]["quantity"] = P.get_amount()
-						if("platinum")
+					EC.value += EC.contents[EC.contents.len]["value"]
-							plat_count += P.get_amount()
+
 
 				//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"]
+
+
+
+		// 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."
+				)
 
-			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
+		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 +191,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
+		SO.status = SUP_ORDER_SHIPPED
-		var/datum/supply_packs/SP = SO.object
+		var/datum/supply_pack/SP = SO.object
 
 		var/obj/A = new SP.containertype(pickedloc)
 		A.name = "[SP.containername] [SO.comment ? "([SO.comment])":"" ]"
@@ -202,8 +227,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))
+		if(istype(SP,/datum/supply_pack/randomised))
-			var/datum/supply_packs/randomised/SPR = SP
+			var/datum/supply_pack/randomised/SPR = SP
 			contains = list()
 			if(SPR.contains.len)
 				for(var/j=1,j<=SPR.num_contained,j++)
@@ -227,3 +252,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/datums/supplypacks/atmospherics.dm

@@ -4,45 +4,45 @@
 */
 
 
-/datum/supply_packs/atmos
+/datum/supply_pack/atmos
 	group = "Atmospherics"
 
-/datum/supply_packs/atmos/inflatable
+/datum/supply_pack/atmos/inflatable
 	name = "Inflatable barriers"
 	contains = list(/obj/item/weapon/storage/briefcase/inflatable = 3)
 	cost = 20
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "Inflatable Barrier Crate"
 
-/datum/supply_packs/atmos/canister_empty
+/datum/supply_pack/atmos/canister_empty
 	name = "Empty gas canister"
 	cost = 7
 	containername = "Empty gas canister crate"
 	containertype = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister)
 
-/datum/supply_packs/atmos/canister_air
+/datum/supply_pack/atmos/canister_air
 	name = "Air canister"
 	cost = 10
 	containername = "Air canister crate"
 	containertype = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister/air)
 
-/datum/supply_packs/atmos/canister_oxygen
+/datum/supply_pack/atmos/canister_oxygen
 	name = "Oxygen canister"
 	cost = 15
 	containername = "Oxygen canister crate"
 	containertype = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister/oxygen)
 
-/datum/supply_packs/atmos/canister_nitrogen
+/datum/supply_pack/atmos/canister_nitrogen
 	name = "Nitrogen canister"
 	cost = 10
 	containername = "Nitrogen canister crate"
 	containertype = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister/nitrogen)
 
-/datum/supply_packs/atmos/canister_phoron
+/datum/supply_pack/atmos/canister_phoron
 	name = "Phoron gas canister"
 	cost = 60
 	containername = "Phoron gas canister crate"
@@ -50,7 +50,7 @@
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/phoron)
 
-/datum/supply_packs/atmos/canister_sleeping_agent
+/datum/supply_pack/atmos/canister_sleeping_agent
 	name = "N2O gas canister"
 	cost = 15
 	containername = "N2O gas canister crate"
@@ -58,7 +58,7 @@
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/sleeping_agent)
 
-/datum/supply_packs/atmos/canister_carbon_dioxide
+/datum/supply_pack/atmos/canister_carbon_dioxide
 	name = "Carbon dioxide gas canister"
 	cost = 15
 	containername = "CO2 canister crate"
@@ -66,7 +66,7 @@
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/carbon_dioxide)
 
-/datum/supply_packs/atmos/air_dispenser
+/datum/supply_pack/atmos/air_dispenser
 	contains = list(/obj/machinery/pipedispenser/orderable)
 	name = "Pipe Dispenser"
 	cost = 25
@@ -74,7 +74,7 @@
 	containername = "Pipe Dispenser Crate"
 	access = access_atmospherics
 
-/datum/supply_packs/atmos/disposals_dispenser
+/datum/supply_pack/atmos/disposals_dispenser
 	contains = list(/obj/machinery/pipedispenser/disposal/orderable)
 	name = "Disposals Pipe Dispenser"
 	cost = 25
@@ -82,7 +82,7 @@
 	containername = "Disposal Dispenser Crate"
 	access = access_atmospherics
 
-/datum/supply_packs/atmos/internals
+/datum/supply_pack/atmos/internals
 	name = "Internals crate"
 	contains = list(
 			/obj/item/clothing/mask/gas = 3,
@@ -92,7 +92,7 @@
 	containertype = /obj/structure/closet/crate/internals
 	containername = "Internals crate"
 
-/datum/supply_packs/atmos/evacuation
+/datum/supply_pack/atmos/evacuation
 	name = "Emergency equipment"
 	contains = list(
 			/obj/item/weapon/storage/toolbox/emergency = 2,

code/datums/supplypacks/contraband.dm

@@ -4,7 +4,7 @@
 */
 
 
-/datum/supply_packs/randomised/contraband
+/datum/supply_pack/randomised/contraband
 	num_contained = 5
 	contains = list(
 			/obj/item/seeds/bloodtomatoseed,
@@ -20,7 +20,7 @@
 	contraband = 1
 	group = "Supplies"
 
-/datum/supply_packs/security/specialops
+/datum/supply_pack/security/specialops
 	name = "Special Ops supplies"
 	contains = list(
 			/obj/item/weapon/storage/box/emps,
@@ -32,7 +32,7 @@
 	containername = "Special Ops crate"
 	contraband = 1
 
-/datum/supply_packs/supply/moghes
+/datum/supply_pack/supply/moghes
 	name = "Moghes imports"
 	contains = list(
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew = 2,
@@ -43,7 +43,7 @@
 	containername = "Moghes imports crate"
 	contraband = 1
 
-/datum/supply_packs/munitions/bolt_rifles_militia
+/datum/supply_pack/munitions/bolt_rifles_militia
  	name = "Weapon - Surplus militia rifles"
  	contains = list(
  			/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 3,
@@ -54,7 +54,7 @@
  	containertype = /obj/structure/closet/crate/secure/weapon
  	containername = "Ballistic weapons crate"
 
-/datum/supply_packs/randomised/misc/telecrate //you get something awesome, a couple of decent things, and a few weak/filler things
+/datum/supply_pack/randomised/misc/telecrate //you get something awesome, a couple of decent things, and a few weak/filler things
 	name = "ERR_NULL_ENTRY" //null crate! also dream maker is hell,
 	num_contained = 1
 	contains = list(

code/datums/supplypacks/costumes.dm

@@ -4,13 +4,13 @@
 */
 
 
-/datum/supply_packs/costumes
+/datum/supply_pack/costumes
 	group = "Costumes"
 
-/datum/supply_packs/randomised/costumes
+/datum/supply_pack/randomised/costumes
 	group = "Costumes"
 
-/datum/supply_packs/costumes/wizard
+/datum/supply_pack/costumes/wizard
 	name = "Wizard costume"
 	contains = list(
 			/obj/item/weapon/staff,
@@ -22,7 +22,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Wizard costume crate"
 
-/datum/supply_packs/randomised/costumes/hats
+/datum/supply_pack/randomised/costumes/hats
 	num_contained = 4
 	contains = list(
 			/obj/item/clothing/head/collectable/chef,
@@ -51,7 +51,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Collectable hats crate! Brought to you by Bass.inc!"
 
-/datum/supply_packs/randomised/costumes/costume
+/datum/supply_pack/randomised/costumes/costume
 	num_contained = 3
 	contains = list(
 			/obj/item/clothing/suit/pirate,
@@ -87,7 +87,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Actor Costumes"
 
-/datum/supply_packs/costumes/formal_wear
+/datum/supply_pack/costumes/formal_wear
 	contains = list(
 			/obj/item/clothing/head/bowler,
 			/obj/item/clothing/head/that,
@@ -109,7 +109,7 @@
 	containertype = /obj/structure/closet
 	containername = "Formalwear for the best occasions."
 
-datum/supply_packs/costumes/witch
+datum/supply_pack/costumes/witch
 	name = "Witch costume"
 	containername = "Witch costume"
 	containertype = /obj/structure/closet
@@ -121,7 +121,7 @@ datum/supply_packs/costumes/witch
 			/obj/item/weapon/staff/broom
 			)
 
-/datum/supply_packs/randomised/costumes/costume_hats
+/datum/supply_pack/randomised/costumes/costume_hats
 	name = "Costume hats"
 	containername = "Actor hats crate"
 	containertype = /obj/structure/closet/crate
@@ -146,7 +146,7 @@ datum/supply_packs/costumes/witch
 			/obj/item/clothing/head/ushanka
 			)
 
-/datum/supply_packs/randomised/costumes/dresses
+/datum/supply_pack/randomised/costumes/dresses
 	name = "Womens formal dress locker"
 	containername = "Pretty dress locker"
 	containertype = /obj/structure/closet

code/datums/supplypacks/engineering.dm

@@ -4,66 +4,66 @@
 */
 
 
-/datum/supply_packs/eng
+/datum/supply_pack/eng
 	group = "Engineering"
 
-/datum/supply_packs/eng/lightbulbs
+/datum/supply_pack/eng/lightbulbs
 	name = "Replacement lights"
 	contains = list(/obj/item/weapon/storage/box/lights/mixed = 3)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Replacement lights"
 
-/datum/supply_packs/eng/smescoil
+/datum/supply_pack/eng/smescoil
 	name = "Superconducting Magnetic Coil"
 	contains = list(/obj/item/weapon/smes_coil)
 	cost = 75
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "Superconducting Magnetic Coil crate"
 
-/datum/supply_packs/eng/shield_capacitor
+/datum/supply_pack/eng/shield_capacitor
 	name = "Shield Capacitor"
 	contains = list(/obj/machinery/shield_capacitor)
 	cost = 20
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "shield capacitor crate"
 
-/datum/supply_packs/eng/shield_capacitor/advanced
+/datum/supply_pack/eng/shield_capacitor/advanced
 	name = "Advanced Shield Capacitor"
 	contains = list(/obj/machinery/shield_capacitor/advanced)
 	cost = 30
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "advanced shield capacitor crate"
 
-/datum/supply_packs/eng/bubble_shield
+/datum/supply_pack/eng/bubble_shield
 	name = "Bubble Shield Generator"
 	contains = list(/obj/machinery/shield_gen)
 	cost = 40
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "shield bubble generator crate"
 
-/datum/supply_packs/eng/bubble_shield/advanced
+/datum/supply_pack/eng/bubble_shield/advanced
 	name = "Advanced Bubble Shield Generator"
 	contains = list(/obj/machinery/shield_gen/advanced)
 	cost = 60
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "advanced bubble shield generator crate"
 
-/datum/supply_packs/eng/hull_shield
+/datum/supply_pack/eng/hull_shield
 	name = "Hull Shield Generator"
 	contains = list(/obj/machinery/shield_gen/external)
 	cost = 80
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "shield hull generator crate"
 
-/datum/supply_packs/eng/hull_shield/advanced
+/datum/supply_pack/eng/hull_shield/advanced
 	name = "Advanced Hull Shield Generator"
 	contains = list(/obj/machinery/shield_gen/external/advanced)
 	cost = 120
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "advanced hull shield generator crate"
 
-/datum/supply_packs/eng/electrical
+/datum/supply_pack/eng/electrical
 	name = "Electrical maintenance crate"
 	contains = list(
 			/obj/item/weapon/storage/toolbox/electrical = 2,
@@ -75,7 +75,7 @@
 	containertype = /obj/structure/closet/crate/engineering/electrical
 	containername = "Electrical maintenance crate"
 
-/datum/supply_packs/eng/e_welders
+/datum/supply_pack/eng/e_welders
 	name = "Electric welder crate"
 	contains = list(
 			/obj/item/weapon/weldingtool/electric = 3
@@ -84,7 +84,7 @@
 	containertype = /obj/structure/closet/crate/engineering/electrical
 	containername = "Electric welder crate"
 
-/datum/supply_packs/eng/mechanical
+/datum/supply_pack/eng/mechanical
 	name = "Mechanical maintenance crate"
 	contains = list(
 			/obj/item/weapon/storage/belt/utility/full = 3,
@@ -96,14 +96,14 @@
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "Mechanical maintenance crate"
 
-/datum/supply_packs/eng/fueltank
+/datum/supply_pack/eng/fueltank
 	name = "Fuel tank crate"
 	contains = list(/obj/structure/reagent_dispensers/fueltank)
 	cost = 10
 	containertype = /obj/structure/largecrate
 	containername = "fuel tank crate"
 
-/datum/supply_packs/eng/solar
+/datum/supply_pack/eng/solar
 	name = "Solar Pack crate"
 	contains  = list(
 			/obj/item/solar_assembly = 21,
@@ -115,7 +115,7 @@
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "Solar pack crate"
 
-/datum/supply_packs/eng/engine
+/datum/supply_pack/eng/engine
 	name = "Emitter crate"
 	contains = list(/obj/machinery/power/emitter = 2)
 	cost = 10
@@ -123,27 +123,27 @@
 	containername = "Emitter crate"
 	access = access_ce
 
-/datum/supply_packs/eng/engine/field_gen
+/datum/supply_pack/eng/engine/field_gen
 	name = "Field Generator crate"
 	contains = list(/obj/machinery/field_generator = 2)
 	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Field Generator crate"
 	access = access_ce
 
-/datum/supply_packs/eng/engine/sing_gen
+/datum/supply_pack/eng/engine/sing_gen
 	name = "Singularity Generator crate"
 	contains = list(/obj/machinery/the_singularitygen)
 	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Singularity Generator crate"
 	access = access_ce
 
-/datum/supply_packs/eng/engine/collector
+/datum/supply_pack/eng/engine/collector
 	name = "Collector crate"
 	contains = list(/obj/machinery/power/rad_collector = 3)
 	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Collector crate"
 
-/datum/supply_packs/eng/engine/PA
+/datum/supply_pack/eng/engine/PA
 	name = "Particle Accelerator crate"
 	cost = 40
 	contains = list(
@@ -159,7 +159,7 @@
 	containername = "Particle Accelerator crate"
 	access = access_ce
 
-/datum/supply_packs/eng/shield_gen
+/datum/supply_pack/eng/shield_gen
 	contains = list(/obj/item/weapon/circuitboard/shield_gen)
 	name = "Bubble shield generator circuitry"
 	cost = 30
@@ -167,7 +167,7 @@
 	containername = "bubble shield generator circuitry crate"
 	access = access_ce
 
-/datum/supply_packs/eng/shield_gen_ex
+/datum/supply_pack/eng/shield_gen_ex
 	contains = list(/obj/item/weapon/circuitboard/shield_gen_ex)
 	name = "Hull shield generator circuitry"
 	cost = 30
@@ -175,7 +175,7 @@
 	containername = "hull shield generator circuitry crate"
 	access = access_ce
 
-/datum/supply_packs/eng/shield_cap
+/datum/supply_pack/eng/shield_cap
 	contains = list(/obj/item/weapon/circuitboard/shield_cap)
 	name = "Bubble shield capacitor circuitry"
 	cost = 30
@@ -183,7 +183,7 @@
 	containername = "shield capacitor circuitry crate"
 	access = access_ce
 
-/datum/supply_packs/eng/smbig
+/datum/supply_pack/eng/smbig
 	name = "Supermatter Core"
 	contains = list(/obj/machinery/power/supermatter)
 	cost = 150
@@ -191,7 +191,7 @@
 	containername = "Supermatter crate (CAUTION)"
 	access = access_ce
 
-/datum/supply_packs/eng/teg
+/datum/supply_pack/eng/teg
 	contains = list(/obj/machinery/power/generator)
 	name = "Mark I Thermoelectric Generator"
 	cost = 40
@@ -199,7 +199,7 @@
 	containername = "Mk1 TEG crate"
 	access = access_engine
 
-/datum/supply_packs/eng/circulator
+/datum/supply_pack/eng/circulator
 	contains = list(/obj/machinery/atmospherics/binary/circulator)
 	name = "Binary atmospheric circulator"
 	cost = 20
@@ -207,7 +207,7 @@
 	containername = "Atmospheric circulator crate"
 	access = access_engine
 
-/datum/supply_packs/eng/radsuit
+/datum/supply_pack/eng/radsuit
 	contains = list(
 			/obj/item/clothing/suit/radiation = 3,
 			/obj/item/clothing/head/radiation = 3
@@ -217,7 +217,7 @@
 	containertype = /obj/structure/closet/radiation
 	containername = "Radiation suit locker"
 
-/datum/supply_packs/eng/pacman_parts
+/datum/supply_pack/eng/pacman_parts
 	name = "P.A.C.M.A.N. portable generator parts"
 	cost = 25
 	containername = "P.A.C.M.A.N. Portable Generator Construction Kit"
@@ -230,7 +230,7 @@
 			/obj/item/weapon/circuitboard/pacman
 			)
 
-/datum/supply_packs/eng/super_pacman_parts
+/datum/supply_pack/eng/super_pacman_parts
 	name = "Super P.A.C.M.A.N. portable generator parts"
 	cost = 35
 	containername = "Super P.A.C.M.A.N. portable generator construction kit"
@@ -243,7 +243,7 @@
 			/obj/item/weapon/circuitboard/pacman/super
 			)
 
-/datum/supply_packs/eng/fusion_core
+/datum/supply_pack/eng/fusion_core
 	name = "R-UST Mk. 8 Tokamak fusion core crate"
 	cost = 50
 	containername = "R-UST Mk. 8 Tokamak Fusion Core crate"
@@ -255,7 +255,7 @@
 			/obj/item/weapon/circuitboard/fusion_core
 			)
 
-/datum/supply_packs/eng/fusion_fuel_injector
+/datum/supply_pack/eng/fusion_fuel_injector
 	name = "R-UST Mk. 8 fuel injector crate"
 	cost = 30
 	containername = "R-UST Mk. 8 fuel injector crate"
@@ -267,7 +267,7 @@
 			/obj/item/weapon/circuitboard/fusion_injector
 			)
 
-/datum/supply_packs/eng/gyrotron
+/datum/supply_pack/eng/gyrotron
 	name = "Gyrotron crate"
 	cost = 15
 	containername = "Gyrotron Crate"
@@ -278,14 +278,14 @@
 			/obj/item/weapon/circuitboard/gyrotron
 			)
 
-/datum/supply_packs/eng/fusion_fuel_compressor
+/datum/supply_pack/eng/fusion_fuel_compressor
 	name = "Fusion Fuel Compressor circuitry crate"
 	cost = 10
 	containername = "Fusion Fuel Compressor circuitry crate"
 	containertype = /obj/structure/closet/crate/engineering
 	contains = list(/obj/item/weapon/circuitboard/fusion_fuel_compressor)
 
-/datum/supply_packs/eng/tritium
+/datum/supply_pack/eng/tritium
 	name = "Tritium crate"
 	cost = 75
 	containername = "Tritium crate"

code/datums/supplypacks/hospitality.dm

@@ -4,10 +4,10 @@
 */
 
 
-/datum/supply_packs/hospitality
+/datum/supply_pack/hospitality
 	group = "Hospitality"
 
-/datum/supply_packs/hospitality/party
+/datum/supply_pack/hospitality/party
 	name = "Party equipment"
 	contains = list(
 			/obj/item/weapon/storage/box/mixedglasses = 2,
@@ -26,7 +26,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Party equipment"
 
-/datum/supply_packs/hospitality/barsupplies
+/datum/supply_pack/hospitality/barsupplies
 	name = "Bar supplies"
 	contains = list(
 			/obj/item/weapon/storage/box/glasses/cocktail,
@@ -46,10 +46,10 @@
 	containertype = /obj/structure/closet/crate
 	containername = "crate of bar supplies"
 
-/datum/supply_packs/randomised/hospitality/
+/datum/supply_pack/randomised/hospitality/
 	group = "Hospitality"
 
-/datum/supply_packs/randomised/hospitality/pizza
+/datum/supply_pack/randomised/hospitality/pizza
 	num_contained = 5
 	contains = list(
 			/obj/item/pizzabox/margherita,
@@ -62,7 +62,7 @@
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Pizza crate"
 
-/datum/supply_packs/hospitality/gifts
+/datum/supply_pack/hospitality/gifts
 	name = "Gift crate"
 	contains = list(
 		/obj/item/toy/bouquet = 3,

code/datums/supplypacks/hydroponics.dm

@@ -4,45 +4,45 @@
 */
 
 
-/datum/supply_packs/hydro
+/datum/supply_pack/hydro
 	group = "Hydroponics"
 
-/datum/supply_packs/hydro/monkey
+/datum/supply_pack/hydro/monkey
 	name = "Monkey crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes)
 	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Monkey crate"
 
-/datum/supply_packs/hydro/farwa
+/datum/supply_pack/hydro/farwa
 	name = "Farwa crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes/farwacubes)
 	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Farwa crate"
 
-/datum/supply_packs/hydro/neara
+/datum/supply_pack/hydro/neara
 	name = "Neaera crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes/neaeracubes)
 	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Neaera crate"
 
-/datum/supply_packs/hydro/stok
+/datum/supply_pack/hydro/stok
 	name = "Stok crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes/stokcubes)
 	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Stok crate"
 
-/datum/supply_packs/hydro/lisa
+/datum/supply_pack/hydro/lisa
 	name = "Corgi Crate"
 	contains = list()
 	cost = 50
 	containertype = /obj/structure/largecrate/animal/corgi
 	containername = "Corgi Crate"
 
-/datum/supply_packs/hydro/hydroponics
+/datum/supply_pack/hydro/hydroponics
 	name = "Hydroponics Supply Crate"
 	contains = list(
 			/obj/item/weapon/reagent_containers/spray/plantbgone = 4,
@@ -60,28 +60,28 @@
 	containername = "Hydroponics crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/cow
+/datum/supply_pack/hydro/cow
 	name = "Cow crate"
 	cost = 25
 	containertype = /obj/structure/largecrate/animal/cow
 	containername = "Cow crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/goat
+/datum/supply_pack/hydro/goat
 	name = "Goat crate"
 	cost = 25
 	containertype = /obj/structure/largecrate/animal/goat
 	containername = "Goat crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/chicken
+/datum/supply_pack/hydro/chicken
 	name = "Chicken crate"
 	cost = 25
 	containertype = /obj/structure/largecrate/animal/chick
 	containername = "Chicken crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/seeds
+/datum/supply_pack/hydro/seeds
 	name = "Seeds crate"
 	contains = list(
 			/obj/item/seeds/chiliseed,
@@ -107,7 +107,7 @@
 	containername = "Seeds crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/weedcontrol
+/datum/supply_pack/hydro/weedcontrol
 	name = "Weed control crate"
 	contains = list(
 			/obj/item/weapon/material/knife/machete/hatchet = 2,
@@ -121,14 +121,14 @@
 	containername = "Weed control crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/watertank
+/datum/supply_pack/hydro/watertank
 	name = "Water tank crate"
 	contains = list(/obj/structure/reagent_dispensers/watertank)
 	cost = 10
 	containertype = /obj/structure/largecrate
 	containername = "water tank crate"
 
-/datum/supply_packs/hydro/bee_keeper
+/datum/supply_pack/hydro/bee_keeper
 	name = "Beekeeping crate"
 	contains = list(
 			/obj/item/beehive_assembly,
@@ -141,7 +141,7 @@
 	containername = "Beekeeping crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/tray
+/datum/supply_pack/hydro/tray
 	name = "Empty hydroponics trays"
 	cost = 50
 	containertype = /obj/structure/closet/crate/hydroponics

code/datums/supplypacks/materials.dm

@@ -4,45 +4,45 @@
 */
 
 
-/datum/supply_packs/materials
+/datum/supply_pack/materials
 	group = "Materials"
 
-/datum/supply_packs/materials/metal50
+/datum/supply_pack/materials/metal50
 	name = "50 metal sheets"
 	contains = list(/obj/fiftyspawner/steel)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Metal sheets crate"
 
-/datum/supply_packs/materials/glass50
+/datum/supply_pack/materials/glass50
 	name = "50 glass sheets"
 	contains = list(/obj/fiftyspawner/glass)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Glass sheets crate"
 
-/datum/supply_packs/materials/wood50
+/datum/supply_pack/materials/wood50
 	name = "50 wooden planks"
 	contains = list(/obj/fiftyspawner/wood)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Wooden planks crate"
 
-/datum/supply_packs/materials/plastic50
+/datum/supply_pack/materials/plastic50
 	name = "50 plastic sheets"
 	contains = list(/obj/fiftyspawner/plastic)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Plastic sheets crate"
 
-/datum/supply_packs/materials/cardboard_sheets
+/datum/supply_pack/materials/cardboard_sheets
 	contains = list(/obj/fiftyspawner/cardboard)
 	name = "50 cardboard sheets"
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Cardboard sheets crate"
 
-/datum/supply_packs/materials/carpet
+/datum/supply_pack/materials/carpet
 	name = "Imported carpet"
 	containertype = /obj/structure/closet/crate
 	containername = "Imported carpet crate"
@@ -53,7 +53,7 @@
 					)
 
 
-/datum/supply_packs/misc/linoleum
+/datum/supply_pack/misc/linoleum
 	name = "Linoleum"
 	containertype = /obj/structure/closet/crate
 	containername = "Linoleum crate"

code/datums/supplypacks/medical.dm

@@ -4,10 +4,10 @@
 */
 
 
-/datum/supply_packs/med
+/datum/supply_pack/med
 	group = "Medical"
 
-/datum/supply_packs/med/medical
+/datum/supply_pack/med/medical
 	name = "Medical crate"
 	contains = list(
 			/obj/item/weapon/storage/firstaid/regular,
@@ -25,28 +25,28 @@
 	containertype = /obj/structure/closet/crate/medical
 	containername = "Medical crate"
 
-/datum/supply_packs/med/bloodpack
+/datum/supply_pack/med/bloodpack
 	name = "BloodPack crate"
 	contains = list(/obj/item/weapon/storage/box/bloodpacks = 3)
 	cost = 10
 	containertype = /obj/structure/closet/crate/medical
 	containername = "BloodPack crate"
 
-/datum/supply_packs/med/bodybag
+/datum/supply_pack/med/bodybag
 	name = "Body bag crate"
 	contains = list(/obj/item/weapon/storage/box/bodybags = 3)
 	cost = 10
 	containertype = /obj/structure/closet/crate/medical
 	containername = "Body bag crate"
 
-/datum/supply_packs/med/cryobag
+/datum/supply_pack/med/cryobag
 	name = "Stasis bag crate"
 	contains = list(/obj/item/bodybag/cryobag = 3)
 	cost = 40
 	containertype = /obj/structure/closet/crate/medical
 	containername = "Stasis bag crate"
 
-/datum/supply_packs/med/surgery
+/datum/supply_pack/med/surgery
 	name = "Surgery crate"
 	contains = list(
 			/obj/item/weapon/surgical/cautery,
@@ -66,7 +66,7 @@
 	containername = "Surgery crate"
 	access = access_medical
 
-/datum/supply_packs/med/deathalarm
+/datum/supply_pack/med/deathalarm
 	name = "Death Alarm crate"
 	contains = list(
 			/obj/item/weapon/storage/box/cdeathalarm_kit,
@@ -77,7 +77,7 @@
 	containername = "Death Alarm crate"
 	access = access_medical
 
-/datum/supply_packs/med/clotting
+/datum/supply_pack/med/clotting
 	name = "Clotting Medicine crate"
 	contains = list(
 			/obj/item/weapon/storage/firstaid/clotting
@@ -87,7 +87,7 @@
 	containername = "Clotting Medicine crate"
 	access = access_medical
 
-/datum/supply_packs/med/sterile
+/datum/supply_pack/med/sterile
 	name = "Sterile equipment crate"
 	contains = list(
 			/obj/item/clothing/under/rank/medical/scrubs/green = 2,
@@ -100,7 +100,7 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Sterile equipment crate"
 
-/datum/supply_packs/med/extragear
+/datum/supply_pack/med/extragear
 	name = "Medical surplus equipment"
 	contains = list(
 			/obj/item/weapon/storage/belt/medical = 3,
@@ -113,7 +113,7 @@
 	containername = "Medical surplus equipment"
 	access = access_medical
 
-/datum/supply_packs/med/cmogear
+/datum/supply_pack/med/cmogear
 	name = "Chief medical officer equipment"
 	contains = list(
 			/obj/item/weapon/storage/belt/medical,
@@ -137,7 +137,7 @@
 	containername = "Chief medical officer equipment"
 	access = access_cmo
 
-/datum/supply_packs/med/doctorgear
+/datum/supply_pack/med/doctorgear
 	name = "Medical Doctor equipment"
 	contains = list(
 			/obj/item/weapon/storage/belt/medical,
@@ -160,7 +160,7 @@
 	containername = "Medical Doctor equipment"
 	access = access_medical_equip
 
-/datum/supply_packs/med/chemistgear
+/datum/supply_pack/med/chemistgear
 	name = "Chemist equipment"
 	contains = list(
 			/obj/item/weapon/storage/box/beakers,
@@ -183,7 +183,7 @@
 	containername = "Chemist equipment"
 	access = access_chemistry
 
-/datum/supply_packs/med/paramedicgear
+/datum/supply_pack/med/paramedicgear
 	name = "Paramedic equipment"
 	contains = list(
 			/obj/item/weapon/storage/belt/medical/emt,
@@ -211,7 +211,7 @@
 	containername = "Paramedic equipment"
 	access = access_medical_equip
 
-/datum/supply_packs/med/psychiatristgear
+/datum/supply_pack/med/psychiatristgear
 	name = "Psychiatrist equipment"
 	contains = list(
 			/obj/item/clothing/under/rank/psych,
@@ -230,7 +230,7 @@
 	containername = "Psychiatrist equipment"
 	access = access_psychiatrist
 
-/datum/supply_packs/med/medicalscrubs
+/datum/supply_pack/med/medicalscrubs
 	name = "Medical scrubs"
 	contains = list(
 			/obj/item/clothing/shoes/white = 3,,
@@ -251,7 +251,7 @@
 	containername = "Medical scrubs crate"
 	access = access_medical_equip
 
-/datum/supply_packs/med/autopsy
+/datum/supply_pack/med/autopsy
 	name = "Autopsy equipment"
 	contains = list(
 			/obj/item/weapon/folder/white,
@@ -268,7 +268,7 @@
 	containername = "Autopsy equipment crate"
 	access = access_morgue
 
-/datum/supply_packs/med/medicaluniforms
+/datum/supply_pack/med/medicaluniforms
 	name = "Medical uniforms"
 	contains = list(
 			/obj/item/clothing/shoes/white = 3,
@@ -295,7 +295,7 @@
 	containername = "Medical uniform crate"
 	access = access_medical_equip
 
-/datum/supply_packs/med/medicalbiosuits
+/datum/supply_pack/med/medicalbiosuits
 	name = "Medical biohazard gear"
 	contains = list(
 			/obj/item/clothing/head/bio_hood = 3,
@@ -313,7 +313,7 @@
 	containername = "Medical biohazard equipment"
 	access = access_medical_equip
 
-/datum/supply_packs/med/portablefreezers
+/datum/supply_pack/med/portablefreezers
 	name = "Portable freezers crate"
 	contains = list(/obj/item/weapon/storage/box/freezer = 7)
 	cost = 25
@@ -321,7 +321,7 @@
 	containername = "Portable freezers"
 	access = access_medical_equip
 
-/datum/supply_packs/med/virus
+/datum/supply_pack/med/virus
 	name = "Virus sample crate"
 	contains = list(/obj/item/weapon/virusdish/random = 4)
 	cost = 25
@@ -329,7 +329,7 @@
 	containername = "Virus sample crate"
 	access = access_cmo
 
-/datum/supply_packs/med/defib
+/datum/supply_pack/med/defib
 	name = "Defibrillator crate"
 	contains = list(/obj/item/device/defib_kit = 2)
 	cost = 30

code/datums/supplypacks/misc.dm

@@ -4,14 +4,14 @@
 */
 
 
-/datum/supply_packs/misc
+/datum/supply_pack/misc
 	group = "Miscellaneous"
 
-/datum/supply_packs/randomised/misc
+/datum/supply_pack/randomised/misc
 	group = "Miscellaneous"
 
 
-/datum/supply_packs/randomised/misc/card_packs
+/datum/supply_pack/randomised/misc/card_packs
 	num_contained = 5
 	contains = list(
 			/obj/item/weapon/pack/cardemon,
@@ -23,14 +23,14 @@
 	containertype = /obj/structure/closet/crate
 	containername = "cards crate"
 
-/datum/supply_packs/misc/eftpos
+/datum/supply_pack/misc/eftpos
 	contains = list(/obj/item/device/eftpos)
 	name = "EFTPOS scanner"
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "EFTPOS crate"
 
-/datum/supply_packs/misc/chaplaingear
+/datum/supply_pack/misc/chaplaingear
 	name = "Chaplain equipment"
 	contains = list(
 			/obj/item/clothing/under/rank/chaplain,
@@ -48,14 +48,14 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Chaplain equipment crate"
 
-/datum/supply_packs/misc/hoverpod
+/datum/supply_pack/misc/hoverpod
 	name = "Hoverpod Shipment"
 	contains = list()
 	cost = 80
 	containertype = /obj/structure/largecrate/hoverpod
 	containername = "Hoverpod Crate"
 
-/datum/supply_packs/randomised/misc/webbing
+/datum/supply_pack/randomised/misc/webbing
 	name = "Webbing crate"
 	num_contained = 4
 	contains = list(
@@ -71,7 +71,7 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Webbing crate"
 
-/datum/supply_packs/misc/holoplant
+/datum/supply_pack/misc/holoplant
 	name = "Holoplant Pot"
 	contains = list(/obj/machinery/holoplant/shipped)
 	cost = 15

code/datums/supplypacks/munitions.dm

@@ -3,13 +3,13 @@
 *	related to weapons live.
 */
 
-/datum/supply_packs/munitions
+/datum/supply_pack/munitions
 	group = "Munitions"
 
-/datum/supply_packs/randomised/munitions
+/datum/supply_pack/randomised/munitions
 	group = "Munitions"
 
-/datum/supply_packs/munitions/weapons
+/datum/supply_pack/munitions/weapons
 	name = "Weapons - Security basic equipment"
 	contains = list(
 			/obj/item/device/flash = 2,
@@ -24,7 +24,7 @@
 	containername = "Security equipment crate"
 	access = access_security
 
-/datum/supply_packs/munitions/egunpistol
+/datum/supply_pack/munitions/egunpistol
 	name = "Weapons - Energy sidearms"
 	contains = list(/obj/item/weapon/gun/energy/gun = 2)
 	cost = 40
@@ -32,7 +32,7 @@
 	containername = "Energy sidearms crate"
 	access = access_security
 
-/datum/supply_packs/munitions/flareguns
+/datum/supply_pack/munitions/flareguns
 	name = "Weapons - Flare guns"
 	contains = list(
 			/obj/item/weapon/gun/projectile/sec/flash,
@@ -45,7 +45,7 @@
 	containername = "Flare gun crate"
 	access = access_security
 
-/datum/supply_packs/munitions/eweapons
+/datum/supply_pack/munitions/eweapons
 	name = "Weapons - Experimental weapons crate"
 	contains = list(
 			/obj/item/weapon/gun/energy/xray = 2,
@@ -55,7 +55,7 @@
 	containername = "Experimental weapons crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/energyweapons
+/datum/supply_pack/munitions/energyweapons
 	name = "Weapons - Laser rifle crate"
 	contains = list(/obj/item/weapon/gun/energy/laser = 3)
 	cost = 50
@@ -63,7 +63,7 @@
 	containername = "Energy weapons crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/shotgun
+/datum/supply_pack/munitions/shotgun
 	name = "Weapons - Shotgun crate"
 	contains = list(
 			/obj/item/weapon/storage/box/shotgunammo,
@@ -75,7 +75,7 @@
 	containername = "Shotgun crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/erifle
+/datum/supply_pack/munitions/erifle
 	name = "Weapons - Energy marksman"
 	contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2)
 	cost = 100
@@ -83,7 +83,7 @@
 	containername = "Energy marksman crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/burstlaser
+/datum/supply_pack/munitions/burstlaser
 	name = "Weapons - Burst laser"
 	contains = list(/obj/item/weapon/gun/energy/gun/burst = 2)
 	cost = 50
@@ -91,7 +91,7 @@
 	containername = "Burst laser crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/ionweapons
+/datum/supply_pack/munitions/ionweapons
 	name = "Weapons - Electromagnetic Rifles"
 	contains = list(
 			/obj/item/weapon/gun/energy/ionrifle = 2,
@@ -102,7 +102,7 @@
 	containername = "Electromagnetic weapons crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/ionpistols
+/datum/supply_pack/munitions/ionpistols
 	name = "Weapons - Electromagnetic pistols"
 	contains = list(
 			/obj/item/weapon/gun/energy/ionrifle/pistol = 2,
@@ -113,7 +113,7 @@
 	containername = "Electromagnetic weapons crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/bsmg
+/datum/supply_pack/munitions/bsmg
 	name = "Weapons - Ballistic SMGs"
 	contains = list(/obj/item/weapon/gun/projectile/automatic/wt550 = 2)
 	cost = 50
@@ -121,7 +121,7 @@
 	containername = "Ballistic weapon crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/brifle
+/datum/supply_pack/munitions/brifle
 	name = "Weapons - Ballistic Rifles"
 	contains = list(/obj/item/weapon/gun/projectile/automatic/z8 = 2)
 	cost = 80
@@ -129,7 +129,7 @@
 	containername = "Ballistic weapon crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/bolt_rifles_competitive
+/datum/supply_pack/munitions/bolt_rifles_competitive
  	name = "Weapons - Competitive shooting rifles"
  	contains = list(
  			/obj/item/device/assembly/timer,
@@ -144,7 +144,7 @@
  	containername = "Ballistic weapons crate"
  	access = access_security
 
-/datum/supply_packs/munitions/shotgunammo
+/datum/supply_pack/munitions/shotgunammo
 	name = "Ammunition - Shotgun shells"
 	contains = list(
 			/obj/item/weapon/storage/box/shotgunammo = 2,
@@ -155,7 +155,7 @@
 	containername = "Ballistic ammunition crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/beanbagammo
+/datum/supply_pack/munitions/beanbagammo
 	name = "Ammunition - Beanbag shells"
 	contains = list(/obj/item/weapon/storage/box/beanbags = 3)
 	cost = 25
@@ -163,7 +163,7 @@
 	containername = "Ballistic ammunition crate"
 	access = null
 
-/datum/supply_packs/munitions/bsmgammo
+/datum/supply_pack/munitions/bsmgammo
 	name = "Ammunition - 9mm top mounted lethal"
 	contains = list(/obj/item/ammo_magazine/m9mmt = 6)
 	cost = 25
@@ -171,7 +171,7 @@
 	containername = "Ballistic ammunition crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/bsmgammorubber
+/datum/supply_pack/munitions/bsmgammorubber
 	name = "Ammunition - 9mm top mounted rubber"
 	contains = list(/obj/item/ammo_magazine/m9mmt/rubber = 6)
 	cost = 25
@@ -179,7 +179,7 @@
 	containername = "Ballistic ammunition crate"
 	access = access_security
 
-/datum/supply_packs/munitions/brifleammo
+/datum/supply_pack/munitions/brifleammo
 	name = "Ammunition - 7.62mm lethal"
 	contains = list(/obj/item/ammo_magazine/m762 = 6)
 	cost = 25
@@ -187,7 +187,7 @@
 	containername = "Ballistic ammunition crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/pcellammo
+/datum/supply_pack/munitions/pcellammo
 	name = "Ammunition - Power cell"
 	contains = list(/obj/item/weapon/cell/device/weapon = 3)
 	cost = 50

code/datums/supplypacks/recreation.dm

@@ -4,14 +4,14 @@
 */
 
 
-/datum/supply_packs/recreation
+/datum/supply_pack/recreation
 	group = "Recreation"
 
-/datum/supply_packs/randomised/recreation
+/datum/supply_pack/randomised/recreation
 	group = "Recreation"
 	access = access_security
 
-/datum/supply_packs/recreation/foam_weapons
+/datum/supply_pack/recreation/foam_weapons
 	name = "Foam Weapon Crate"
 	contains = list(
 			/obj/item/weapon/material/sword/foam = 2,
@@ -23,7 +23,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "foam weapon crate"
 
-/datum/supply_packs/recreation/lasertag
+/datum/supply_pack/recreation/lasertag
 	name = "Lasertag equipment"
 	contains = list(
 			/obj/item/weapon/gun/energy/lasertag/red,
@@ -35,7 +35,7 @@
 	containername = "Lasertag Closet"
 	cost = 10
 
-/datum/supply_packs/recreation/artscrafts
+/datum/supply_pack/recreation/artscrafts
 	name = "Arts and Crafts supplies"
 	contains = list(
 			/obj/item/weapon/storage/fancy/crayons,
@@ -58,7 +58,7 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Arts and Crafts crate"
 
-/datum/supply_packs/recreation/painters
+/datum/supply_pack/recreation/painters
 	name = "Station Painting Supplies"
 	cost = 10
 	containername = "station painting supplies crate"

code/datums/supplypacks/robotics.dm

@@ -4,14 +4,14 @@
 */
 
 
-/datum/supply_packs/robotics
+/datum/supply_pack/robotics
 	group = "Robotics"
 
-/datum/supply_packs/randomised/robotics
+/datum/supply_pack/randomised/robotics
 	group = "Robotics"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robotics_assembly
+/datum/supply_pack/robotics/robotics_assembly
 	name = "Robotics assembly crate"
 	contains = list(
 			/obj/item/device/assembly/prox_sensor = 3,
@@ -24,7 +24,7 @@
 	containername = "Robotics assembly"
 	access = access_robotics
 
-/*/datum/supply_packs/robotics/robolimbs_basic
+/*/datum/supply_pack/robotics/robolimbs_basic
 	name = "Basic robolimb blueprints"
 	contains = list(
 			/obj/item/weapon/disk/limb/morpheus,
@@ -35,7 +35,7 @@
 	containername = "Robolimb blueprints (basic)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs_adv
+/datum/supply_pack/robotics/robolimbs_adv
 	name = "All robolimb blueprints"
 	contains = list(
 	/obj/item/weapon/disk/limb/bishop,
@@ -52,7 +52,7 @@
 	access = access_robotics
 */
 
-/datum/supply_packs/robotics/robolimbs/morpheus
+/datum/supply_pack/robotics/robolimbs/morpheus
 	name = "Morpheus robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/morpheus)
 	cost = 20
@@ -60,7 +60,7 @@
 	containername = "Robolimb blueprints (Morpheus)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/cybersolutions
+/datum/supply_pack/robotics/robolimbs/cybersolutions
 	name = "Cyber Solutions robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/cybersolutions)
 	cost = 20
@@ -68,7 +68,7 @@
 	containername = "Robolimb blueprints (Cyber Solutions)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/xion
+/datum/supply_pack/robotics/robolimbs/xion
 	name = "Xion robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/xion)
 	cost = 20
@@ -76,7 +76,7 @@
 	containername = "Robolimb blueprints (Xion)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/grayson
+/datum/supply_pack/robotics/robolimbs/grayson
 	name = "Grayson robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/grayson)
 	cost = 30
@@ -84,7 +84,7 @@
 	containername = "Robolimb blueprints (Grayson)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/hephaestus
+/datum/supply_pack/robotics/robolimbs/hephaestus
 	name = "Hephaestus robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/hephaestus)
 	cost = 35
@@ -92,7 +92,7 @@
 	containername = "Robolimb blueprints (Hephaestus)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/wardtakahashi
+/datum/supply_pack/robotics/robolimbs/wardtakahashi
 	name = "Ward-Takahashi robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/wardtakahashi)
 	cost = 35
@@ -100,7 +100,7 @@
 	containername = "Robolimb blueprints (Ward-Takahashi)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/zenghu
+/datum/supply_pack/robotics/robolimbs/zenghu
 	name = "Zeng Hu robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/zenghu)
 	cost = 35
@@ -108,7 +108,7 @@
 	containername = "Robolimb blueprints (Zeng Hu)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/bishop
+/datum/supply_pack/robotics/robolimbs/bishop
 	name = "Bishop robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/bishop)
 	cost = 70
@@ -116,7 +116,7 @@
 	containername = "Robolimb blueprints (Bishop)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/mecha_ripley
+/datum/supply_pack/robotics/mecha_ripley
 	name = "Circuit Crate (\"Ripley\" APLU)"
 	contains = list(
 			/obj/item/weapon/book/manual/ripley_build_and_repair,
@@ -128,7 +128,7 @@
 	containername = "APLU \"Ripley\" Circuit Crate"
 	access = access_robotics
 
-/datum/supply_packs/robotics/mecha_odysseus
+/datum/supply_pack/robotics/mecha_odysseus
 	name = "Circuit Crate (\"Odysseus\")"
 	contains = list(
 			/obj/item/weapon/circuitboard/mecha/odysseus/peripherals,
@@ -139,7 +139,7 @@
 	containername = "\"Odysseus\" Circuit Crate"
 	access = access_robotics
 
-/datum/supply_packs/randomised/robotics/exosuit_mod
+/datum/supply_pack/randomised/robotics/exosuit_mod
 	num_contained = 1
 	contains = list(
 			/obj/item/device/kit/paint/ripley,
@@ -152,7 +152,7 @@
 	containertype = /obj/structure/closet/crate/science
 	containername = "heavy crate"
 
-/datum/supply_packs/randomised/robotics/exosuit_mod/durand
+/datum/supply_pack/randomised/robotics/exosuit_mod/durand
 	contains = list(
 			/obj/item/device/kit/paint/durand,
 			/obj/item/device/kit/paint/durand/seraph,
@@ -160,7 +160,7 @@
 			)
 	name = "Random Durand exosuit modkit"
 
-/datum/supply_packs/randomised/robotics/exosuit_mod/gygax
+/datum/supply_pack/randomised/robotics/exosuit_mod/gygax
 	contains = list(
 			/obj/item/device/kit/paint/gygax,
 			/obj/item/device/kit/paint/gygax/darkgygax,
@@ -168,7 +168,7 @@
 			)
 	name = "Random Gygax exosuit modkit"
 
-/datum/supply_packs/robotics/jumper_cables
+/datum/supply_pack/robotics/jumper_cables
 	name = "Jumper kit crate"
 	contains = list(
 			/obj/item/device/defib_kit/jumper_kit = 2

code/datums/supplypacks/science.dm

@@ -2,17 +2,17 @@
 *	Here is where any supply packs
 *	related to security tasks live
 */
-/datum/supply_packs/sci
+/datum/supply_pack/sci
 	group = "Science"
 
-/datum/supply_packs/sci/coolanttank
+/datum/supply_pack/sci/coolanttank
 	name = "Coolant tank crate"
 	contains = list(/obj/structure/reagent_dispensers/coolanttank)
 	cost = 15
 	containertype = /obj/structure/largecrate
 	containername = "coolant tank crate"
 
-/datum/supply_packs/sci/phoron
+/datum/supply_pack/sci/phoron
 	name = "Phoron research crate"
 	contains = list(
 			/obj/item/weapon/tank/phoron = 3,
@@ -28,7 +28,7 @@
 	containername = "Phoron assembly crate"
 	access = access_tox_storage
 
-/datum/supply_packs/sci/exoticseeds
+/datum/supply_pack/sci/exoticseeds
 	name = "Exotic seeds crate"
 	contains = list(
 			/obj/item/seeds/replicapod = 2,
@@ -43,14 +43,14 @@
 	containername = "Exotic Seeds crate"
 	access = access_hydroponics
 
-/datum/supply_packs/sci/integrated_circuit_printer
+/datum/supply_pack/sci/integrated_circuit_printer
 	name = "Integrated circuit printer"
 	contains = list(/obj/item/device/integrated_circuit_printer = 2)
 	cost = 15
 	containertype = /obj/structure/closet/crate
 	containername = "Integrated circuit crate"
 
-/datum/supply_packs/sci/integrated_circuit_printer_upgrade
+/datum/supply_pack/sci/integrated_circuit_printer_upgrade
 	name = "Integrated circuit printer upgrade - advanced designs"
 	contains = list(/obj/item/weapon/disk/integrated_circuit/upgrade/advanced)
 	cost = 30

code/datums/supplypacks/security.dm

@@ -4,15 +4,15 @@
 */
 
 
-/datum/supply_packs/security
+/datum/supply_pack/security
 	group = "Security"
 	access = access_security
 
-/datum/supply_packs/randomised/security
+/datum/supply_pack/randomised/security
 	group = "Security"
 	access = access_security
 
-/datum/supply_packs/randomised/security/armor
+/datum/supply_pack/randomised/security/armor
 	name = "Armor - Security armor"
 	num_contained = 5
 	contains = list(
@@ -32,7 +32,7 @@
 	containertype = /obj/structure/closet/crate/secure/gear
 	containername = "Armor crate"
 
-/datum/supply_packs/security/riot_gear
+/datum/supply_pack/security/riot_gear
 	name = "Gear - Riot"
 	contains = list(
 			/obj/item/weapon/melee/baton = 3,
@@ -47,7 +47,7 @@
 	containername = "Riot gear crate"
 	access = access_armory
 
-/datum/supply_packs/security/riot_armor
+/datum/supply_pack/security/riot_armor
 	name = "Armor - Riot"
 	contains = list(
 			/obj/item/clothing/head/helmet/riot,
@@ -60,7 +60,7 @@
 	containername = "Riot armor crate"
 	access = access_armory
 
-/datum/supply_packs/security/ablative_armor
+/datum/supply_pack/security/ablative_armor
 	name = "Armor - Ablative"
 	contains = list(
 			/obj/item/clothing/head/helmet/laserproof,
@@ -73,7 +73,7 @@
 	containername = "Ablative armor crate"
 	access = access_armory
 
-/datum/supply_packs/security/bullet_resistant_armor
+/datum/supply_pack/security/bullet_resistant_armor
 	name = "Armor - Ballistic"
 	contains = list(
 			/obj/item/clothing/head/helmet/bulletproof,
@@ -86,7 +86,7 @@
 	containername = "Ballistic armor crate"
 	access = access_armory
 
-/datum/supply_packs/security/combat_armor
+/datum/supply_pack/security/combat_armor
 	name = "Armor - Combat"
 	contains = list(
 			/obj/item/clothing/head/helmet/combat,
@@ -99,7 +99,7 @@
 	containername = "Combat armor crate"
 	access = access_armory
 
-/datum/supply_packs/security/tactical
+/datum/supply_pack/security/tactical
 	name = "Armor - Tactical"
 	containertype = /obj/structure/closet/crate/secure/gear
 	containername = "Tactical armor crate"
@@ -124,7 +124,7 @@
 			/obj/item/clothing/gloves/black
 			)
 
-/datum/supply_packs/security/securitybarriers
+/datum/supply_pack/security/securitybarriers
 	name = "Misc - Security Barriers"
 	contains = list(/obj/machinery/deployable/barrier = 4)
 	cost = 20
@@ -132,7 +132,7 @@
 	containername = "Security barrier crate"
 	access = null
 
-/datum/supply_packs/security/securityshieldgen
+/datum/supply_pack/security/securityshieldgen
 	name = "Misc - Wall shield generators"
 	contains = list(/obj/machinery/shieldwallgen = 4)
 	cost = 20
@@ -140,7 +140,7 @@
 	containername = "Wall shield generators crate"
 	access = access_teleporter
 
-/datum/supply_packs/randomised/security/holster
+/datum/supply_pack/randomised/security/holster
 	name = "Gear - Holsters"
 	num_contained = 4
 	contains = list(
@@ -153,7 +153,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Holster crate"
 
-/datum/supply_packs/security/extragear
+/datum/supply_pack/security/extragear
 	name = "Gear - Security surplus equipment"
 	contains = list(
 			/obj/item/weapon/storage/belt/security = 3,
@@ -165,7 +165,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Security surplus equipment"
 
-/datum/supply_packs/security/detectivegear
+/datum/supply_pack/security/detectivegear
 	name = "Forensic - Investigation equipment"
 	contains = list(
 			/obj/item/weapon/storage/box/evidence = 2,
@@ -192,7 +192,7 @@
 	containername = "Forensic equipment"
 	access = access_forensics_lockers
 
-/datum/supply_packs/security/detectiveclothes
+/datum/supply_pack/security/detectiveclothes
 	name = "Forensic - Investigation apparel"
 	contains = list(
 			/obj/item/clothing/under/det/black = 2,
@@ -214,7 +214,7 @@
 	containername = "Investigation clothing"
 	access = access_forensics_lockers
 
-/datum/supply_packs/security/officergear
+/datum/supply_pack/security/officergear
 	name = "Gear - Officer equipment"
 	contains = list(
 			/obj/item/clothing/suit/storage/vest/officer,
@@ -244,7 +244,7 @@
 	containername = "Officer equipment"
 	access = access_brig
 
-/datum/supply_packs/security/wardengear
+/datum/supply_pack/security/wardengear
 	name = "Gear - Warden equipment"
 	contains = list(
 			/obj/item/clothing/suit/storage/vest/warden,
@@ -272,7 +272,7 @@
 	containername = "Warden equipment"
 	access = access_armory
 
-/datum/supply_packs/security/headofsecgear
+/datum/supply_pack/security/headofsecgear
 	name = "Gear - Head of security equipment"
 	contains = list(
 			/obj/item/clothing/head/helmet/HoS,
@@ -298,7 +298,7 @@
 	containername = "Head of security equipment"
 	access = access_hos
 
-/datum/supply_packs/security/securityclothing
+/datum/supply_pack/security/securityclothing
 	name = "Misc - Security uniform red"
 	contains = list(
 			/obj/item/weapon/storage/backpack/satchel/sec = 2,
@@ -316,7 +316,7 @@
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Security uniform crate"
 
-/datum/supply_packs/security/navybluesecurityclothing
+/datum/supply_pack/security/navybluesecurityclothing
 	name = "Misc - Security uniform navy blue"
 	contains = list(
 			/obj/item/weapon/storage/backpack/satchel/sec = 2,
@@ -337,7 +337,7 @@
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Navy blue security uniform crate"
 
-/datum/supply_packs/security/corporatesecurityclothing
+/datum/supply_pack/security/corporatesecurityclothing
 	name = "Misc - Security uniform corporate"
 	contains = list(
 			/obj/item/weapon/storage/backpack/satchel/sec = 2,
@@ -357,7 +357,7 @@
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Corporate security uniform crate"
 
-/datum/supply_packs/security/biosuit
+/datum/supply_pack/security/biosuit
 	name = "Gear - Security biohazard gear"
 	contains = list(
 			/obj/item/clothing/head/bio_hood/security = 3,

code/datums/supplypacks/supply.dm

@@ -3,10 +3,10 @@
 *	related to civilian tasks live
 */
 
-/datum/supply_packs/supply
+/datum/supply_pack/supply
 	group = "Supplies"
 
-/datum/supply_packs/supply/food
+/datum/supply_pack/supply/food
 	name = "Kitchen supply crate"
 	contains = list(
 			/obj/item/weapon/reagent_containers/food/condiment/flour = 6,
@@ -20,14 +20,14 @@
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Food crate"
 
-/datum/supply_packs/supply/toner
+/datum/supply_pack/supply/toner
 	name = "Toner cartridges"
 	contains = list(/obj/item/device/toner = 6)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Toner cartridges"
 
-/datum/supply_packs/supply/janitor
+/datum/supply_pack/supply/janitor
 	name = "Janitorial supplies"
 	contains = list(
 			/obj/item/weapon/reagent_containers/glass/bucket,
@@ -50,7 +50,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Janitorial supplies"
 
-/datum/supply_packs/supply/shipping
+/datum/supply_pack/supply/shipping
 	name = "Shipping supplies"
 	contains = list(
 				/obj/fiftyspawner/cardboard,
@@ -64,7 +64,7 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Shipping supplies crate"
 
-/datum/supply_packs/supply/bureaucracy
+/datum/supply_pack/supply/bureaucracy
 	contains = list(
 			/obj/item/weapon/clipboard = 2,
 			/obj/item/weapon/pen/red,
@@ -84,14 +84,14 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Office supplies crate"
 
-/datum/supply_packs/supply/spare_pda
+/datum/supply_pack/supply/spare_pda
 	name = "Spare PDAs"
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Spare PDA crate"
 	contains = list(/obj/item/device/pda = 3)
 
-/datum/supply_packs/supply/minergear
+/datum/supply_pack/supply/minergear
 	name = "Shaft miner equipment"
 	contains = list(
 			/obj/item/weapon/storage/backpack/industrial,
@@ -115,21 +115,21 @@
 	containername = "Shaft miner equipment"
 	access = access_mining
 
-/datum/supply_packs/supply/mule
+/datum/supply_pack/supply/mule
 	name = "Mulebot Crate"
 	contains = list()
 	cost = 20
 	containertype = /obj/structure/largecrate/animal/mulebot
 	containername = "Mulebot Crate"
 
-/datum/supply_packs/supply/cargotrain
+/datum/supply_pack/supply/cargotrain
 	name = "Cargo Train Tug"
 	contains = list(/obj/vehicle/train/cargo/engine)
 	cost = 35
 	containertype = /obj/structure/largecrate
 	containername = "Cargo Train Tug Crate"
 
-/datum/supply_packs/supply/cargotrailer
+/datum/supply_pack/supply/cargotrailer
 	name = "Cargo Train Trolley"
 	contains = list(/obj/vehicle/train/cargo/trolley)
 	cost = 15

code/datums/supplypacks/supplypacks.dm

@@ -4,6 +4,7 @@
 //ANOTER NOTE: Contraband is obtainable through modified supplycomp circuitboards.
 //BIG NOTE: Don't add living things to crates, that's bad, it will break the shuttle.
 //NEW NOTE: Do NOT set the price of any crates below 7 points. Doing so allows infinite points.
+//NOTE NOTE: Hidden var is now deprecated, whoever removed support for it should've removed the var altogether
 
 //var/list/all_supply_groups = list("Operations","Security","Hospitality","Engineering","Atmospherics","Medical","Reagents","Reagent Cartridges","Science","Hydroponics", "Supply", "Miscellaneous")
 var/list/all_supply_groups = list("Atmospherics",
@@ -24,30 +25,35 @@ var/list/all_supply_groups = list("Atmospherics",
 								  "Supplies",
 								  "Voidsuits")
 
-/datum/supply_packs
+/datum/supply_pack
 	var/name = null
-	var/list/contains = list()
+	var/list/contains = list() // Typepaths, used to actually spawn the contents
-	var/manifest = ""
+	var/list/manifest = list() // Object names, used to compile manifests
 	var/cost = null
 	var/containertype = null
 	var/containername = null
 	var/access = null
-	var/hidden = 0
 	var/contraband = 0
+	var/num_contained = 0		//number of items picked to be contained in a /randomised crate
 	var/group = "Miscellaneous"
 
-/datum/supply_packs/New()
+/datum/supply_pack/New()
-	manifest += "<ul>"
 	for(var/path in contains)
 		if(!path || !ispath(path, /atom))
 			continue
 		var/atom/O = path
-		manifest += "<li>[initial(O.name)]</li>"
+		manifest += "\proper[initial(O.name)]"
-	manifest += "</ul>"
 
-/datum/supply_packs/randomised
+/datum/supply_pack/proc/get_html_manifest()
-	var/num_contained		//number of items picked to be contained in a randomised crate
+	var/dat = ""
+	if(num_contained)
+		dat +="Contains any [num_contained] of:"
+	dat += "<ul>"
+	for(var/O in manifest)
+		dat += "<li>[O]</li>"
+	dat += "</ul>"
+	return dat
 
-/datum/supply_packs/randomised/New()
+// Keeping this subtype here for posterity, so it's more apparent that this is the subtype to use if making new randomised packs
-	manifest += "Contains any [num_contained] of:"
+/datum/supply_pack/randomised
-	..()
+	num_contained = 1

code/datums/supplypacks/voidsuits.dm

@@ -4,10 +4,10 @@
 */
 
 
-/datum/supply_packs/voidsuits
+/datum/supply_pack/voidsuits
 	group = "Voidsuits"
 
-/datum/supply_packs/voidsuits/atmos
+/datum/supply_pack/voidsuits/atmos
 	name = "Atmospheric voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/atmos = 2,
@@ -21,7 +21,7 @@
 	containername = "Atmospheric voidsuit crate"
 	access = access_atmospherics
 
-/datum/supply_packs/voidsuits/atmos/alt
+/datum/supply_pack/voidsuits/atmos/alt
 	name = "Heavy Duty Atmospheric voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/atmos/alt = 2,
@@ -35,7 +35,7 @@
 	containername = "Heavy Duty Atmospheric voidsuit crate"
 	access = access_atmospherics
 
-/datum/supply_packs/voidsuits/engineering
+/datum/supply_pack/voidsuits/engineering
 	name = "Engineering voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/engineering = 2,
@@ -49,7 +49,7 @@
 	containername = "Engineering voidsuit crate"
 	access = access_engine_equip
 
-/datum/supply_packs/voidsuits/engineering/construction
+/datum/supply_pack/voidsuits/engineering/construction
 	name = "Engineering Construction voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/engineering/construction = 2,
@@ -63,7 +63,7 @@
 	containername = "Engineering Construction voidsuit crate"
 	access = access_engine_equip
 
-/datum/supply_packs/voidsuits/engineering/hazmat
+/datum/supply_pack/voidsuits/engineering/hazmat
 	name = "Engineering Hazmat voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/engineering/hazmat = 2,
@@ -77,7 +77,7 @@
 	containername = "Engineering Hazmat voidsuit crate"
 	access = access_engine_equip
 
-/datum/supply_packs/voidsuits/engineering/alt
+/datum/supply_pack/voidsuits/engineering/alt
 	name = "Reinforced Engineering voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/engineering/alt = 2,
@@ -91,7 +91,7 @@
 	containername = "Reinforced Engineering voidsuit crate"
 	access = access_engine_equip
 
-/datum/supply_packs/voidsuits/medical
+/datum/supply_pack/voidsuits/medical
 	name = "Medical voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/medical = 2,
@@ -105,7 +105,7 @@
 	containername = "Medical voidsuit crate"
 	access = access_medical_equip
 
-/datum/supply_packs/voidsuits/medical/emt
+/datum/supply_pack/voidsuits/medical/emt
 	name = "Medical EMT voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/medical/emt = 2,
@@ -119,7 +119,7 @@
 	containername = "Medical EMT voidsuit crate"
 	access = access_medical_equip
 
-/datum/supply_packs/voidsuits/medical/bio
+/datum/supply_pack/voidsuits/medical/bio
 	name = "Medical Biohazard voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/medical/bio = 2,
@@ -133,7 +133,7 @@
 	containername = "Medical Biohazard voidsuit crate"
 	access = access_medical_equip
 
-/datum/supply_packs/voidsuits/medical/alt
+/datum/supply_pack/voidsuits/medical/alt
 	name = "Vey-Med Medical voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/medical/alt = 2,
@@ -147,7 +147,7 @@
 	containername = "Vey-Med Medical voidsuit crate"
 	access = access_medical_equip
 
-/datum/supply_packs/voidsuits/security
+/datum/supply_pack/voidsuits/security
 	name = "Security voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/security = 2,
@@ -160,7 +160,7 @@
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Security voidsuit crate"
 
-/datum/supply_packs/voidsuits/security/crowd
+/datum/supply_pack/voidsuits/security/crowd
 	name = "Security Crowd Control voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/security/riot = 2,
@@ -174,7 +174,7 @@
 	containername = "Security Crowd Control voidsuit crate"
 	access = access_armory
 
-/datum/supply_packs/voidsuits/security/alt
+/datum/supply_pack/voidsuits/security/alt
 	name = "Security EVA Riot voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/security/alt = 2,
@@ -188,7 +188,7 @@
 	containername = "Security EVA Riot voidsuit crate"
 	access = access_armory
 
-/datum/supply_packs/voidsuits/supply
+/datum/supply_pack/voidsuits/supply
 	name = "Mining voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/mining = 2,
@@ -201,7 +201,7 @@
 	containername = "Mining voidsuit crate"
 	access = access_mining
 
-/datum/supply_packs/voidsuits/supply/alt
+/datum/supply_pack/voidsuits/supply/alt
 	name = "Frontier Mining voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/mining/alt = 2,

code/game/machinery/computer/supply.dm

@@ -1,226 +1,202 @@
+// While it initially feels like the ordering console should be a subtype of the main console,
+// their function is similar enough that the ordering console emerges as the less specialized,
+// and therefore more deserving of parent-class status -- Ater
+
+// Supply requests console
 /obj/machinery/computer/supplycomp
+	name = "supply ordering console"
+	icon_screen = "request"
+	circuit = /obj/item/weapon/circuitboard/supplycomp
+	var/authorization = 0
+	var/temp = null
+	var/reqtime = 0 //Cooldown for requisitions - Quarxink
+	var/can_order_contraband = 0
+	var/last_viewed_group = "categories"
+	var/menu_tab = 0
+	var/list/expanded_packs = list()
+
+// Supply control console
+/obj/machinery/computer/supplycomp/control
 	name = "supply control console"
 	icon_keyboard = "tech_key"
 	icon_screen = "supply"
 	light_color = "#b88b2e"
 	req_access = list(access_cargo)
 	circuit = /obj/item/weapon/circuitboard/supplycomp
-	var/temp = null
+	authorization = SUP_SEND_SHUTTLE | SUP_ACCEPT_ORDERS
-	var/reqtime = 0 //Cooldown for requisitions - Quarxink
-	var/can_order_contraband = 0
-	var/last_viewed_group = "categories"
-
-/obj/machinery/computer/ordercomp
-	name = "supply ordering console"
-	icon_screen = "request"
-	circuit = /obj/item/weapon/circuitboard/ordercomp
-	var/temp = null
-	var/reqtime = 0 //Cooldown for requisitions - Quarxink
-	var/last_viewed_group = "categories"
-
-/obj/machinery/computer/ordercomp/attack_ai(var/mob/user as mob)
-	return attack_hand(user)
 
 /obj/machinery/computer/supplycomp/attack_ai(var/mob/user as mob)
 	return attack_hand(user)
 
-/obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob)
-	if(..())
-		return
-	user.set_machine(src)
-	var/dat
-	if(temp)
-		dat = temp
-	else
-		var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
-		if (shuttle)
-			dat += {"<BR><B>Supply shuttle</B><HR>
-			Location: [shuttle.has_arrive_time() ? "Moving to station ([shuttle.eta_minutes()] Mins.)":shuttle.at_station() ? "Docked":"Away"]<BR>
-			<HR>Supply points: [supply_controller.points]<BR>
-		<BR>\n<A href='?src=\ref[src];order=categories'>Request items</A><BR><BR>
-		<A href='?src=\ref[src];vieworders=1'>View approved orders</A><BR><BR>
-		<A href='?src=\ref[src];viewrequests=1'>View requests</A><BR><BR>
-		\n<A href='?src=\ref[src];viewexport=1'>View export report</A><BR><BR>
-		<A href='?src=\ref[user];mach_close=computer'>Close</A>"}
-
-	user << browse(dat, "window=computer;size=575x450")
-	onclose(user, "computer")
-	return
-
-/obj/machinery/computer/ordercomp/Topic(href, href_list)
-	if(..())
-		return 1
-
-	if( isturf(loc) && (in_range(src, usr) || istype(usr, /mob/living/silicon)) )
-		usr.set_machine(src)
-
-	if(href_list["order"])
-		if(href_list["order"] == "categories")
-			//all_supply_groups
-			//Request what?
-			last_viewed_group = "categories"
-			temp = "<b>Supply points: [supply_controller.points]</b><BR>"
-			temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A><HR><BR><BR>"
-			temp += "<b>Select a category</b><BR><BR>"
-			for(var/supply_group_name in all_supply_groups )
-				temp += "<A href='?src=\ref[src];order=[supply_group_name]'>[supply_group_name]</A><BR>"
-		else
-			last_viewed_group = href_list["order"]
-			temp = "<b>Supply points: [supply_controller.points]</b><BR>"
-			temp += "<A href='?src=\ref[src];order=categories'>Back to all categories</A><HR><BR><BR>"
-			temp += "<b>Request from: [last_viewed_group]</b><BR><BR>"
-			for(var/supply_name in supply_controller.supply_packs )
-				var/datum/supply_packs/N = supply_controller.supply_packs[supply_name]
-				if(N.hidden || N.contraband || N.group != last_viewed_group) continue								//Have to send the type instead of a reference to
-				temp += "<A href='?src=\ref[src];doorder=[supply_name]'>[supply_name]</A> Cost: [N.cost]<BR>"		//the obj because it would get caught by the garbage
-
-	else if (href_list["doorder"])
-		if(world.time < reqtime)
-			for(var/mob/V in hearers(src))
-				V.show_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
-			return
-
-		//Find the correct supply_pack datum
-		var/datum/supply_packs/P = supply_controller.supply_packs[href_list["doorder"]]
-		if(!istype(P))	return
-
-		var/timeout = world.time + 600
-		var/reason = sanitize(input(usr,"Reason:","Why do you require this item?","") as null|text)
-		if(world.time > timeout)	return
-		if(!reason)	return
-
-		var/idname = "*None Provided*"
-		var/idrank = "*None Provided*"
-		if(ishuman(usr))
-			var/mob/living/carbon/human/H = usr
-			idname = H.get_authentification_name()
-			idrank = H.get_assignment()
-		else if(issilicon(usr))
-			idname = usr.real_name
-
-		supply_controller.ordernum++
-		var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc)
-		reqform.name = "Requisition Form - [P.name]"
-		reqform.info += "<h3>[station_name()] Supply Requisition Form</h3><hr>"
-		reqform.info += "INDEX: #[supply_controller.ordernum]<br>"
-		reqform.info += "REQUESTED BY: [idname]<br>"
-		reqform.info += "RANK: [idrank]<br>"
-		reqform.info += "REASON: [reason]<br>"
-		reqform.info += "SUPPLY CRATE TYPE: [P.name]<br>"
-		reqform.info += "ACCESS RESTRICTION: [get_access_desc(P.access)]<br>"
-		reqform.info += "CONTENTS:<br>"
-		reqform.info += P.manifest
-		reqform.info += "<hr>"
-		reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:<br>"
-
-		reqform.update_icon()	//Fix for appearing blank when printed.
-		reqtime = (world.time + 5) % 1e5
-
-		//make our supply_order datum
-		var/datum/supply_order/O = new /datum/supply_order()
-		O.ordernum = supply_controller.ordernum
-		O.object = P
-		O.orderedby = idname
-		supply_controller.requestlist += O
-
-		temp = "Thanks for your request. The cargo team will process it as soon as possible.<BR>"
-		temp += "<BR><A href='?src=\ref[src];order=[last_viewed_group]'>Back</A> <A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
-
-	else if (href_list["vieworders"])
-		temp = "Current approved orders: <BR><BR>"
-		for(var/S in supply_controller.shoppinglist)
-			var/datum/supply_order/SO = S
-			temp += "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]<BR>"
-		temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
-
-	else if (href_list["viewrequests"])
-		temp = "Current requests: <BR><BR>"
-		for(var/S in supply_controller.requestlist)
-			var/datum/supply_order/SO = S
-			temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby]<BR>"
-		temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
-
-	else if (href_list["mainmenu"])
-		temp = null
-
-	add_fingerprint(usr)
-	updateUsrDialog()
-	return
-
 /obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob)
-	if(!allowed(user))
-		user << "<span class='warning'>Access Denied.</span>"
-		return
-
 	if(..())
 		return
 	user.set_machine(src)
-	post_signal("supply")
+	ui_interact(user)
-	var/dat
-	if (temp)
-		dat = temp
-	else
-		var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
-		if (shuttle)
-			dat += "<BR><B>Supply shuttle</B><HR>"
-			dat += "\nLocation: "
-			if (shuttle.has_arrive_time())
-				dat += "In transit ([shuttle.eta_minutes()] Mins.)<BR>"
-			else
-				if (shuttle.at_station())
-					if (shuttle.docking_controller)
-						switch(shuttle.docking_controller.get_docking_status())
-							if ("docked") dat += "Docked at station<BR>"
-							if ("undocked") dat += "Undocked from station<BR>"
-							if ("docking") dat += "Docking with station [shuttle.can_force()? "<span class='warning'><A href='?src=\ref[src];force_send=1'>Force Launch</A></span>" : ""]<BR>"
-							if ("undocking") dat += "Undocking from station [shuttle.can_force()? "<span class='warning'><A href='?src=\ref[src];force_send=1'>Force Launch</A></span>" : ""]<BR>"
-					else
-						dat += "Station<BR>"
-
-					if (shuttle.can_launch())
-						dat += "<A href='?src=\ref[src];send=1'>Send away</A>"
-					else if (shuttle.can_cancel())
-						dat += "<A href='?src=\ref[src];cancel_send=1'>Cancel launch</A>"
-					else
-						dat += "*Shuttle is busy*"
-					dat += "<BR>\n<BR>"
-				else
-					dat += "Away<BR>"
-					if (shuttle.can_launch())
-						dat += "<A href='?src=\ref[src];send=1'>Request supply shuttle</A>"
-					else if (shuttle.can_cancel())
-						dat += "<A href='?src=\ref[src];cancel_send=1'>Cancel request</A>"
-					else
-						dat += "*Shuttle is busy*"
-					dat += "<BR>\n<BR>"
-
-
-		dat += {"<HR>\nSupply points: [supply_controller.points]<BR>\n<BR>
-		\n<A href='?src=\ref[src];order=categories'>Order items</A><BR>\n<BR>
-		\n<A href='?src=\ref[src];viewrequests=1'>View requests</A><BR>\n<BR>
-		\n<A href='?src=\ref[src];vieworders=1'>View orders</A><BR>\n<BR>
-		\n<A href='?src=\ref[src];viewexport=1'>View export report</A><BR>\n<BR>
-		\n<A href='?src=\ref[user];mach_close=computer'>Close</A>"}
-
-
-	user << browse(dat, "window=computer;size=575x450")
-	onclose(user, "computer")
 	return
 
 /obj/machinery/computer/supplycomp/emag_act(var/remaining_charges, var/mob/user)
 	if(!can_order_contraband)
-		user << "<span class='notice'>Special supplies unlocked.</span>"
+		to_chat(user, "<span class='notice'>Special supplies unlocked.</span>")
-		can_order_contraband = 1
+		authorization |= SUP_CONTRABAND
 		req_access = list()
 		return 1
 
+
+
+
+/obj/machinery/computer/supplycomp/ui_interact(mob/user, ui_key = "supply_records", var/datum/nanoui/ui = null, var/force_open = 1, var/key_state = null)
+	var/data[0]
+	var/shuttle_status[0]	// Supply shuttle status
+	var/supply_pack[0]		// List of supply packs, sorted by category
+	var/sorted_pack[0]		// List of supply packs, sorted by category, with numerical indices for nanoUI iteration
+	var/orders[0]
+	var/receipts[0]
+
+	var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
+	if(shuttle)
+		if(shuttle.has_arrive_time())
+			shuttle_status["location"] = "In transit"
+			shuttle_status["mode"] = SUP_SHUTTLE_TRANSIT
+			shuttle_status["time"] = shuttle.eta_minutes()
+
+		else
+			shuttle_status["time"] = 0
+			if(shuttle.at_station())
+				if(shuttle.docking_controller)
+					switch(shuttle.docking_controller.get_docking_status())
+						if("docked")
+							shuttle_status["location"] = "Docked"
+							shuttle_status["mode"] = SUP_SHUTTLE_DOCKED
+						if("undocked")
+							shuttle_status["location"] = "Undocked"
+							shuttle_status["mode"] = SUP_SHUTTLE_UNDOCKED
+						if("docking")
+							shuttle_status["location"] = "Docking"
+							shuttle_status["mode"] = SUP_SHUTTLE_DOCKING
+							shuttle_status["force"] = shuttle.can_force()
+						if("undocking")
+							shuttle_status["location"] = "Undocking"
+							shuttle_status["mode"] = SUP_SHUTTLE_UNDOCKING
+							shuttle_status["force"] = shuttle.can_force()
+
+				else
+					shuttle_status["location"] = "Station"
+					shuttle_status["mode"] = SUP_SHUTTLE_DOCKED
+
+			else
+				shuttle_status["location"] = "Away"
+				shuttle_status["mode"] = SUP_SHUTTLE_AWAY
+
+			if(shuttle.can_launch())
+				shuttle_status["launch"] = 1
+			else if(shuttle.can_cancel())
+				shuttle_status["launch"] = 2
+			else
+				shuttle_status["launch"] = 0
+
+		switch(shuttle.moving_status)
+			if(SHUTTLE_IDLE)
+				shuttle_status["engine"] = "Idle"
+			if(SHUTTLE_WARMUP)
+				shuttle_status["engine"] = "Warming up"
+			if(SHUTTLE_INTRANSIT)
+				shuttle_status["engine"] = "Engaged"
+
+	else
+		shuttle["mode"] = SUP_SHUTTLE_ERROR
+
+	// Uses two separate lists, one of which indexes on the category for easy insertion
+	for(var/cat in all_supply_groups) // Global list of supply categories
+		supply_pack[cat] = list() // Create an index for the category
+
+	for(var/pack_name in supply_controller.supply_pack)
+		var/datum/supply_pack/P = supply_controller.supply_pack[pack_name]
+		var/list/pack = list(
+				"name" = P.name,
+				"cost" = P.cost,
+				"contraband" = P.contraband,
+				"manifest" = uniquelist(P.manifest),
+				"random" = P.num_contained,
+				"expand" = 0,
+				"ref" = "\ref[P]"
+			)
+
+
+		if(P in expanded_packs)
+			pack["expand"] = 1
+
+		supply_pack[P.group][++supply_pack[P.group].len] = pack
+
+	for(var/index in supply_pack)
+		sorted_pack[++sorted_pack.len] = list("name" = index, "category_packs" = supply_pack[index])
+
+	// Compile user-side orders
+	// Status determines which menus the entry will display in
+	// Organized in field-entry list for iterative display
+	// List is nested so both the list of orders, and the list of elements in each order, can be iterated over
+	for(var/datum/supply_order/S in supply_controller.order_history)
+		orders[++orders.len] = list(
+				"ref" = "\ref[S]",
+				"status" = S.status,
+				"entries" = list(
+						list("field" = "Supply Pack", "entry" = S.name),
+						list("field" = "Cost", "entry" = S.cost),
+						list("field" = "Index", "entry" = S.index),
+						list("field" = "Reason", "entry" = S.comment),
+						list("field" = "Ordered by", "entry" = S.ordered_by),
+						list("field" = "Ordered at", "entry" = S.ordered_at),
+						list("field" = "Approved by", "entry" = S.approved_by),
+						list("field" = "Approved at", "entry" = S.approved_at)
+					)
+			)
+
+	// Compile exported crates
+	for(var/datum/exported_crate/E in supply_controller.exported_crates)
+		receipts[++receipts.len] = list(
+				"ref" = "\ref[E]",
+				"contents" = E.contents,
+				"error" = E.contents["error"],
+				"title" = list(
+						list("field" = "Name", "entry" = E.name),
+						list("field" = "Value", "entry" = E.value)
+					)
+			)
+
+	data["user"] = "\ref[user]"
+	data["currentTab"] = menu_tab // Communicator compatibility, controls which menu is in use
+	data["shuttle_auth"] = (authorization & SUP_SEND_SHUTTLE) // Whether this ui is permitted to control the supply shuttle
+	data["order_auth"] = (authorization & SUP_ACCEPT_ORDERS)   // Whether this ui is permitted to accept/deny requested orders
+	data["shuttle"] = shuttle_status
+	data["supply_points"] = supply_controller.points
+	data["supply_packs"] = sorted_pack
+	data["orders"] = orders
+	data["receipts"] = receipts
+	data["contraband"] = can_order_contraband
+
+	// update the ui if it exists, returns null if no ui is passed/found
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if(!ui)
+		// the ui does not exist, so we'll create a new() one
+        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
+		ui = new(user, src, ui_key, "supply_records.tmpl", "Supply Console", 475, 700, state = key_state)
+		// when the ui is first opened this is the data it will use
+		ui.set_initial_data(data)
+		// open the new ui window
+		ui.open()
+		// auto update every five Master Controller tick
+		ui.set_auto_update(5)
+
+
+
+
 /obj/machinery/computer/supplycomp/Topic(href, href_list)
 	if(!supply_controller)
-		world.log << "## ERROR: Eek. The supply_controller controller datum is missing somehow."
+		world.log << "## ERROR: The supply_controller datum is missing."
 		return
 	var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
 	if (!shuttle)
-		world.log << "## ERROR: Eek. The supply/shuttle datum is missing somehow."
+		world.log << "## ERROR: The supply shuttle datum is missing."
 		return
 	if(..())
 		return 1
@@ -228,177 +204,210 @@
 	if(isturf(loc) && ( in_range(src, usr) || istype(usr, /mob/living/silicon) ) )
 		usr.set_machine(src)
 
-	//Calling the shuttle
+	// NEW TOPIC
-	if(href_list["send"])
-		if(shuttle.at_station())
-			if (shuttle.forbidden_atoms_check())
-				temp = "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
-			else
-				shuttle.launch(src)
-				temp = "Initiating launch sequence. \[<span class='warning'><A href='?src=\ref[src];force_send=1'>Force Launch</A></span>\]<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
-		else
-			shuttle.launch(src)
-			temp = "The supply shuttle has been called and will arrive in approximately [round(supply_controller.movetime/600,1)] minutes.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
-			post_signal("supply")
 
-	if (href_list["force_send"])
+	// Switch menu
-		shuttle.force_launch(src)
+	if(href_list["switch_tab"])
+		menu_tab = href_list["switch_tab"]
 
-	if (href_list["cancel_send"])
+	if(href_list["pack_ref"])
-		shuttle.cancel_launch(src)
+		var/datum/supply_pack/S = locate(href_list["pack_ref"])
 
-	else if (href_list["order"])
+		// Invalid ref
-		//if(!shuttle.idle()) return	//this shouldn't be necessary it seems
+		if(!istype(S))
-		if(href_list["order"] == "categories")
-			//all_supply_groups
-			//Request what?
-			last_viewed_group = "categories"
-			temp = "<b>Supply points: [supply_controller.points]</b><BR>"
-			temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A><HR><BR><BR>"
-			temp += "<b>Select a category</b><BR><BR>"
-			for(var/supply_group_name in all_supply_groups )
-				temp += "<A href='?src=\ref[src];order=[supply_group_name]'>[supply_group_name]</A><BR>"
-		else
-			last_viewed_group = href_list["order"]
-			temp = "<b>Supply points: [supply_controller.points]</b><BR>"
-			temp += "<A href='?src=\ref[src];order=categories'>Back to all categories</A><HR><BR><BR>"
-			temp += "<b>Request from: [last_viewed_group]</b><BR><BR>"
-			for(var/supply_name in supply_controller.supply_packs )
-				var/datum/supply_packs/N = supply_controller.supply_packs[supply_name]
-				if((N.contraband && !can_order_contraband) || N.group != last_viewed_group) continue								//Have to send the type instead of a reference to
-				temp += "<A href='?src=\ref[src];doorder=[supply_name]'>[supply_name]</A> Cost: [N.cost]<BR>"		//the obj because it would get caught by the garbage
-
-	else if (href_list["doorder"])
-		if(world.time < reqtime)
-			for(var/mob/V in hearers(src))
-				V.show_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
 			return
 
-		//Find the correct supply_pack datum
+		// Expand the supply pack's contents
-		var/datum/supply_packs/P = supply_controller.supply_packs[href_list["doorder"]]
+		if(href_list["expand"])
-		if(!istype(P))	return
+			expanded_packs ^= S
+
+		// Make a request for the pack
+		if(href_list["request"])
+			var/mob/user = locate(href_list["user"])
+			if(!istype(user)) // Invalid ref
+				return
+
+			if(world.time < reqtime)
+				visible_message("<span class='warning'>[src]'s monitor flashes, \"[reqtime - world.time] seconds remaining until another requisition form may be printed.\"</span>")
+				return
 
 			var/timeout = world.time + 600
-		var/reason = sanitize(input(usr,"Reason:","Why do you require this item?","") as null|text)
+			var/reason = sanitize(input(user, "Reason:","Why do you require this item?","") as null|text)
-		if(world.time > timeout)	return
+			if(world.time > timeout)
-		if(!reason)	return
+				to_chat(user, "<span class='warning'>Error. Request timed out.</span>")
+				return
+			if(!reason)
+				return
+
+			supply_controller.create_order(S, user, reason)
 
 			var/idname = "*None Provided*"
 			var/idrank = "*None Provided*"
-		if(ishuman(usr))
+			if(ishuman(user))
-			var/mob/living/carbon/human/H = usr
+				var/mob/living/carbon/human/H = user
 				idname = H.get_authentification_name()
 				idrank = H.get_assignment()
-		else if(issilicon(usr))
+			else if(issilicon(user))
-			idname = usr.real_name
+				idname = user.real_name
+				idrank = "Stationbound synthetic"
 
-		supply_controller.ordernum++
 			var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc)
-		reqform.name = "Requisition Form - [P.name]"
+			reqform.name = "Requisition Form - [S.name]"
 			reqform.info += "<h3>[station_name()] Supply Requisition Form</h3><hr>"
 			reqform.info += "INDEX: #[supply_controller.ordernum]<br>"
 			reqform.info += "REQUESTED BY: [idname]<br>"
 			reqform.info += "RANK: [idrank]<br>"
 			reqform.info += "REASON: [reason]<br>"
-		reqform.info += "SUPPLY CRATE TYPE: [P.name]<br>"
+			reqform.info += "SUPPLY CRATE TYPE: [S.name]<br>"
-		reqform.info += "ACCESS RESTRICTION: [get_access_desc(P.access)]<br>"
+			reqform.info += "ACCESS RESTRICTION: [get_access_desc(S.access)]<br>"
 			reqform.info += "CONTENTS:<br>"
-		reqform.info += P.manifest
+			reqform.info +=  S.get_html_manifest()
 			reqform.info += "<hr>"
 			reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:<br>"
 
 			reqform.update_icon()	//Fix for appearing blank when printed.
 			reqtime = (world.time + 5) % 1e5
 
-		//make our supply_order datum
+	if(href_list["order_ref"])
-		var/datum/supply_order/O = new /datum/supply_order()
+		var/datum/supply_order/O = locate(href_list["order_ref"])
-		O.ordernum = supply_controller.ordernum
-		O.object = P
-		O.orderedby = idname
-		supply_controller.requestlist += O
 
-		temp = "Order request placed.<BR>"
+		// Invalid ref
-		temp += "<BR><A href='?src=\ref[src];order=[last_viewed_group]'>Back</A> | <A href='?src=\ref[src];mainmenu=1'>Main Menu</A> | <A href='?src=\ref[src];confirmorder=[O.ordernum]'>Authorize Order</A>"
+		if(!istype(O))
+			return
 
-	else if(href_list["confirmorder"])
+		var/mob/user = locate(href_list["user"])
-		//Find the correct supply_order datum
+		if(!istype(user)) // Invalid ref
-		var/ordernum = text2num(href_list["confirmorder"])
+			return
-		var/datum/supply_order/O
+
-		var/datum/supply_packs/P
+		if(href_list["edit"])
-		temp = "Invalid Request"
+			var/new_val = sanitize(input(user, href_list["edit"], "Enter the new value for this field:", href_list["default"]) as null|text)
-		for(var/i=1, i<=supply_controller.requestlist.len, i++)
+			if(!new_val)
-			var/datum/supply_order/SO = supply_controller.requestlist[i]
+				return
-			if(SO.ordernum == ordernum)
+
-				O = SO
+			switch(href_list["edit"])
-				P = O.object
+				if("Supply Pack")
-				if(supply_controller.points >= P.cost)
+					O.name = new_val
-					supply_controller.requestlist.Cut(i,i+1)
+
-					supply_controller.points -= P.cost
+				if("Cost")
-					supply_controller.shoppinglist += O
+					var/num = text2num(new_val)
-					temp = "Thanks for your order.<BR>"
+					if(num)
-					temp += "<BR><A href='?src=\ref[src];viewrequests=1'>Back</A> <A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+						O.cost = num
+
+				if("Index")
+					var/num = text2num(new_val)
+					if(num)
+						O.index = num
+
+				if("Reason")
+					O.comment = new_val
+
+				if("Ordered by")
+					O.ordered_by = new_val
+
+				if("Ordered at")
+					O.ordered_at = new_val
+
+				if("Approved by")
+					O.approved_by = new_val
+
+				if("Approved at")
+					O.approved_at = new_val
+
+		if(href_list["approve"])
+			supply_controller.approve_order(O, user)
+
+		if(href_list["deny"])
+			supply_controller.deny_order(O, user)
+
+		if(href_list["delete"])
+			supply_controller.delete_order(O, user)
+
+	if(href_list["clear_all_requests"])
+		var/mob/user = locate(href_list["user"])
+		if(!istype(user)) // Invalid ref
+			return
+
+		supply_controller.deny_all_pending(user)
+
+	if(href_list["export_ref"])
+		var/datum/exported_crate/E = locate(href_list["export_ref"])
+
+		// Invalid ref
+		if(!istype(E))
+			return
+
+		var/mob/user = locate(href_list["user"])
+		if(!istype(user)) // Invalid ref
+			return
+
+		if(href_list["index"])
+			var/list/L = E.contents[href_list["index"]]
+
+			if(href_list["edit"])
+				var/field = alert(user, "Select which field to edit", , "Name", "Quantity", "Value")
+
+				var/new_val = sanitize(input(user, href_list["edit"], "Enter the new value for this field:", href_list["default"]) as null|text)
+				if(!new_val)
+					return
+
+				switch(field)
+					if("Name")
+						L["object"] = new_val
+
+					if("Quantity")
+						var/num = text2num(new_val)
+						if(num)
+							L["quantity"] = num
+
+					if("Value")
+						var/num = text2num(new_val)
+						if(num)
+							L["value"] = num
+
+			if(href_list["delete"])
+				E.contents.Cut(href_list["index"], href_list["index"] + 1)
+
+		// Else clause means they're editing/deleting the whole export report, rather than a specific item in it
+		else if(href_list["edit"])
+			var/new_val = sanitize(input(user, href_list["edit"], "Enter the new value for this field:", href_list["default"]) as null|text)
+			if(!new_val)
+				return
+
+			switch(href_list["edit"])
+				if("Name")
+					E.name = new_val
+
+				if("Value")
+					var/num = text2num(new_val)
+					if(num)
+						E.value = num
+
+		else if(href_list["delete"])
+			supply_controller.delete_export(E, user)
+
+		else if(href_list["add_item"])
+			supply_controller.add_export_item(E, user)
+
+
+
+	switch(href_list["send_shuttle"])
+		if("send_away")
+			if (shuttle.forbidden_atoms_check())
+				to_chat(usr, "<span class='warning'>For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.</span>")
 			else
-					temp = "Not enough supply points.<BR>"
+				shuttle.launch(src)
-					temp += "<BR><A href='?src=\ref[src];viewrequests=1'>Back</A> <A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+				to_chat(usr, "<span class='notice'>Initiating launch sequence.</span>")
-				break
 
-	else if (href_list["vieworders"])
+		if("send_to_station")
-		temp = "Current approved orders: <BR><BR>"
+			shuttle.launch(src)
-		for(var/S in supply_controller.shoppinglist)
+			to_chat(usr, "<span class='notice'>The supply shuttle has been called and will arrive in approximately [round(supply_controller.movetime/600,1)] minutes.</span>")
-			var/datum/supply_order/SO = S
+			post_signal("supply")
-			temp += "#[SO.ordernum] - [SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""]<BR>"// <A href='?src=\ref[src];cancelorder=[S]'>(Cancel)</A><BR>"
-		temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
-/*
-	else if (href_list["cancelorder"])
-		var/datum/supply_order/remove_supply = href_list["cancelorder"]
-		supply_shuttle_shoppinglist -= remove_supply
-		supply_shuttle_points += remove_supply.object.cost
-		temp += "Canceled: [remove_supply.object.name]<BR><BR><BR>"
 
-		for(var/S in supply_shuttle_shoppinglist)
+		if("cancel_shuttle")
-			var/datum/supply_order/SO = S
+			shuttle.cancel_launch(src)
-			temp += "[SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""] <A href='?src=\ref[src];cancelorder=[S]'>(Cancel)</A><BR>"
-		temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
-*/
-	else if (href_list["viewrequests"])
-		temp = "Current requests: <BR><BR>"
-		for(var/S in supply_controller.requestlist)
-			var/datum/supply_order/SO = S
-			temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby] <A href='?src=\ref[src];confirmorder=[SO.ordernum]'>Approve</A> <A href='?src=\ref[src];rreq=[SO.ordernum]'>Remove</A><BR>"
 
-		temp += "<BR><A href='?src=\ref[src];clearreq=1'>Clear list</A>"
+		if("force_shuttle")
-		temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
+			shuttle.force_launch(src)
-
-	else if (href_list["viewexport"])
-		temp = "Previous shuttle export report: <BR><BR>"
-		var/cratecount = 0
-		var/totalvalue = 0
-		for(var/S in supply_controller.exported_crates)
-			var/datum/exported_crate/EC = S
-			cratecount += 1
-			totalvalue += EC.value
-			temp += "[EC.name] exported for [EC.value] supply points<BR>"
-		temp += "<BR>Shipment of [cratecount] crates exported for [totalvalue] supply points.<BR>"
-		temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
-
-	else if (href_list["rreq"])
-		var/ordernum = text2num(href_list["rreq"])
-		temp = "Invalid Request.<BR>"
-		for(var/i=1, i<=supply_controller.requestlist.len, i++)
-			var/datum/supply_order/SO = supply_controller.requestlist[i]
-			if(SO.ordernum == ordernum)
-				supply_controller.requestlist.Cut(i,i+1)
-				temp = "Request removed.<BR>"
-				break
-		temp += "<BR><A href='?src=\ref[src];viewrequests=1'>Back</A> <A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
-
-	else if (href_list["clearreq"])
-		supply_controller.requestlist.Cut()
-		temp = "List cleared.<BR>"
-		temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
-
-	else if (href_list["mainmenu"])
-		temp = null
 
 	add_fingerprint(usr)
 	updateUsrDialog()

code/game/objects/items/devices/PDA/cart.dm

@@ -434,7 +434,7 @@ var/list/civilian_cartridges = list(
 		for(var/S in supply_controller.shoppinglist)
 			var/datum/supply_order/SO = S
 
-			supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.orderedby, "Comment" = html_encode(SO.comment))
+			supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment))
 		if(!supplyOrderData.len)
 			supplyOrderData[++supplyOrderData.len] = list("Number" = null, "Name" = null, "OrderedBy"=null)
 
@@ -443,10 +443,13 @@ var/list/civilian_cartridges = list(
 
 		var/requestCount = 0
 		var/requestData[0]
-		for(var/S in supply_controller.requestlist)
+		for(var/S in supply_controller.order_history)
 			var/datum/supply_order/SO = S
+			if(SO.status != SUP_ORDER_REQUESTED)
+				continue
+
 			requestCount++
-			requestData[++requestData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "OrderedBy" = SO.orderedby, "Comment" = html_encode(SO.comment))
+			requestData[++requestData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "OrderedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment))
 		if(!requestData.len)
 			requestData[++requestData.len] = list("Number" = null, "Name" = null, "orderedBy" = null, "Comment" = null)
 

code/game/objects/items/weapons/circuitboards/computer/computer.dm

@@ -153,11 +153,6 @@
 	name = T_BOARD("disease splicer")
 	build_path = /obj/machinery/computer/diseasesplicer
 
-/obj/item/weapon/circuitboard/ordercomp
-	name = T_BOARD("supply ordering console")
-	build_path = /obj/machinery/computer/ordercomp
-	origin_tech = list(TECH_DATA = 2)
-
 /obj/item/weapon/circuitboard/mining_shuttle
 	name = T_BOARD("mining shuttle console")
 	build_path = /obj/machinery/computer/shuttle_control/mining

code/game/objects/items/weapons/circuitboards/computer/supply.dm

@@ -3,11 +3,16 @@
 #endif
 
 /obj/item/weapon/circuitboard/supplycomp
-	name = T_BOARD("supply control console")
+	name = T_BOARD("supply ordering console")
 	build_path = /obj/machinery/computer/supplycomp
-	origin_tech = list(TECH_DATA = 3)
+	origin_tech = list(TECH_DATA = 2)
 	var/contraband_enabled = 0
 
+/obj/item/weapon/circuitboard/supplycomp/control
+	name = T_BOARD("supply ordering console")
+	build_path = /obj/machinery/computer/supplycomp/control
+	origin_tech = list(TECH_DATA = 3)
+
 /obj/item/weapon/circuitboard/supplycomp/construct(var/obj/machinery/computer/supplycomp/SC)
 	if (..(SC))
 		SC.can_order_contraband = contraband_enabled

code/modules/events/shipping_error.dm

@@ -1,6 +1,6 @@
 /datum/event/shipping_error/start()
 	var/datum/supply_order/O = new /datum/supply_order()
 	O.ordernum = supply_controller.ordernum
-	O.object = supply_controller.supply_packs[pick(supply_controller.supply_packs)]
+	O.object = supply_controller.supply_pack[pick(supply_controller.supply_pack)]
-	O.orderedby = random_name(pick(MALE,FEMALE), species = SPECIES_HUMAN)
+	O.ordered_by = random_name(pick(MALE,FEMALE), species = SPECIES_HUMAN)
 	supply_controller.shoppinglist += O

code/modules/gamemaster/actions/shipping_error.dm

@@ -12,6 +12,6 @@
 	..()
 	var/datum/supply_order/O = new /datum/supply_order()
 	O.ordernum = supply_controller.ordernum
-	O.object = supply_controller.supply_packs[pick(supply_controller.supply_packs)]
+	O.object = supply_controller.supply_pack[pick(supply_controller.supply_pack)]
-	O.orderedby = random_name(pick(MALE,FEMALE), species = "Human")
+	O.ordered_by = random_name(pick(MALE,FEMALE), species = "Human")
 	supply_controller.shoppinglist += O

code/modules/reagents/dispenser/supply.dm

@@ -1,4 +1,4 @@
-/datum/supply_packs/chemistry_dispenser
+/datum/supply_pack/chemistry_dispenser
 	name = "Reagent dispenser"
 	contains = list(
 			/obj/machinery/chemical_dispenser{anchored = 0}
@@ -8,7 +8,7 @@
 	containername = "reagent dispenser crate"
 	group = "Reagents"
 
-/datum/supply_packs/beer_dispenser
+/datum/supply_pack/beer_dispenser
 	name = "Booze dispenser"
 	contains = list(
 			/obj/machinery/chemical_dispenser/bar_alc{anchored = 0}
@@ -18,7 +18,7 @@
 	containername = "booze dispenser crate"
 	group = "Reagents"
 
-/datum/supply_packs/soda_dispenser
+/datum/supply_pack/soda_dispenser
 	name = "Soda dispenser"
 	contains = list(
 			/obj/machinery/chemical_dispenser/bar_soft{anchored = 0}
@@ -28,7 +28,7 @@
 	containername = "soda dispenser crate"
 	group = "Reagents"
 
-/datum/supply_packs/reagents
+/datum/supply_pack/reagents
 	name = "Chemistry dispenser refill"
 	contains = list(
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrogen,
@@ -60,7 +60,7 @@
 	access = list(access_chemistry)
 	group = "Reagents"
 
-/datum/supply_packs/alcohol_reagents
+/datum/supply_pack/alcohol_reagents
 	name = "Bar alcoholic dispenser refill"
 	contains = list(
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/beer,
@@ -83,7 +83,7 @@
 	access = list(access_bar)
 	group = "Reagents"
 
-/datum/supply_packs/softdrink_reagents
+/datum/supply_pack/softdrink_reagents
 	name = "Bar soft drink dispenser refill"
 	contains = list(
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/water,
@@ -110,7 +110,7 @@
 	containername = "soft drinks crate"
 	group = "Reagents"
 
-/datum/supply_packs/coffee_reagents
+/datum/supply_pack/coffee_reagents
 	name = "Coffee machine dispenser refill"
 	contains = list(
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee,
@@ -127,7 +127,7 @@
 	containername = "coffee drinks crate"
 	group = "Reagents"
 
-/datum/supply_packs/dispenser_cartridges
+/datum/supply_pack/dispenser_cartridges
 	name = "Empty dispenser cartridges"
 	contains = list(
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge,
@@ -147,7 +147,7 @@
 	group = "Reagents"
 
 #define SEC_PACK(_tname, _type, _name, _cname, _cost, _access)\
-	datum/supply_packs/dispenser_cartridges{\
+	datum/supply_pack/dispenser_cartridges{\
 		_tname {\
 			name = _name ;\
 			containername = _cname ;\
@@ -159,7 +159,7 @@
 		}\
 	}
 #define PACK(_tname, _type, _name, _cname, _cost)\
-	datum/supply_packs/dispenser_cartridges{\
+	datum/supply_pack/dispenser_cartridges{\
 		_tname {\
 			name = _name ;\
 			containername = _cname ;\

code/modules/research/designs/circuits.dm

@@ -364,14 +364,14 @@ CIRCUITS BELOW
 /datum/design/circuit/ordercomp
 	name = "supply ordering console"
 	id = "ordercomp"
-	build_path = /obj/item/weapon/circuitboard/ordercomp
+	build_path = /obj/item/weapon/circuitboard/supplycomp
 	sort_string = "KAAAY"	// Duplicate string, really need to redo this whole thing
 
 /datum/design/circuit/supplycomp
 	name = "supply control console"
 	id = "supplycomp"
 	req_tech = list(TECH_DATA = 3)
-	build_path = /obj/item/weapon/circuitboard/supplycomp
+	build_path = /obj/item/weapon/circuitboard/supplycomp/control
 	sort_string = "KAAAZ"	// Duplicate string, really need to redo this whole thing
 
 /datum/design/circuit/biogenerator

html/changelogs/Atermonera - supply_nanoUI_refactor.yml

@@ -0,0 +1,5 @@
+author: Atermonera
+delete-after: True
+changes: 
+  - rscadd: "The supply controller has been refactored and shifted to nanoUI."
+  - rscadd: "The ordering and control consoles are now generally upgraded in terms of information and options."

maps/northern_star/polaris-1.dmm

@@ -85,8 +85,8 @@
 "abG" = (/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "library_maint_outer"; locked = 1; name = "Library Maintenance EVA External Access"; req_access = list(13)},/turf/simulated/floor,/area/maintenance/library)
 "abH" = (/obj/machinery/airlock_sensor{frequency = 1379; id_tag = "library_maint_sensor"; pixel_x = 0; pixel_y = 25},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1379; id_tag = "library_maint_pump"},/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor,/area/maintenance/library)
 "abI" = (/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1379; id_tag = "library_maint_airlock"; name = "Airlock Console"; pixel_y = 25; req_access = list(13); tag_airpump = "library_maint_pump"; tag_chamber_sensor = "library_maint_sensor"; tag_exterior_door = "library_maint_outer"; tag_interior_door = "library_maint_inner"},/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"},/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor,/area/maintenance/library)
-"abJ" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "library_maint_airlock"; name = "interior access button"; pixel_x = 0; pixel_y = 25; req_access = list(13)},/turf/simulated/floor,/area/maintenance/library)
+"abJ" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/airlock/glass_external{frequency = 1379; icon_state = "door_locked"; id_tag = "library_maint_inner"; locked = 1; name = "Library Maintenance EVA Internal Access"; req_access = list(13)},/turf/simulated/floor,/area/maintenance/library)
-"abK" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/airlock/glass_external{frequency = 1379; icon_state = "door_locked"; id_tag = "library_maint_inner"; locked = 1; name = "Library Maintenance EVA Internal Access"; req_access = list(13)},/turf/simulated/floor,/area/maintenance/library)
+"abK" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "library_maint_airlock"; name = "interior access button"; pixel_x = 0; pixel_y = 25; req_access = list(13)},/turf/simulated/floor,/area/maintenance/library)
 "abL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor,/area/maintenance/library)
 "abM" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"},/turf/simulated/floor,/area/maintenance/library)
 "abN" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/maintenance/library)
@@ -406,8 +406,8 @@
 "ahP" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore)
 "ahQ" = (/obj/structure/disposalpipe/segment,/obj/machinery/atm{pixel_x = 32},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore)
 "ahR" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/chapel/main)
-"ahS" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/chapel/main)
+"ahS" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/chapel/main)
-"ahT" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/chapel/main)
+"ahT" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/chapel/main)
 "ahU" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/carpet,/area/chapel/main)
 "ahV" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/carpet,/area/chapel/main)
 "ahW" = (/turf/simulated/floor/carpet,/area/chapel/main)
@@ -560,8 +560,8 @@
 "akN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore)
 "akO" = (/obj/structure/disposalpipe/segment,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore)
 "akP" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main)
-"akQ" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 4},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main)
+"akQ" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 1},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main)
-"akR" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 1},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main)
+"akR" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 4},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main)
 "akS" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/chapel/main)
 "akT" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/carpet,/area/chapel/main)
 "akU" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/chapel/main)
@@ -1241,10 +1241,10 @@
 "axS" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
 "axT" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/effect/floor_decal/corner/red{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
 "axU" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/corner/red{dir = 5},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
-"axV" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
+"axV" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/corner/red{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/computer/cryopod{density = 0; layer = 3.3; pixel_y = 32},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
-"axW" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/corner/red{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/computer/cryopod{density = 0; layer = 3.3; pixel_y = 32},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
+"axW" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
-"axX" = (/obj/effect/floor_decal/corner/red{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; dir = 1; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
+"axX" = (/obj/effect/floor_decal/corner/red{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
-"axY" = (/obj/effect/floor_decal/corner/red{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
+"axY" = (/obj/effect/floor_decal/corner/red{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; dir = 1; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
 "axZ" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9; icon_state = "intact"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/security/security_cell_hallway)
 "aya" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore)
 "ayb" = (/obj/structure/plasticflaps{opacity = 1},/obj/machinery/navbeacon/delivery/west{location = "Security"},/obj/machinery/door/firedoor/border_only,/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/turf/simulated/floor/plating,/area/security/security_cell_hallway)
@@ -2639,10 +2639,10 @@
 "aYM" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/floor/tiled/hydro,/area/maintenance/engineering/pumpstation)
 "aYN" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/red{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
 "aYO" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
-"aYP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/engineering/pumpstation)
+"aYP" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/structure/table/steel_reinforced,/obj/random/tech_supply,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/random/maintenance/engineering,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
-"aYQ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/structure/table/steel_reinforced,/obj/random/tech_supply,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/random/maintenance/engineering,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
+"aYQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/engineering/pumpstation)
-"aYR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
+"aYR" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
-"aYS" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
+"aYS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
 "aYT" = (/obj/machinery/atmospherics/tvalve/digital/mirrored/bypass{dir = 4},/obj/machinery/camera/network/engineering{c_tag = "ENG - Pump Station"; dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
 "aYU" = (/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
 "aYV" = (/obj/machinery/atmospherics/pipe/manifold/visible/red,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation)
@@ -3004,8 +3004,8 @@
 "bfN" = (/turf/simulated/wall/r_wall,/area/server)
 "bfO" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/server)
 "bfP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; icon_state = "map_vent_out"; use_power = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/server)
-"bfQ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/server)
+"bfQ" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled/dark,/area/server)
-"bfR" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled/dark,/area/server)
+"bfR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/plating,/area/server)
 "bfS" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"},/obj/machinery/light/small{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc/high{dir = 1; name = "north bump"; pixel_y = 24},/turf/simulated/floor/tiled/dark,/area/server)
 "bfT" = (/obj/machinery/camera/network/research{c_tag = "SCI - Server Room"},/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/atmospherics/portables_connector,/turf/simulated/floor/tiled/dark,/area/server)
 "bfU" = (/obj/machinery/atmospherics/unary/freezer{dir = 2; icon_state = "freezer_1"; use_power = 1; power_setting = 20; set_temperature = 73},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/server)
@@ -3387,10 +3387,10 @@
 "bng" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "research_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/research/station)
 "bnh" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "research_dock_outer"; locked = 1; name = "Research Elevator Airlock"; req_access = list(13)},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1380; master_tag = "research_dock_airlock"; name = "exterior access button"; pixel_x = -6; pixel_y = -26; req_one_access = list(13,65)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/turf/simulated/floor/tiled/dark,/area/rnd/docking)
 "bni" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/rnd/docking)
-"bnj" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "research_dock_inner"; locked = 1; name = "Research Elevator Airlock"; req_access = list(13)},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/rnd/docking)
+"bnj" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/rnd/docking)
-"bnk" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/rnd/docking)
+"bnk" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "research_dock_inner"; locked = 1; name = "Research Elevator Airlock"; req_access = list(13)},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/rnd/docking)
-"bnl" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/docking)
+"bnl" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "research_dock_airlock"; name = "interior access button"; pixel_x = -26; pixel_y = 26; req_one_access = list(13,65)},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/docking)
-"bnm" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "research_dock_airlock"; name = "interior access button"; pixel_x = -26; pixel_y = 26; req_one_access = list(13,65)},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/docking)
+"bnm" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/docking)
 "bnn" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9; icon_state = "intact"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/docking)
 "bno" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/glass_research{name = "Research Dock Hallway"; req_access = list(47)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/white,/area/rnd/docking)
 "bnp" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled/white,/area/rnd/docking)
@@ -3780,7 +3780,7 @@
 "buJ" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
 "buK" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
 "buL" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
-"buM" = (/obj/effect/floor_decal/corner/mauve/full,/obj/machinery/clonepod/full,/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
+"buM" = (/obj/machinery/clonepod/full,/obj/effect/floor_decal/corner/mauve/full,/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
 "buN" = (/obj/machinery/computer/cloning,/obj/effect/floor_decal/corner/mauve{dir = 10},/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
 "buO" = (/obj/machinery/dna_scannernew,/obj/effect/floor_decal/corner/mauve{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
 "buP" = (/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning)
@@ -6127,7 +6127,7 @@
 "cnQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/quartermaster/office)
 "cnR" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/office)
 "cnS" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/clipboard,/obj/item/weapon/pen/red{pixel_x = 2; pixel_y = 6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/brown{dir = 6},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office)
-"cnT" = (/obj/machinery/computer/ordercomp,/turf/simulated/floor/tiled,/area/quartermaster/foyer)
+"cnT" = (/obj/machinery/computer/supplycomp,/turf/simulated/floor/tiled,/area/quartermaster/foyer)
 "cnU" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/flora/pottedplant,/turf/simulated/floor/tiled,/area/quartermaster/foyer)
 "cnV" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/foyer)
 "cnW" = (/obj/effect/floor_decal/corner/brown{dir = 4},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
@@ -6248,7 +6248,7 @@
 "cqh" = (/obj/structure/closet/crate/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/medbay_aft)
 "cqi" = (/obj/machinery/autolathe,/obj/effect/floor_decal/corner/brown{dir = 9},/turf/simulated/floor/tiled,/area/quartermaster/office)
 "cqj" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/office)
-"cqk" = (/obj/machinery/computer/supplycomp,/turf/simulated/floor/tiled,/area/quartermaster/office)
+"cqk" = (/obj/machinery/computer/supplycomp/control,/turf/simulated/floor/tiled,/area/quartermaster/office)
 "cql" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/office)
 "cqm" = (/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/quartermaster/foyer)
 "cqn" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
@@ -6758,7 +6758,7 @@
 "czX" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "czY" = (/obj/structure/table/standard,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/item/weapon/pen/red{pixel_x = 2; pixel_y = 6},/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "czZ" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Quartermaster"},/turf/simulated/floor/tiled,/area/quartermaster/qm)
-"cAa" = (/obj/machinery/computer/supplycomp,/turf/simulated/floor/tiled,/area/quartermaster/qm)
+"cAa" = (/obj/machinery/computer/supplycomp/control,/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cAb" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/maintenance/apmaint)
 "cAc" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/apmaint)
 "cAd" = (/obj/structure/table/rack,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor,/area/maintenance/apmaint)
@@ -8168,8 +8168,8 @@
 "dbd" = (/obj/machinery/atmospherics/portables_connector,/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dbe" = (/obj/machinery/atmospherics/pipe/manifold/visible/yellow{dir = 8},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dbf" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 9},/turf/simulated/floor/tiled,/area/engineering/atmos)
-"dbg" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
+"dbg" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 5},/turf/simulated/floor/tiled,/area/engineering/atmos)
-"dbh" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 5},/turf/simulated/floor/tiled,/area/engineering/atmos)
+"dbh" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dbi" = (/obj/machinery/atmospherics/pipe/manifold/visible/red{icon_state = "map"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dbj" = (/obj/machinery/atmospherics/pipe/manifold4w/visible/red,/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dbk" = (/obj/machinery/meter,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/visible/red{dir = 4; initialize_directions = 11},/turf/simulated/floor/tiled,/area/engineering/atmos)
@@ -8344,18 +8344,18 @@
 "dex" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
 "dey" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
 "dez" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
-"deA" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
+"deA" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
-"deB" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
+"deB" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "deC" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "deD" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/sign/directions/medical{dir = 8; pixel_y = 32},/obj/structure/sign/directions/science{dir = 8; pixel_y = 32; pixel_z = -8},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
-"deE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
+"deE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/sign/directions/cargo{dir = 8; pixel_y = 32; pixel_z = 8},/obj/structure/sign/directions/security{dir = 8; pixel_y = 32},/obj/structure/sign/directions/engineering{dir = 8; pixel_y = 32; pixel_z = -8},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
-"deF" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/sign/directions/cargo{dir = 8; pixel_y = 32; pixel_z = 8},/obj/structure/sign/directions/security{dir = 8; pixel_y = 32},/obj/structure/sign/directions/engineering{dir = 8; pixel_y = 32; pixel_z = -8},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
+"deF" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "deG" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "deH" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "deI" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "deJ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
-"deK" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
+"deK" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
-"deL" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
+"deL" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "deM" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "deN" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/camera/network/northern_star{c_tag = "DOCK - Hallway Starboard 1"; dir = 2},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
 "deO" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/sign/directions/security{dir = 8; pixel_y = 32},/obj/structure/sign/directions/engineering{dir = 8; pixel_y = 32; pixel_z = -8},/obj/structure/sign/directions/cargo{dir = 8; pixel_y = 32; pixel_z = 8},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard)
@@ -8369,8 +8369,8 @@
 "deW" = (/turf/simulated/floor/reinforced/oxygen,/area/engineering/atmos)
 "deX" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; frequency = 1441; icon_state = "map_injector"; id = "o2_in"; use_power = 1},/turf/simulated/floor/reinforced/oxygen,/area/engineering/atmos)
 "deY" = (/obj/structure/grille,/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/wall/r_wall,/area/engineering/atmos)
-"deZ" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; opacity = 0},/turf/simulated/floor,/area/engineering/atmos)
+"deZ" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level)
-"dfa" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level)
+"dfa" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; opacity = 0},/turf/simulated/floor,/area/engineering/atmos)
 "dfb" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/corner/blue/full{dir = 8},/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Port"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dfc" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/cyan,/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dfd" = (/obj/machinery/atmospherics/omni/atmos_filter{tag_east = 0; tag_north = 2; tag_south = 1; tag_west = 3; use_power = 1},/turf/simulated/floor/tiled,/area/engineering/atmos)
@@ -8380,14 +8380,14 @@
 "dfh" = (/obj/machinery/atmospherics/pipe/manifold/visible/red{icon_state = "map"; dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dfi" = (/obj/machinery/atmospherics/binary/pump/on{dir = 8; name = "Ports to Waste"},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dfj" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
-"dfk" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled,/area/engineering/foyer)
+"dfk" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics"; req_access = list(24)},/turf/simulated/floor/tiled,/area/engineering/atmos)
-"dfl" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics"; req_access = list(24)},/turf/simulated/floor/tiled,/area/engineering/atmos)
+"dfl" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled,/area/engineering/foyer)
-"dfm" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Hallway"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/foyer)
+"dfm" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer)
-"dfn" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer)
+"dfn" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Hallway"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/foyer)
-"dfo" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/foyer)
+"dfo" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/foyer)
-"dfp" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/foyer)
+"dfp" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/foyer)
-"dfq" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer)
+"dfq" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/engineering/foyer)
-"dfr" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/engineering/foyer)
+"dfr" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer)
 "dfs" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Hallway"; req_one_access = list(10)},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer)
 "dft" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer)
 "dfu" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/tiled,/area/engineering/foyer)
@@ -8490,14 +8490,14 @@
 "dhn" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
 "dho" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
 "dhp" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
-"dhq" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
+"dhq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
-"dhr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
+"dhr" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
-"dhs" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
+"dhs" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
-"dht" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
+"dht" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
-"dhu" = (/obj/structure/cable/green,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/power/apc/super/critical{dir = 2; is_critical = 1; name = "south bump"; pixel_y = -24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
+"dhu" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
-"dhv" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
+"dhv" = (/obj/structure/cable/green,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/power/apc/super/critical{dir = 2; is_critical = 1; name = "south bump"; pixel_y = -24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
-"dhw" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
+"dhw" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/camera/network/northern_star{c_tag = "DOCK - Hallway Port 3"; dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
-"dhx" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/camera/network/northern_star{c_tag = "DOCK - Hallway Port 3"; dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
+"dhx" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
 "dhy" = (/obj/machinery/light,/obj/machinery/embedded_controller/radio/docking_port_multi{child_names_txt = "Airlock One;Airlock Two;Airlock Three;Airlock Four"; child_tags_txt = "escape_dock_north_airlock;escape_dock_south_airlock;escape_dock_snorth_airlock;escape_dock_ssouth_airlock"; frequency = 1380; id_tag = "escape_dock"; pixel_x = 0; pixel_y = -25; req_one_access = list(13)},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
 "dhz" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/camera/network/northern_star{c_tag = "DOCK - Hallway Port 4"; dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
 "dhA" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port)
@@ -8664,8 +8664,8 @@
 "dkF" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 10},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dkG" = (/obj/machinery/atmospherics/pipe/simple/visible/red,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dkH" = (/obj/machinery/atmospherics/pipe/manifold/visible/red,/turf/simulated/floor/tiled,/area/engineering/atmos)
-"dkI" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
+"dkI" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
-"dkJ" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
+"dkJ" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos)
 "dkK" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/manifold/hidden/red{dir = 1},/turf/simulated/wall/r_wall,/area/engineering/workshop)
 "dkL" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/effect/floor_decal/corner/red{dir = 9},/turf/simulated/floor/tiled,/area/engineering/workshop)
 "dkM" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/engineering/workshop)
@@ -8928,8 +8928,8 @@
 "dpJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
 "dpK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4)
 "dpL" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/freezer,/area/vacant/vacant_site2)
-"dpM" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level)
+"dpM" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 6},/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level)
-"dpN" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 6},/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level)
+"dpN" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level)
 "dpO" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/red,/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level)
 "dpP" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/green,/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level)
 "dpQ" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 9},/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level)
@@ -9058,21 +9058,21 @@
 "dsj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/engineering)
 "dsk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/engineering)
 "dsl" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
-"dsm" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "escape_dock_north_airlock"; name = "interior access button"; pixel_x = 26; pixel_y = 26; req_one_access = list(13)},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
+"dsm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
-"dsn" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
+"dsn" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "escape_dock_north_airlock"; name = "interior access button"; pixel_x = 26; pixel_y = 26; req_one_access = list(13)},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
-"dso" = (/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{frequency = 1380; id_tag = "escape_dock_north_airlock"; master_tag = "escape_dock"; pixel_y = 30; req_one_access = list(13); tag_airlock_mech_sensor = "escape_dock_north_mech"; tag_airpump = "escape_dock_north_pump"; tag_chamber_sensor = "escape_dock_north_sensor"; tag_exterior_door = "escape_dock_north_outer"; tag_interior_door = "escape_dock_north_inner"; tag_shuttle_mech_sensor = "shuttle_dock_north_mech"},/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
+"dso" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_dock_north_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D1)
-"dsp" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_dock_north_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D1)
+"dsp" = (/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{frequency = 1380; id_tag = "escape_dock_north_airlock"; master_tag = "escape_dock"; pixel_y = 30; req_one_access = list(13); tag_airlock_mech_sensor = "escape_dock_north_mech"; tag_airpump = "escape_dock_north_pump"; tag_chamber_sensor = "escape_dock_north_sensor"; tag_exterior_door = "escape_dock_north_outer"; tag_interior_door = "escape_dock_north_inner"; tag_shuttle_mech_sensor = "shuttle_dock_north_mech"},/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
 "dsq" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1380; id_tag = "escape_dock_north_pump"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1)
 "dsr" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_dock_north_outer"; locked = 1; name = "Escape Airlock"; req_access = list(13)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D1)
 "dss" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_dock_north_starboard_outer"; locked = 1; name = "Escape Airlock"; req_access = list(13)},/obj/machinery/mech_sensor{dir = 8; frequency = 1380; id_tag = "escape_dock_north_mech"; pixel_y = 19},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
 "dst" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1380; id_tag = "escape_dock_north_starboard_pump"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dsu" = (/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"},/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{frequency = 1380; id_tag = "escape_dock_snorth_airlock"; master_tag = "escape_dock"; pixel_y = 30; req_one_access = list(13); tag_airlock_mech_sensor = "escape_dock_north_starboard_mech"; tag_airpump = "escape_dock_north_starboard_pump"; tag_chamber_sensor = "escape_dock_north_starboard_sensor"; tag_exterior_door = "escape_dock_north_starboard_outer"; tag_interior_door = "escape_dock_north_starboard_inner"; tag_shuttle_mech_sensor = "shuttle_dock_north_starboard_mech"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
-"dsv" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "escape_dock_snorth_airlock"; name = "interior access button"; pixel_x = -26; pixel_y = 26; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
+"dsv" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_dock_north_starboard_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
-"dsw" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_dock_north_starboard_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
+"dsw" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "escape_dock_snorth_airlock"; name = "interior access button"; pixel_x = -26; pixel_y = 26; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dsx" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dsy" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/pipe/manifold4w/hidden,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "arrivals_dock_north_airlock"; name = "interior access button"; pixel_x = 26; pixel_y = 26; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
-"dsz" = (/obj/machinery/light/small,/obj/effect/floor_decal/industrial/warning/cee{icon_state = "warningcee"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{frequency = 1380; id_tag = "arrivals_dock_north_airlock"; master_tag = "arrivals_dock"; pixel_y = 30; req_one_access = list(13); tag_airlock_mech_sensor = "arrivals_dock_north_mech"; tag_airpump = "arrivals_dock_north_pump"; tag_chamber_sensor = "arrivals_dock_north_sensor"; tag_exterior_door = "arrivals_dock_north_outer"; tag_interior_door = "arrivals_dock_north_inner"; tag_shuttle_mech_sensor = "shuttle_dock_north_mech"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
+"dsz" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "arrivals_dock_north_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
-"dsA" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "arrivals_dock_north_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
+"dsA" = (/obj/machinery/light/small,/obj/effect/floor_decal/industrial/warning/cee{icon_state = "warningcee"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{frequency = 1380; id_tag = "arrivals_dock_north_airlock"; master_tag = "arrivals_dock"; pixel_y = 30; req_one_access = list(13); tag_airlock_mech_sensor = "arrivals_dock_north_mech"; tag_airpump = "arrivals_dock_north_pump"; tag_chamber_sensor = "arrivals_dock_north_sensor"; tag_exterior_door = "arrivals_dock_north_outer"; tag_interior_door = "arrivals_dock_north_inner"; tag_shuttle_mech_sensor = "shuttle_dock_north_mech"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dsB" = (/obj/effect/floor_decal/industrial/warning/cee{icon_state = "warningcee"; dir = 4},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1380; id_tag = "arrivals_dock_north_pump"},/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "arrivals_dock_north_sensor"; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dsC" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "arrivals_dock_north_outer"; locked = 1; name = "Arrivals Airlock"; req_access = list(13)},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1380; master_tag = "arrivals_dock_north_airlock"; name = "exterior access button"; pixel_x = 4; pixel_y = -26; req_one_access = list(13)},/obj/machinery/mech_sensor{dir = 8; frequency = 1380; id_tag = "arrival_dock_north_mech"; pixel_y = -19},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
 "dsD" = (/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1; name = "Arrival Airlock"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D3)
@@ -9080,8 +9080,8 @@
 "dsF" = (/obj/machinery/light/small,/obj/effect/floor_decal/industrial/warning/cee{icon_state = "warningcee"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
 "dsG" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/glass_external{icon_state = "door_locked"; locked = 1; name = "Arrival Airlock"},/obj/item/tape/engineering,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D3)
 "dsH" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/item/weapon/caution/cone,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
-"dsI" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "dock_three_fore_airlock"; name = "interior access button"; pixel_x = 26; pixel_y = 26; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
+"dsI" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
-"dsJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
+"dsJ" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "dock_three_fore_airlock"; name = "interior access button"; pixel_x = 26; pixel_y = 26; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
 "dsK" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/glass_external{frequency = 1379; icon_state = "door_locked"; id_tag = "dock_three_fore_inner"; locked = 1; name = "Dock Three Internal Access"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D3)
 "dsL" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1379; id_tag = "dock_three_fore_airlock"; name = "Airlock Console"; pixel_y = 30; req_access = list(13); tag_airpump = "dock_three_fore_pump"; tag_chamber_sensor = "dock_three_fore_sensor"; tag_exterior_door = "dock_three_fore_outer"; tag_interior_door = "dock_three_fore_inner"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
 "dsM" = (/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1379; id_tag = "dock_three_fore_pump"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3)
@@ -9276,8 +9276,8 @@
 "dwt" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "eng_port_airlock"; name = "interior access button"; pixel_x = 0; pixel_y = -25; req_one_access = list(11,24)},/obj/effect/floor_decal/industrial/warning/corner,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
 "dwu" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
 "dwv" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/obj/effect/floor_decal/industrial/warning,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
-"dww" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
+"dww" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
-"dwx" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
+"dwx" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
 "dwy" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9; icon_state = "intact"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/camera/network/engineering{c_tag = "ENG - Hallway Starboard"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
 "dwz" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"},/obj/effect/floor_decal/industrial/warning/corner,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
 "dwA" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"},/obj/effect/floor_decal/industrial/warning,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "engineering_dock_airlock"; name = "interior access button"; pixel_x = 30; pixel_y = -25; req_one_access = list(13,11,24)},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/aft_hallway)
@@ -9387,11 +9387,11 @@
 "dyA" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_dock_south_starboard_outer"; locked = 1; name = "Escape Airlock"; req_access = list(13)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
 "dyB" = (/obj/effect/floor_decal/industrial/loading{dir = 4},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1380; id_tag = "escape_dock_south_starboard_pump"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dyC" = (/obj/machinery/atmospherics/pipe/manifold/hidden,/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{frequency = 1380; id_tag = "escape_dock_ssouth_airlock"; master_tag = "escape_dock"; pixel_y = -30; req_one_access = list(13); tag_airlock_mech_sensor = "escape_dock_south_starboard_mech"; tag_airpump = "escape_dock_south_starboard_pump"; tag_chamber_sensor = "escape_dock_south_starboard_sensor"; tag_exterior_door = "escape_dock_south_starboard_outer"; tag_interior_door = "escape_dock_south_starboard_inner"; tag_shuttle_mech_sensor = "shuttle_dock_south_starboard_mech"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
-"dyD" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "escape_dock_ssouth_airlock"; name = "interior access button"; pixel_x = -26; pixel_y = -26; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
+"dyD" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_dock_south_starboard_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
-"dyE" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_dock_south_starboard_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
+"dyE" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "escape_dock_ssouth_airlock"; name = "interior access button"; pixel_x = -26; pixel_y = -26; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dyF" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/machinery/atmospherics/pipe/manifold4w/hidden,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "arrivals_dock_south_airlock"; name = "interior access button"; pixel_x = 26; pixel_y = -26; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
-"dyG" = (/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/industrial/warning/cee{icon_state = "warningcee"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{frequency = 1380; id_tag = "arrivals_dock_south_airlock"; master_tag = "arrivals_dock"; pixel_y = -30; req_one_access = list(13); tag_airlock_mech_sensor = "arrivals_dock_south_mech"; tag_airpump = "arrivals_dock_south_pump"; tag_chamber_sensor = "arrivals_dock_south_sensor"; tag_exterior_door = "arrivals_dock_south_outer"; tag_interior_door = "arrivals_dock_south_inner"; tag_shuttle_mech_sensor = "shuttle_dock_south_mech"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
+"dyG" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "arrivals_dock_south_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
-"dyH" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "arrivals_dock_south_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
+"dyH" = (/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/industrial/warning/cee{icon_state = "warningcee"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{frequency = 1380; id_tag = "arrivals_dock_south_airlock"; master_tag = "arrivals_dock"; pixel_y = -30; req_one_access = list(13); tag_airlock_mech_sensor = "arrivals_dock_south_mech"; tag_airpump = "arrivals_dock_south_pump"; tag_chamber_sensor = "arrivals_dock_south_sensor"; tag_exterior_door = "arrivals_dock_south_outer"; tag_interior_door = "arrivals_dock_south_inner"; tag_shuttle_mech_sensor = "shuttle_dock_south_mech"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dyI" = (/obj/effect/floor_decal/industrial/warning/cee{icon_state = "warningcee"; dir = 4},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1380; id_tag = "arrivals_dock_south_pump"},/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "arrivals_dock_south_sensor"; pixel_x = 0; pixel_y = 25},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2)
 "dyJ" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "arrivals_dock_south_outer"; locked = 1; name = "Arrivals Airlock"; req_access = list(13)},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1380; master_tag = "arrivals_dock_south_airlock"; name = "exterior access button"; pixel_x = 4; pixel_y = 26; req_one_access = list(13)},/obj/machinery/mech_sensor{dir = 8; frequency = 1380; id_tag = "arrivals_dock_south_mech"; pixel_y = 19},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2)
 "dyK" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1; name = "Arrival Airlock"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D3)
@@ -9943,7 +9943,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaayaayaaeaaeaaFabtaaHaaaaaFabtaaHaaaaaFabtaaHaaaaaFabtaaHaaaaaFabtaaHaaaaaeaaaaaaaaaaaaaaeabuaaMaaMaaMaaMabqabvaaNaafaafaafaafaafaafaafaafaafaafaafaagabwabxabxabxabxaaiabxabxabyaagaafaafaafaafaafaafaafaafaaxaaKaaxaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaakaakaakaakaakaakaakaakaakaakaakaakaakaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaFabtaaHaaaaaFabtaaHaaaaaFabtaaHaaaaaFabtaaHaaaaaFabtaaHaaaaaeaaaaaaaaaaaeaaeaaiaawaawaawaaNabqabzaaNaafaafaafaafaafaafaafaafaafaafaafaagaaiabAabAabAabAabAabAabAaaiaagaafaafaafaafaafaafaafaafaaxabBaaxaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaakaakaakaakaakaakaakaakaakaakaakaakaakaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaFabtaaHaaaaaFabtaaHaaaaaFabtaaHaaaaaFabtaaHaaaaaFabtaaHaaaaayaaaaaaaaeaaeabCaaNaaNaaNaaNaaNabDabEaaNaaNaafaafaafaafaafaafaafaafaafaafaagaaiabAabAabAabAabAabAabAaaiaagaafaafaafaafaafaafaafaafaaxaaIaaxaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaakaakaakaakaakaakaakaakaakaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaeaaFabtaaHaaeaaFabtaaHaaeaaFabtaaHaaeaaFabtaaHaaeaaFabtaaHaaeaayaaaaaeaaeaaaabFabGabHabIabKabJabLabMabNaaNaafaafaafaafaafaafaafaafaafaafaagabAabAabAabAabAabAabAabAabAaagaafaafaafaafaafaafaafaafaaxaaKaaxaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakaakaakaakaakaakaakaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaeaaFabtaaHaaeaaFabtaaHaaeaaFabtaaHaaeaaFabtaaHaaeaaFabtaaHaaeaayaaaaaeaaeaaaabFabGabHabIabJabKabLabMabNaaNaafaafaafaafaafaafaafaafaafaafaagabAabAabAabAabAabAabAabAabAaagaafaafaafaafaafaafaafaafaaxaaKaaxaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakaakaakaakaakaakaakaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazaaaaaFabOaaHaaaaaFabOaaHaaaaaFabOaaHaaaaaFabOaaHaaaaaFabOaaHaaaaaeaaeaaeaaaaaaabPabGabQabRabSabTabqabUabNaaNaaNaaNaaNaaNaaNaafaafaafaafaafaagabAabVabWabXabYabZacaacbabAaagaafaafaafaafaafaafaafaafaaxaaKaaxaaxaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaccaaaaaeaaaaaaaaaaaeaaeaaeaaaaaeaaeaaeaaaaaaaaaaaaaaaaaaaaaaaeaaaaaeaaeaaaaaaaaNaaNaaNaaNaaNaaNacdabqaceaaNaaNacfacgachaciaaNaaNaafaafaafaafaagabAabVacjackaclackacmacbabAaagaafaafaafaafaafaafaafaafaaxaaKaaKaaxaaxaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaajaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaccaccaccaccacnaazaayaaeaaeaaeaayaaeaaeaaeaaeaaaaaaaaaaaeaaeaaeaazaaeaaaaaaaaaaaNacoacpacpacpacpacpacqacpacpacpacpacpacpacpacraaNaaNaafaafaafaagabAabVacjackacsackacmacbabAaagaafaafaafaafaafaafaafaafaaxaaKaaKaaKaaxaaxaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -9958,10 +9958,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafraaaaaaaaaafsaaaaaaaaaafsaafaafaafaftaeKafuaeKaftaeMafvaeMafwacuabraaNaaNaafacKafxafxafyafzafAafBafCafDafDacKaafaafaaNaaNaaNaaNaaNafEafFafGafGafHaevafIafJafKaaxaaxafLafLafLafLadPafMafNafOafPafQadPafRafSaeBacSafTafUafVafWafXaaiaaiaaiaaiaaiaaaaaaaaiaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafYafZafZagaaaaafragbagbagbafsagbagbagbafsaafaafaafaftaeKagcaeKaftaeMagdaeMafwacuabraaNaafaafacKageagfaggagfagfagfaghagiagjacKaafaafaafaafaafaafafGagkaglagmafGafGagnagoagpadJaalaafafLagqagragsadPafPagtaguagvagwadPagxagyagzacSadhagAagBafWagCaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaafragDagEafrafrafragFagGafrafragHagIagJagKafrafragLagMagNafsagOagPagQafsaafaafaafaftaeKagRaeKaftaeMagSaeMafwacuabraaNaafaafacKagTagTafyafzagUagVafCagWagWacKaafaafaafaafaafaafafGagXagYagZahaafEaevahbahcadJaafaafafLahdafLaheadPahfahgahhahfahgafLafLaaxahiacSacSahjacSacSacSaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiafrafrahkahlahmahnahoahpahqahrahsahtahuahuahvahwafragPagPagPafsahxagPagPafsaafaafaafaftahyahzahyaftahAahBahAafwacuahCaaNaafaafacKahDagiahEahFahGahHahIagfahJacKaafaafaafaafaafaafafGahKahLahMahNahOahPahbahQadJaafaafafLahRahTahSahUahVahWahXahYahZaiaafLaibaicaidaieaifaigaigaihaihaihaihaiiaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiafrafrahkahlahmahnahoahpahqahrahsahtahuahuahvahwafragPagPagPafsahxagPagPafsaafaafaafaftahyahzahyaftahAahBahAafwacuahCaaNaafaafacKahDagiahEahFahGahHahIagfahJacKaafaafaafaafaafaafafGahKahLahMahNahOahPahbahQadJaafaafafLahRahSahTahUahVahWahXahYahZaiaafLaibaicaidaieaifaigaigaihaihaihaihaiiaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiafraijaikailaimainaimaioaipaijaiqairairairaisaitafraiuaivaiwafsaixaivaiyafsaizaizaizaftaiAaiBaiCaftaiDaiBaiEaftaiFaiGaiGaafacKacKaiHaiHafyaiIaiJaiKaiLaiMaiNacKacKaafaafaafaafaafafGafGafGafGafGaiOaiPaiQaiRadJaafaafafLaiSaiTaiUaiVaiWaiXaiYaiZajaajbajcajdajdajeajfajgajhajiajjajkajlajmajnaaiaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaaiafrajoajpajqajpajrajsajqajpajoajtaisajuairajvajwafragbagPagbafsagbajxagbafsagbagbaiGaftaiGajyajzaftaiGajAajzaftajBajCaiGaafacKajDaiLaiLafyajEajFajGaiLaiLaiLaiLacKaafaafaafaafaafaafaiOajHajIajJaiOajKahbajLadJaafaafafLajMaiaaiaajNajOajPajQaiaaiaajRafLajSaibajTajUajVaibajWajXajYajZajmakaaaiaaiaaiaaiaaiaaiaaiaaiaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiafrakbajpajpakcakdakeakfakfakgakhakiakjakkaklakmaknakoakoakoakoakoakoakoakoakpakqakraksaktakuakvakwaktakxakyakzakAakBaiGaafacKakCakDaiLafyafzakEafBaiLakFakGakHacKacKacKacKacKaafaafaiOakIakJakKakLakMakNakOadJaafaafafLakPakRakQakSakTakUakRakQakPafLafLaihaihakVaihaihaihaihaihaihaihaihaihaihaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiafrakbajpajpakcakdakeakfakfakgakhakiakjakkaklakmaknakoakoakoakoakoakoakoakoakpakqakraksaktakuakvakwaktakxakyakzakAakBaiGaafacKakCakDaiLafyafzakEafBaiLakFakGakHacKacKacKacKacKaafaafaiOakIakJakKakLakMakNakOadJaafaafafLakPakQakRakSakTakUakQakRakPafLafLaihaihakVaihaihaihaihaihaihaihaihaihaihaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiafrakWakXakYakZalaalbalcaldalealfalgalhalialjalkafrallalmalnagPagPaloagPagPalpagPaiGalqalqalqalralsalqalqaltalualvakBaiGaafacKalwalxaiLafyaiLafCaiLaiLakGaiLaiLalyalzalAalAacKaafaafaiOalBalCalDaiOalEahbalFadJaafaafafLalGalHalIalJalKalLalMalNalOafLaafaafaihalPalQalQalQalQalQalRalSaihaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaaiaaialTalTalTalUalValWalValXalTalTafralYalYalZamaambamcamaalYalYafrafrafrafrafrafralYamdameameameameameagbamfalpagbaiGaiGamgamgaiGaiGaiGaiGalqamhamiaiGaiGaafacKamjamjaiLafyaiLamkamlamlammamlamlamnamoampamqacKaafaafamramramramraiOamsamtahcadJadJaafafLakPakPakPakSakTakUakPakPakPafLaafaafaihamuamvaihaihaihaihamuamwaihaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiamxamxamxamxamyamzamAamBamCamDamEamFamGamHamIamJamKamLamMamNamOamPamQamRamSamTamUamVamWamXamdamYamZanaanbameagbagbancagbandaiGaiGaiGaiGaafaafaiGaneanfangaiGaizaafacKaiLaiLaiLanhanianjaiLaiLankaiLaiLalyanlanmannacKaafamramranoanpanqanransantanuanvadJaafafLaiaanwahYakSakTakUanwahYanxafLaafanyanyanyanyanyanzanAaihaihamwaihaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -9974,7 +9974,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaubaubaubaubaubaubaubaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafarHarHarHaucaudaueaufarHapKaugaugauhaqFaqFauiapKaujaujaujaujaujaujaukaulaumaumaunaumaumaumaumauoaupauqaurausautauuauvapeapeauwatiauxauyatiauzauAatiauBauCauDauEauFauGauHalpauIagbagbagbauJatuagbauKartaryarzarnauLauMauNartauOauPauQauRartauSartauTauQartartartauRartartauUartauVartauWartauQauXaryauYauZavaavbavcavcavcavcavdaveavfavgasDasDasDavhaviavjavkavldHOavmaoGavnaihamvavoaihaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaubaubaubaubaubaubaubaubaubaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafarHarHavpavqavravravsavtarHaugaugaqFaqFavuavuavvavwavxavyavzavAavBavCavDavEavFavGavHavIavJaumaoTaoTaoTaoTaoTavKavLavMavNavOavPatiavQavRatiavSavTatiavUavVavWatratrafsavXavYagbagbavZagbagbagbagbarjawaaryarzarnawbarjarjarparqarrarjarjawcawdauKarjarjaweawfawfawfawgarjarjarjarjarjarjarjarjawharyauYarnawiarBarBarBarBarBarBarBarBarBarBarBarBarBarBanyawjaoGawkaoGaoGawkaihawlawmaihaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaubaubaubaubaubaubaubaubaubaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafarHarHawnawoawpavrawqavrarHawrawsaqFaqFawtawuawvawwawwawxawwawyawzawAawBawCawDawEawFawGawHaumawIawJawKawLawMawNawOavMawPawQawRatiawSatiatiatiawTatiatrawUatratrauGawVagPalpawWagPagPawXawYagPagParjarjawZaxaaxbarjarjaaiaaiaaiaaiaaiaxcaxcaxdaxcaxcaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafaafaxeaxeaxfaxgaxhaxearBaafaafaafaafaafaafaafaafaafaafaafaafaafanyanyanyanyanyanyanyaihaihaxiaihaihaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaubaubaubaubaubaubaubaubaubaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafarHarHaxjawoavravrawqaxkaxlaxmaxnaxoaxpaxqaqFaxraxsaxtaxuaxvaxwaxxaxyaxzaxAaxBaxCaxDaxEaxEaxFaxGaxHaxIaxJaxKaxLaxMaxNaxOaxPaxQaxRaxSaxTaxUaxWaxVaxYaxXaxZaJEaybauGaycaydalpagbayeagPagPagPagPagPayfaygaryarzarnarjaaiaaiaaiaaiaaiaaiaaiaxcayhayiaxcaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafayjaykaylaymaynaxeaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafayoaypayqayoaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaubaubaubaubaubaubaubaubaubaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafarHarHaxjawoavravrawqaxkaxlaxmaxnaxoaxpaxqaqFaxraxsaxtaxuaxvaxwaxxaxyaxzaxAaxBaxCaxDaxEaxEaxFaxGaxHaxIaxJaxKaxLaxMaxNaxOaxPaxQaxRaxSaxTaxUaxVaxWaxXaxYaxZaJEaybauGaycaydalpagbayeagPagPagPagPagPayfaygaryarzarnarjaaiaaiaaiaaiaaiaaiaaiaxcayhayiaxcaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafayjaykaylaymaynaxeaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafayoaypayqayoaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaubaubaubaubaubaubaubaubaubaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafarHarHarHarHawoayraysaytarHarHayuayvaywayxaqFaqFayyawwawwayzawwayAayBayCayDayEayFayGayHayIayJaumayKayLayMawLayNayOayPayQayRaySayTayUayVayWayXayYayVayZazaazbazcazdazeazfazgazhagbagPagPaziaygaygaygaygaygaryarzazjarjaaiaaiaaiaaiaaiaaiaaiaxcazkayiaxcaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafazlazmaznazoazpaxeazqazqazqazqazqazqazqazqazqazrazrazrazrazrazrazrazrazrazrazrazrazrazrazsaztayoayoaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaubaubaubaubaubaubaubaubaubaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafarHarHazuazvawoazwazxawqazyarHazzazAazBazCazDazEazCazFazGayzazHazIazJazKazLazMazNazOazPazQazRaumawLazSawLazTazUazVazWazXazYazZaAaazXaAbaAcaAbazXaAbaAdaAbaAeatiaAfagbaAgaAhaAiagbaAjaziaygaygaAkaAlaAmaygaAnarmarnaAoaAoaAoaAoaAoaaiaaiaaiaxcayhaxcaxcaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaApaAqaAraAsaAtaxeaAuaAvaAwaAxaAyaAzaAAaABaAuazraACaACaADaAEaAFaAGaAHaAGaAIaAEaADaAJazrayoaAKaALayoaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaubaubaubaubaubaubaubaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafarHarHaAMaANaAOaAPaAPawqaAQaARaASaxzaATazCazzaAUazCaAVaAWaAXaAYaAZaBaaBbaBcaumaBdaBeaBfaBgaBhaumaBiaBjaBkaBlaBmaBnaBoazXaBpaBqaBrazXaBsaBtaBuazXaBsaBqaBuaAeaafaafagbaBvaBwaBxagbagPaygaygaByaBzaBAaBBaBCaryarzaBDaAoaBEaBFaBGaAoaAoaaiaaiaxcayhaxcaaiaaiaBHaBHaBIaBJaBJaBJaBKaBJaBJaBJaBJaBLaBHaBMaBNaBOaBPaxeaBQaBRaBSaBRaBTaBRaBSaBRaBUazraBVaBWaBVaBVaBVaBVaBVaBVaBVaBVaBVaBVaBXayoaAKaBYayoayoayoayoayoaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -10000,7 +10000,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaubaubaubaubaubaaaaaaaaaaaaaaaaaaaaaaubaubaubaubaubaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaMxaMxaMxaMxaMxaMxaULaUMaafaMxaUNaUNaUNaMxaafaafaafaafaUOaUPaUQaUQaUQaUQaUQaURaUOaaiaOzaOzaUSaUTaUUaOzaOzaOzaUVaUWaUXaOzaOzaafaafaafaafaafaUYcuEaVacvgaUYaafaafaafaafaafaOzaVcaVdaVcaOzaaiaaiaaiaaiaaiaaiaaiaaiaVeaVfaVgaVhaVeaaiaaiaaiaaiaaiaaiaaiaaiaOIaOIaViaVjaVkaOIaOIaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaxeaPSaPSaxeaafaafaafaafaVlaVlaVmaVlaVlaafaPXaPXaUEaVnaUEaUEaUEaUFaVoaVpaVqaVraUKaUEaAKaVsayoaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaUMaVtaVuaUMaafaVvaVwaVxaVyaVvaafaafaafaafaUOaVzaVAaVBaVCaVDaVEaUQaUOaaiaaiaVFaVGaVHaVIaVFaaiaOzaPAaOBaOCaOzaafaafaVJaVJaVJaVJaVKaVKaVLaVKaVKaVMaVMaVMaVMaafaVcaVNaVOaVcaaiaaiaaiaaiaVPaVQaVRaVSaVPaVPaVTaVUaVVaVPaVPaVQaVRaVSaVPaaiaaiaaiaaiaVWaUsaUtaPOaVXaVYaVYaVZaWaaWbaVYaVYaVYaVYaVYaVYaVYaWcaVYaVYaafaafaafaafaafaVlaWdaWeaVlaafaafaUEaWfaWgaWhaWiaWjaWkaWlaWmaWnaWnaWoaUEaWpayoaalaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaUMaUMaUMaUMaUMaUMaUMaUMaUMaUMaWqaVuaUMaafaVvaWraWsaWtaVvaafaafaafaafaUOaWuaWvaWwaWxaWyaWzaWAaUOaaiaaiaWBaWCaWDaWEaWFaaiaaiaaiaaiaaiaafaafaafaVJaWGaWHaWIaVKaWJaWKaWLaVKaWMaWNaWOaVMaafaVcaVNaWPaVcaaiaaiaaiaWQaVSaWRaWSaWTaWUaWVaWWaWXaWYaWZaXaaXbaXcaXdaVQaXeaaiaaiaaiaXfaUsaUtaPOaXgaXhaXiaXjaXkaXlaXmaVYaXnaXoaXpaXqaXraXsaXtaVYaVYaafaafaafaafaVlaXuaXvaVlaafaafaUEaXwaXxaWnaXyaXzaWnaXAaXBaWnaXCaXDaUEaXEaVlaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaaaaaaaXFaaaaaaaaaaXFaaaaaaaaaaaaaaaaXFaaaaaaaaaaXFaaaaaaaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaafaaoaUMaUMaXGaXGaXGaXGaXGaXGaXGaXGaXGaXHaXIaUMaafaVvaXJaXKaXLaVvaafaafaafaafaUOaXMaWvaXNaXOaXPaWzaXQaUOaXRaXSaXTaXUaXVaXWaWFaaiaaiaaiaafaafaafaafaafaVJaXXaXYaXZaYaaYbaYcaYdaYeaYfaYgaYhaVMaafaVcaVcaVOaVcaaiaaiaWQaYiaYjaYkaYlaYmaYmaYnaYoaYpaYoaYqaYraYsaYtaYuaYjaYvaXeaaiaaiaYwaYxaYyaYzaYAaYBaYCaYCaYCaYCaYDaYEaYFaYGaYHaYIaYIaYIaYJaYKaVYaafaafaafaafaVlaWdaYLaVlaafaafaUEaYMaYNaYOaYQaYPaYSaYRaYTaYUaYVaXDaUEaXEaVlaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaaaaaaaXFaaaaaaaaaaXFaaaaaaaaaaaaaaaaXFaaaaaaaaaaXFaaaaaaaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaafaaoaUMaUMaXGaXGaXGaXGaXGaXGaXGaXGaXGaXHaXIaUMaafaVvaXJaXKaXLaVvaafaafaafaafaUOaXMaWvaXNaXOaXPaWzaXQaUOaXRaXSaXTaXUaXVaXWaWFaaiaaiaaiaafaafaafaafaafaVJaXXaXYaXZaYaaYbaYcaYdaYeaYfaYgaYhaVMaafaVcaVcaVOaVcaaiaaiaWQaYiaYjaYkaYlaYmaYmaYnaYoaYpaYoaYqaYraYsaYtaYuaYjaYvaXeaaiaaiaYwaYxaYyaYzaYAaYBaYCaYCaYCaYCaYDaYEaYFaYGaYHaYIaYIaYIaYJaYKaVYaafaafaafaafaVlaWdaYLaVlaafaafaUEaYMaYNaYOaYPaYQaYRaYSaYTaYUaYVaXDaUEaXEaVlaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoaaoaUMaXGaXGaYWaUMaUMaUMaUMaUMaUMaUMaUMaUMaUMaafaVvaYXaYYaYZaVvaafaafaafaafaUOaZaaZbaZcaZcaZcaZdaZeaZfaZgaZhaZgaZiaZjaZkaWFaaiaaiaafaafaafaafaafaafaVJaZlaZmaZnaVKaZoaZpaZqaVKaZraZsaZtaVMaafaafaVcaVOaVcaaiaVPaZuaYjaZvaYlaYnaYoaYoaZwaZxaZyaZzaZAaYoaYoaYqaZBaYuaYjaZuaVPaaiaOIaZCaZDaZEaZFaZGaZHaZIaZJaZIaZKaVYaZLaZMaZNaZOaZOaZPaZQaZRaVYaZSaZSaZSaZSaVlaZTaZUaVlaalaalaUEaYMaZVaWnaZWaZXaZYaZZaUEaUEaUEaUEaUEaXEaVlaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoaaoaaobaaaXGbabaUMaUMaafaafaafaafaafaafaafaafaafaafaVvaVwbacaVvaVvaafaafaafaafaUObadbaebafbagbahbaibajbakbalbambalbanbaobapaWBaaiaaiaafaafaafaafaafaafaVJbaqbarbasbatbatbaubatbatbavbawbaxaVMaafaafaVcaVOaVcaaibaybazaZvaYlaYnaYoaYoaYoaYoaYoaYoaYoaYoaYoaYoaYoaYqaZBbaAbaBbayaaiaOIbaCbaDaPOaXgaXhbaEbaFbaGbaGbaHaVYbaIbaJbaKaVYbaLbaMbaNbaOaVYbaPbaQbaRaZSbaSbaTaWdaWdbaUbaVaVlaVlaVlbaWaVlaVlaVlaVlaVlaalaafaafaVlaXEaVlaVlaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaoaaoaaobaXbaYaUMaalaafaafaafaafaafaafaafbaZbaZbaZbaZbaZbbabbbbbcbbdaafaafaafaafaUObbebbfbbgbbhbbibbhbbjbbkbblbbmbblaVGaZjbbnbbobbpbbpbbpbbpbbpaafaafaafaVJaVJaVJaVJbatbbqbbrbbqbataVMaVMaVMaVMaafaafaVcaVOaVcaaibbsbbtaYlaYnaYobbuaYobbvbbwaYoaYoaYobbxbbyaYobbuaYoaYqbbzbbAbbsaaiaVWbbBbbCaPOaOIaVYaVYaVYaVYaVYaVYaVYaVYaVYaVYaVYaVYaVYaVYaVYaVYbbDbbEbbFaZSbaSbaTaWdaWdbbGaWdaWdbbHbbIbbIbbJaZTaWdaWdaWdaVlaalaafaVlaXEbbKaVlaVlaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -10008,12 +10008,12 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaX
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaUMbcFaUMaafaafaafaafaafaafaafaafbaZbcGbcHbcIbaZbcJbcKbcLbbdaafaafaafaafaafaUOaUObcMbcNbcOaUOaUOaaiaaiaaibcPbcQaZjbcRbbobcSbcTbcUbcVbbpbbpaafaafaafaafbatbcWbcebcXbcYbcZbcebdabataafaafaafaafaVcaVOaVcaaiaVPbdbbdcbddaYobcibdebdfaYobdgbdgbdgaYobdhbdibdjaYoaYobdkbdlaVPaaiaYwaUsbbCbdmaOIaafaafbcnbdnbdobdpbdqbdrbdsbdtbdtbdubdvbdwbdxbdybdzbdAbdBaZSbaSbaTaVlbdCbdCbdCbdCbdDbdDbdEbdDbdDbdDbdDaWdaWdaWdaWdaWdbdFbdGaWdaVlaafaafaafaafaafaafbdHbdHbdHbdHbdHbdHbdHaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaUMaXGaUMaafaafaafaafaafaafaafaafbaZbdIbcHbdJbaZbdKbdLbdMbbdaafaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaXTaXTbdNaZjbdObbobbpbdPbdQbdRbdSbbpaafaafaafaafbatbdTbcebbqbdUbbqbcebdVbataafaafaafaVcaVcaVOaVcaaiaVPbdWbdXbdYaYobdZaYoaYobeabebbecbedbeeaYoaYobdZaYobefaYqbegaVPaVeaOIbehbeibejaOIaOIaafbcnbekbelbembenbeobepbeqberbesbetbeubevbewbexbexbexbexbexbexbeybeybeybeybeybdDbezbeAbeBbeCbeDbdDbeEbeEbeEbeEbeEbeEbdFbdGaVlaafaafaafaafaafbdHbdHbeFbeGbeHbeGbeIbdHbdHaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaUMaXGaUMbeJbeJbeJbeJbeJbeJbeJbeJbaZbeKbeLbeKbaZbeMbcKbeNbeObeObeObeOaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaVFbePaWCbeQbeRbeSbbpbeTbdQbdRbeUbbpaafaafaafaafbatbeVbeWbeXbeYbeZbcebeVbataafaafaafaVcaVNaVOaVcaaibaybfabfbaYoaYoaYoaYobfcbebbaBaXdbaBbedbfbaYoaYoaYobfdaYobfebffbfgbfhbfibbCaPObfjaOIaafbcnbfkbflbembfmbfnbfnbfnbfnbfobfpbeubfqbfrbexbfsbftbfubfvbexbfwbfxbfxbfybeybfzbeAbeAbfAbfAbeAbfBbeEbfCbfDbfEbfFbeEaWdaXEaVlaafaafaafaafaafbdHbfGbfHbfIbfJbfKbfLbfGbdHaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaafaafaafaafaafaafaafaafaUMaUMaXGbfMbfNbfObfPbfRbfQbfSbfTbfUbfNbfVbfWbfXbfYbbPbcKbfWbeObfZbgabeObeObeOaafaafaaiaaiaaiaaiaaiaaiaaiaWFcvpaVGbgcbgdbalbgebgfbggbdRbeUbbpaafaafaafaafbatbghbgibgjbgkbglbgmbgnbataafaafaafaVcbgoaVOaVcaaibbsbgpbfbaYoaYoaYoaYobfcbbAaXdbgqaXdbbtbfbaYoaYoaYobgrbgsbgsbgtbgubgvbgwbgxbgybgzaOIaafbcnbdnbgAbgBbcnbgCbgDbgEbgFbgGbcvbgHbfqbgIbexbgJbgKbgLbgMbexbgNbgObgPbgQbeybgRbgSbgTbgUbgVbgWbgXbeEbfCbgYbgZbhabeEbhbbhcaVlaafaafaafaafaafbdHbhdbhebhfbhgbhfbhebhhbdHaafaafbdHbdHbdHbdHbdHaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaafaafaafaafaafaafaafaafaUMaUMaXGbfMbfNbfObfPbfQbfRbfSbfTbfUbfNbfVbfWbfXbfYbbPbcKbfWbeObfZbgabeObeObeOaafaafaaiaaiaaiaaiaaiaaiaaiaWFcvpaVGbgcbgdbalbgebgfbggbdRbeUbbpaafaafaafaafbatbghbgibgjbgkbglbgmbgnbataafaafaafaVcbgoaVOaVcaaibbsbgpbfbaYoaYoaYoaYobfcbbAaXdbgqaXdbbtbfbaYoaYoaYobgrbgsbgsbgtbgubgvbgwbgxbgybgzaOIaafbcnbdnbgAbgBbcnbgCbgDbgEbgFbgGbcvbgHbfqbgIbexbgJbgKbgLbgMbexbgNbgObgPbgQbeybgRbgSbgTbgUbgVbgWbgXbeEbfCbgYbgZbhabeEbhbbhcaVlaafaafaafaafaafbdHbhdbhebhfbhgbhfbhebhhbdHaafaafbdHbdHbdHbdHbdHaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaabhibhjabxabxbhkbhjbhiaafaafaafaafaafaafaUMbhlaXGbhmbfNbhnbhobhpbhqbhrbhsbhtbhubhvbhwbhxbhybhzbhAbhBbeObhCbhDbhEbhFbeOaafaafaafaaiaaiaaiaaiaaiaaiaWBbhGbhHbhIbeRbblbhJbhKbhLbdRbeUbbpaafaafaafaafbhMbhMbhMbhMbhNbhMbhMbhMbhMaafaafaafaVcbhOaVOaVcaaiaZubfabfbaYoaYoaYoaYobfcbhPbaBaXdbaBbhQbfbaYoaYoaYobhRaYoaYobhSaVhbhTaUsbbCaPObhUaOIaafbcnbhVbhWbhXbcnbcvbcvbcvbcvbhYbcvbhZbiabibbexbicbidbiebifbexbigbihbiibijbeybikbilbimbinbiobipbiqbirbisbitbiubivbeEaWdbiwaVlaafaafbdHbdHbdHbdHbixbiybixbizbixbiAbixbdHbdHbdHbdHbiBbiCbiDbdHbdHaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhjbiEbiFbiGbiFbiEbhjaaiaafaafbhjbhjbhjbiHbiIaXGaXGbfNbiJbiKbfRbiLbiMbiNbiObfNbiPbbbbiQbiRbiSbiTbiUbeObiVbiWbiXbiXbeObiYbiYbiYbiYaaiaaiaaiaaiaaiaXTaXTbiZbjabjbbbobbpbjcbhLbdRbjdbbpaafaafaafbhMbhMbhMbhMbjebjfbjebhMbhMbhMbhMaafaafaVcaVcaVOaVcaaiaVPbjgbcgbchaYobjhaYoaYoaZBbhPbjibhQaYlaYoaYobjhaYobjjbjkbjlaVPaVeaOIaVibjmaVkaOIaOIaafbcnbjnbjobjpbcnbjqbjrbjsbjtbjubjvbjwbfqbjxbexbexbjybjzbjAbexbjBbjCbjDbjEbeybjFbfAbeAbjGbeAbeAbjHbeEbgZbjIbeEbjJbeEbjKaXEaVlaafbdHbdHbfGbjLbixbjMbjNbjObjPbjQbjNbjObjRbizbjSbjTbjQbjUbjObjVbdHbdHaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhjbiEbiFbiGbiFbiEbhjaaiaafaafbhjbhjbhjbiHbiIaXGaXGbfNbiJbiKbfQbiLbiMbiNbiObfNbiPbbbbiQbiRbiSbiTbiUbeObiVbiWbiXbiXbeObiYbiYbiYbiYaaiaaiaaiaaiaaiaXTaXTbiZbjabjbbbobbpbjcbhLbdRbjdbbpaafaafaafbhMbhMbhMbhMbjebjfbjebhMbhMbhMbhMaafaafaVcaVcaVOaVcaaiaVPbjgbcgbchaYobjhaYoaYoaZBbhPbjibhQaYlaYoaYobjhaYobjjbjkbjlaVPaVeaOIaVibjmaVkaOIaOIaafbcnbjnbjobjpbcnbjqbjrbjsbjtbjubjvbjwbfqbjxbexbexbjybjzbjAbexbjBbjCbjDbjEbeybjFbfAbeAbjGbeAbeAbjHbeEbgZbjIbeEbjJbeEbjKaXEaVlaafbdHbdHbfGbjLbixbjMbjNbjObjPbjQbjNbjObjRbizbjSbjTbjQbjUbjObjVbdHbdHaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabjWbiFbjXbjYbjYbiFbjZbkabhjbhjbhjbkbbkcbhjbhjbkdbhjbfNbfNbfNbfNbfNbfNbfNbfNbfNbkebcKbkfbbdbkgbbdbkgbeObiVbkhbkibkjbiXbkkbklbkmbiYbknbkobkpbiYaaiaaiaVFaVGaZjbeRbbobkqbkrbksbktbbpbbpaafaafaafbhMbhMbkubkvbkwbkxbkybkzbkAbhMbhMaafaafaafaVcaVOaVcaaiaVPbkBbkCbkDaYobdibdjbkEaYoaYmaYmaYmaYobkEbcibdeaYoaYobkFbkGaVPaaiaVWaUsaUtaPOaOIaafaafbcnbkHbkIbkJbkKbkLbkMbkNbkNbkObkPbkQbkRbkSbkTbexbkUbkVbkWbexbkXbkYbkZblabeyblbblcbldblebeAblfblgbeEblhblibeEbljbeEblkaXEaVlaafbdHbllblmblnbloblpblqblpblrblpblsbfIbltbizblublvblwblxbfIblyblzbdHaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxbiGblAblBblBbiGblCblDblEblFblGblHblIblJblKblLblMblNblOblPblQblRblSblRblTblUblVblWblXbbdblYblZbmabiXbiXbmbbmcbmdbiXbmebmfbmfbmgbmhbmibmjbiYaaiaaiaWFaVGaZjbmkbbobkrbkrbmlbmmbbpaafaafaafbhMbhMbmnbmobmpbmqbmrbmqbmsbmtbmubhMbhMaafaafaVcaVOaVcaaibaybbtbdXbdYaYoaYobdibdjaYoaYoaYoaYoaYobbvbcjaYoaYoaYobclbmvbayaaiaXfaYxbmwbmxaOIaafaafbcnbekbmybembmzbmAbmBbmCbmDbmEbmFbeubfqbmGbmHbexbmIbmJbmIbexbmKbmLbmMbmNbeybdDbmObmPbmQbmObmPbmRbmRbmRbmRbmRbmRbmRbmRaXEaVlaafbdHbmSbmTbmUbixbmVbjNbmWbmXbmYbmZbjUbjObixbjQbjUbnabnbbmVbncbndbdHaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabneabxbiFbnfblBblBbngbnhbnibnkbnjbnmbnlbnnbnobnpbnqbnrbnsbntbnubnvbnwbnxbnybnzbnAbnBbdLbfWbnCbnDbnDbnDbnEbiXbiXbnFbiXbiXbnGbnHbnIbnIbnIbnJbnKbiYaaiaaiaWFaVGaZjbcRbbobbpbbpbbpbbpbbpaafaafaafbhMbhMbnLbnMbnNbnObnObnObnNbnMbnPbhMbhMaafaafaVcaVOaVcaaibbsbbtbeebnQaYobbuaYobdibbwaYoaYoaYobbxbcjaYobbuaYobjkbnRbmvbbsaaiaYwaUsaUtaPObnSaaiaafbcnbnTbnUbembnVbnWbnXbnYbnYbnZboabobbocbodbodboebofbogbofbohbofboibojbokbolbombonbokboobopboqbmRborbosbotboubovbowbmRaXEaVlaafbdHboxboybozbizboAboBboCbdHboDboEboFboFboGboHboFboIboJboKbncboLbdHaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabneabxbiFbnfblBblBbngbnhbnibnjbnkbnlbnmbnnbnobnpbnqbnrbnsbntbnubnvbnwbnxbnybnzbnAbnBbdLbfWbnCbnDbnDbnDbnEbiXbiXbnFbiXbiXbnGbnHbnIbnIbnIbnJbnKbiYaaiaaiaWFaVGaZjbcRbbobbpbbpbbpbbpbbpaafaafaafbhMbhMbnLbnMbnNbnObnObnObnNbnMbnPbhMbhMaafaafaVcaVOaVcaaibbsbbtbeebnQaYobbuaYobdibbwaYoaYoaYobbxbcjaYobbuaYobjkbnRbmvbbsaaiaYwaUsaUtaPObnSaaiaafbcnbnTbnUbembnVbnWbnXbnYbnYbnZboabobbocbodbodboebofbogbofbohbofboibojbokbolbombonbokboobopboqbmRborbosbotboubovbowbmRaXEaVlaafbdHboxboybozbizboAboBboCbdHboDboEboFboFboGboHboFboIboJboKbncboLbdHaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaayaazaayaayaayaayaayaayaayaazaayaayaayaazaayaayaayaayaaaaaaaayaayaayaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboMaaeaaiabxbiGboNblBblBbiGboOboPboQboRboSboTboUbhjbhjbkdbhjbhjbhjbhjbhjbhjbhjbhjbhjbbdbiPbcKbfWboVboWboXbnDboYbkgboZbpabpbbpcbpdbpebpfbpgbphbpibpjbiYaaiaaiaWFbpkbplbpmaVFaaiaaiaaiaaiaaiaaiaafaafbhMbpnbpobnMbnNbppbpqbppbnNbnMbprbpsbhMaafaafaVcaVOaVcaaiaZubptbpubeebnQaYoaYoaYoaYoaYoaYoaYoaYoaYoaYoaYobjkbeabpvbpwaZuaaiaOIbpxaUtbpybpzaaiaaibcnbdnbjobpAbcnbpBbpCbpDbpEbpFbjvbpGbpHbpIbpJbpKbpLbpMbpLbpLbpLbpNbpObpPbpQbpRbpSbpRbpTbpRbpRbpUbpVbpWbpXbpYbpZbpZbmRaXEaVlaafbdHbmSbqabmUbixbjQbqbbqcbqdbqebjUbjUbqfbixbqgbjUbqhbqibjQbncbqjbdHaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaayaaaaaeaaaaaaaaaaaaaaeaaeaaaaaaaaeaaeaaaaaeaaeaaeaaaaaeaaeaaeaaaaayaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqkaaiaaibqlbiFbjXbqmbqnbiFbqobkabhjbhjbhjbqpbkabhjbqqbqrbqsbqtaafbqubqvbqwbqxbqybqzbqAbqBbcKbqCbbdbqDbqEbqFbqFbqGbqHbqIbqJbpcbqKbpebqLbqMbqNbpibqObqPaaiaaiaWFaVGaZjbeRaWFaaiaaiaaiaaiaaiaaiaafaafbhMbhMbnLbnMbqQbnObqRbnObnNbnMbnPbhMbhMaafaafaVcaVOaVcaaiaVPbayaYjbqSbeebnQbqTbddbqUaYoaYoaYobqTbddbqUbjkbeabpvaYjbayaVPaaiaVWaUsbbCaPObpzaaiaaibcnbcnbqVbcnbcnbjvbjvbjvbqWbqWbqWbqWbqXbqYbqWbqWbqZbrabrbbrcbrcbrdbrebrabrfbrgbrhbribrjbrkbrlbmRbrmbrnbrobrpbrobrqbmRaXEaVlaafbdHbrrbrsblnbrtblpbrublpbrvbjUbrwbjUbrxbizbrybfKbrzbrAbrBbrCbrDbdHaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaXFaaaaaaaayaaabrEbrFbrGaaabrEbrFbrGaaabrEbrFbrGaaabrEbrFbrGaaabrEbrFbrGaaaaayaaeaaeaaaaaaaaaaaaaaaaaabrHbrIbrJbrKaaaaaabrLbrMbrNbrLbrLbrObiEbiFbiGbiFbiEbhjaaiaaiaaiaaiaaiaaibrHbrPbrQbrRbqtaafbqubrSbrTbrUbrVbrWbrXbrYbrZbsabnCbsbbscbsdbnDbsebbPbsfbsgbshbsibsjbskbskbskbslbsmbsnaaiaaiaWFaVGaZjbeRaWFaaiaaiaaiaaiaaiaafaafaafbhMbhMbsobspbsqbnObnObnObsrbssbstbhMbhMaafaafaVcaVOaVcaaiaaiaYvaXeaYjbqSbeebsubsvbswbdgbdgbdgbsubsvbswbeabpvaYjaWQaYiaaiaaiaXfbaCbaDbsxbpzaaiaaibsybszbsAbsBbsCbsDbsEbsFbqWbsGbsHbsIbsJbsKbsLbsMbsNbsObsPbsQbsRbsSbrebsTbsUbsVbsWbsXbsYbsVbsXbmRbsZbtabtbbtcbtdbtebmRaXEaVlaafbdHbdHbfGbtfbixbmVbtgbjUbjNbjUbjUbrCbthbizbtibtjbtkbtlbqfbtmbdHbdHaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -10078,31 +10078,31 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafbJSbJSaafaafaafaafaafaafaafaafaafabxabxaaiaaiaaiabxabxcXLcXMcXNcVacXOcVacXPcXQcXRcXScVacVacXTcXUcXVcXWcXXcXYcXZcSscYacYbcYccYdcYecYfcYgcYhcYicYjcYkcSDcWScYlcYmcTNcYncTNcYocYpcYqcRcaaiaaicyLcXbcyLaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafaafaafaafaafaafaafaafaafcCicYrcYscPUcYtcYucYvcSVcYwcYucVJcYxcYycYzcUlcYxcVJcYucYucYAcSVcYwcYBcPUcYCcYDcDwaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaicYEcTmcXmcYEaaiaaiaaiaafaafcXncXncYFcYGcXnaafcUqcUqcYHcYIcYJcYKcYLcYMcUqcUAcUAcUAcYNcYOcYOcYPcYQcYRcYScYTcYUcYVcYWcYXcYOcYOcYYcUAcUAcUAcULcYZcZacZbcZccZdcZecULcULaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafabxcMVcMVcMVcMVcMVabxcXLcXMcZfcZgcZhcZicZjcZkcZlcZmcVacVacZncZocZpcPAcZqcZrcZqcSscZscZtcZucZvcZvcZwcVlcTJcZxcZycZzcZAcWScZBcZCcZDcZEcZFcZBcZBcZBcRcaaiaaicyLcZGcyLaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafaafaafaafaafaafaaicCicZHcYscPUcZIcSVcUmcSVcSVcSVcZJcUicUjcUkcUlcUicZJcSVcSVcUgcSVcSVcZKcPUcYCcZLcDwaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaicTkcZMcZNcTkaaiaaiaaiaaiaafcXncZOcZPcZQcXnaafaafcUqcZRcZScZScZScZTcUqcUqaafaafcUAcUAcZUcZVcZVcZWcUAcZXcZYcZZcUAcUAcUAcUAcUAcUAcUAdaadaacULcULcULcULcULcULcULcULaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaaicMVdabdabdacdaddaedafdagdahdaicXOcVacXOcXQdajdakcVacVadajdaldamdancWAdaodapdaqdarcTIcTIcTIcTIcTIdascVmdatcZydaucSDdavdawdaxdaydazdaAdaBdaCdaDdaEaaiaaicyLcXbcyLaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaaiaaiaaiaaiaaiaaicCidaFcJecPUcSVcSVdaGcTfcTfcTfcTecTddaHdaIdaJcSZcSYcSXcSXdaKcSVcSVcSVcPUcJzdaLcDwaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaicXlcTmdaMcXlaaiaaiaaiaaiaaicXndaNcZPdaOcXnaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafaaiaaiaaiaaiaaidaPdaQdaRdaScUAaafaafaafaafaafdaTdaUdaVdaTaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaicMVdaWdaXdaYcSkaaicXLdaZdbadbbdbcdbdcXOdbedbfdbhdbgdbidbjdbkdbbcVacVadbldbmdbndbodbpdbpdbqcTIdbrdbscSsdbtdbudbvcSDdbwdbxdbydaydbzdbAdbBdbCdbDdaEcyLcyLcyLcXbcyLdbEdbEdbFdbGdbHdbEdbEdbFdbGdbHdbEdbEaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaicCicCidbIcCicPUdbJdbKdbLdbMdbNcSVcRncUicUjcUjcUlcUicRncSVdbNdbMdbOdbPdbQcPUcDwdbRcDwcDwaaiaaiaaiaaiaaiaaiaaiaaiaaiaaicYEcTmdaMcYEaaiaaiaaiaaiaaicXncXndbScXncXnaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafaaiaaiaaiaaiaaiaaidbTdbUdbVdbWcTkaafdaTdaTdaTdaTdaTdbXdbYdaTdaTdaTdaTdaTaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaicMVdaWdaXdaYcSkaaicXLdaZdbadbbdbcdbdcXOdbedbfdbgdbhdbidbjdbkdbbcVacVadbldbmdbndbodbpdbpdbqcTIdbrdbscSsdbtdbudbvcSDdbwdbxdbydaydbzdbAdbBdbCdbDdaEcyLcyLcyLcXbcyLdbEdbEdbFdbGdbHdbEdbEdbFdbGdbHdbEdbEaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaicCicCidbIcCicPUdbJdbKdbLdbMdbNcSVcRncUicUjcUjcUlcUicRncSVdbNdbMdbOdbPdbQcPUcDwdbRcDwcDwaaiaaiaaiaaiaaiaaiaaiaaiaaiaaicYEcTmdaMcYEaaiaaiaaiaaiaaicXncXndbScXncXnaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafaaiaaiaaiaaiaaiaaidbTdbUdbVdbWcTkaafdaTdaTdaTdaTdaTdbXdbYdaTdaTdaTdaTdaTaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafabxcMVdabdabdbZdcadaedcbdccdcddcedcfdcgdchdcidcjdcjdcjdcfdcfdckdclcVacVadcmdcncSscSsdcodcpdcqdcrdcodcpdcsdctdcudcvcSDdcwdcxdcydaydczdcAdcBdcCdcDdaEdcEdcFdcFdcGcDedbEdcHdcIdcJdcKdcLdcMdcIdcNdcIdcIdbEdbEdcOdcPdcPdcPdcPdcPdcQdcRdcOdcQdcRdcRdcSdcTdcUcPUcPUcPVcPWcPXcPUcPUcPUdcVdcWdcXcQadcVcPUcPUcPUcPVcPWcPXcPUcPUdcUdcYdcZdcRdcRddaddbddbddbddccTkcTkcTkdddcTkddeddfcTkddaddbddbddccTkcTkcUoddgddhcTkcTkcTkcTkddaddbddbddccTkcTkcTkcTkcTkcTkcTkddaddbddbddccTkddiddjddkcTkdaTdaTdaUddlddlddmddlddnddlddoddpdaUdaTdaTaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafabxcMVcMVcMVcMVcMVabxddqddrddsdbbddtdducXOcXQddvddvddwdajdbcddxddydcjddzddAddBddCddDddEddFddGddHddIddJddKddJddLddMcSDddNdbxcSBddOddPddQddRddSddTdaEcXbcDeddUcDecDeddVddWddXddYddZddWdeaddYdebdecdeddeedefdegdehdegdegdeidegdejdekdegdegdeldemdendeodepdeqdeldegderdegdehdesdetdegdegdegdeudegdevdewdehdegdegdegdeldegdepdexdeydeydezdeBdeAdeBdeCdeBdeDdeFdeEdeBdeAdeBdeGdeBdeBdeBdeHdeBdeIdeAdeJdeLdeKdeEdeIdeBdeMdeBdeBdeNdeBdeBdeOdeDdeEdeBdeBdePdeBdeBdeAdeBdeIdeQdeRddkdeSdaTdeTdaUddlddldeUdeVddnddlddlddldaUdaUdaTaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafabxcMVcMVcMVcMVcMVabxddqddrddsdbbddtdducXOcXQddvddvddwdajdbcddxddydcjddzddAddBddCddDddEddFddGddHddIddJddKddJddLddMcSDddNdbxcSBddOddPddQddRddSddTdaEcXbcDeddUcDecDeddVddWddXddYddZddWdeaddYdebdecdeddeedefdegdehdegdegdeidegdejdekdegdegdeldemdendeodepdeqdeldegderdegdehdesdetdegdegdegdeudegdevdewdehdegdegdegdeldegdepdexdeydeydezdeAdeBdeAdeCdeAdeDdeEdeFdeAdeBdeAdeGdeAdeAdeAdeHdeAdeIdeBdeJdeKdeLdeFdeIdeAdeMdeAdeAdeNdeAdeAdeOdeDdeFdeAdeAdePdeAdeAdeBdeAdeIdeQdeRddkdeSdaTdeTdaUddlddldeUdeVddnddlddlddldaUdaUdaTaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafabxcMVdeWdeWdeXdeYdfadeZdfbdbgdfcdfdcVacXOcXQdfedffdfgdbedbfdfhdbgdbidfidfjdbgdfldfkdfndfmdfpdfodfrdfqdfsdfqdftdfudfvdfwdfxdfydfzdfAdfBdfCdfDdfEdaEcXbcyLcyLdfFcyLdfGdfHdfIdbEdfGdfHdfJdbEdfGdfKdfLdfMdfNdfOdfOdfOdfPdfOdfOdfQdfOdfOdfOdfRdfPdfSdfTdfUdfVdfRdfOdfUdfOdfOdfOdfPdfOdfOdfOdfOdfOdfQdfOdfOdfOdfOdfOdfRdfVdfUdfWdfOdfPdfRdfXdfXdfXdfYdfXdfXdfZdfXdfXdfXdfXdgadfXdfXdfXdgbdfXdgcdfZdgddgedgfdggdgcdfXdfYdfXdfXdfZdfXdfXdfXdfXdfXdfXdfXdghdfXdfXdggdfXdgcdgidgjdgkdgldgmdgndgodgpdgpdgqdgrdgsdgtddldgudaUdaUdaTaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafabxcMVdeWdeWdeXdeYdeZdfadfbdbhdfcdfdcVacXOcXQdfedffdfgdbedbfdfhdbhdbidfidfjdbhdfkdfldfmdfndfodfpdfqdfrdfsdfrdftdfudfvdfwdfxdfydfzdfAdfBdfCdfDdfEdaEcXbcyLcyLdfFcyLdfGdfHdfIdbEdfGdfHdfJdbEdfGdfKdfLdfMdfNdfOdfOdfOdfPdfOdfOdfQdfOdfOdfOdfRdfPdfSdfTdfUdfVdfRdfOdfUdfOdfOdfOdfPdfOdfOdfOdfOdfOdfQdfOdfOdfOdfOdfOdfRdfVdfUdfWdfOdfPdfRdfXdfXdfXdfYdfXdfXdfZdfXdfXdfXdfXdgadfXdfXdfXdgbdfXdgcdfZdgddgedgfdggdgcdfXdfYdfXdfXdfZdfXdfXdfXdfXdfXdfXdfXdghdfXdfXdggdfXdgcdgidgjdgkdgldgmdgndgodgpdgpdgqdgrdgsdgtddldgudaUdaUdaTaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaicMVdgvdgwdgxcSkaaicXLdgydgzdgAdgBcZidgCcXQdgDdgEdgFcXQcVadgGcVadgHcVadgIdgJdgKdgKdgLdgMdgNdgOdgLdgMdgKdgPdgQdgRdgSdgTdgUdgVdgWdgXdgYdgVdgWdgUdgUcXbcyLdgZdhadhbdfGdhcdhddhedbEdhfdhddhgdfGdbEdhhdcIdhidhjdhjdhjdhkdhldhjdhjdhmdhjdhjdhndhodhpdhrdhqdhtdhsdhvdhudhvdhvdhxdhwdhvdhvdhydhvdhvdhvdhzdhvdhvdhAdhvdhsdhBdhqdhrdhCdhDdhncTmdhEcTmcTmcTmcTmdhFcTmdhGcTmcTmcTmcTmcTmcTmdhHcTmdbUdhIdhJdaMddjdhKdbUcTmdhEcTmcTmdhLcTmdhMcTmcTmcTmdhMcTmcTmcTmcTmdhNcTmdbUdhNdhOddkdhPdaTdguddldhQdhRdhSdhTdhUdgtddldaUdaUdaUdaTaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaicMVdgvdgwdgxcSkaaicXLdgydgzdgAdgBcZidgCcXQdgDdgEdgFcXQcVadgGcVadgHcVadgIdgJdgKdgKdgLdgMdgNdgOdgLdgMdgKdgPdgQdgRdgSdgTdgUdgVdgWdgXdgYdgVdgWdgUdgUcXbcyLdgZdhadhbdfGdhcdhddhedbEdhfdhddhgdfGdbEdhhdcIdhidhjdhjdhjdhkdhldhjdhjdhmdhjdhjdhndhodhpdhqdhrdhsdhtdhudhvdhudhudhwdhxdhudhudhydhudhudhudhzdhudhudhAdhudhtdhBdhrdhqdhCdhDdhncTmdhEcTmcTmcTmcTmdhFcTmdhGcTmcTmcTmcTmcTmcTmdhHcTmdbUdhIdhJdaMddjdhKdbUcTmdhEcTmcTmdhLcTmdhMcTmcTmcTmdhMcTmcTmcTmcTmdhNcTmdbUdhNdhOddkdhPdaTdguddldhQdhRdhSdhTdhUdgtddldaUdaUdaUdaTaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafabxcMVdeWdeWdhVdhWdhXdhYdhZdiadibdiccVacXOdiddiedifdigdihdiidijcZgdikdigdildimdindiodipdiqdirdisditdiuditdivdiwdixdiydizdiAdiBdiCdiDdiEdiFdiGdiHdgUdiIcyLdiJdhadiKdfGdiLdiMdiLdbEdiNdiOdiNdfGdbEdbEdbEdbEdcOdcPdcPdcPdcPdcPdcQdiPdcOdcQdiQdiRdiSdiTdiUdiRdiQdiVdiPdcOdcPdcPdcPdcPdcQdiPdcOdcPdcPdcPdcPdcQdiPdiVdiWdiXdiYdiZdjadiXdiXdjbdjcddaddbddbddbddbddcdjcddaddbddbddbddbddcdjcdjbdjddjedjfdjgdjhdjedjddjbdjcddaddbddbddbddbddcdjcddaddbddbddbddbddcdjcdjbdjidjjdjkdjldjmdaTdjnddldjodguddldjpdjqddlddldaUdaUdaUdaTaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafabxcMVcMVcMVcMVcMVabxdjrdjsddsdjtdjucZidjvcVadajdbddbccVacVadjwdjxdjydjzdjAdjBdjCdiodiqdiqdirdisdjDdjDdjEdjFdjGdjHdiydjIdjJdjJdjJdjKdjLdjMdjMdjNdgUcXbcyLdjOdjPdjQdfGdjRdjSdjRdbEdjTdjUdjTdfGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadjVdjWdjXdjYdjZdkadjVaaaaaaaaaaaaaaadkbdkbdkbdkbdkbdkbdkbaaaaaaaaaaaaaaadkcdkddkedkfdkgdkhdkcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadkidkjdkkdkldkmdkndkiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadkodkpdkqdkrdksdaTdktdkudkvdkwddldkxddldkydkzdaUdaUdaTdaTaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafabxcMVdkAdkAdkBdeYdfadeZdkCdbgdkDdkEdkFcXOcVadiddifdbfcXScVadkGdjydbhdkHdkJdkIdkKdkLdiqdkMdkNdkOdkPdkQdkRdkSdkTdkUdkVdjIdjJdjJdkWdkXdkYdkZdjJdladgUcXbcyLaaiaaiaaidfGdjRdlbdjRdbEdjTdlcdjTdfGdlddlddlddlddlddlddlddlddlddlddlddldaaaaaadledlfdlgdlhdjZdlidljaaaaaaaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaaaaaaaadlkdlldkedlmdlndlodlkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadlpdlqdlrdlsdkmdltdlpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadludkpdkqdlvdlwdjmdaTdaTdaTdaTdaTdlxdlydaTdaTdaTdaTdaTaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafabxcMVdkAdkAdkBdeYdeZdfadkCdbhdkDdkEdkFcXOcVadiddifdbfcXScVadkGdjydbgdkHdkIdkJdkKdkLdiqdkMdkNdkOdkPdkQdkRdkSdkTdkUdkVdjIdjJdjJdkWdkXdkYdkZdjJdladgUcXbcyLaaiaaiaaidfGdjRdlbdjRdbEdjTdlcdjTdfGdlddlddlddlddlddlddlddlddlddlddlddldaaaaaadledlfdlgdlhdjZdlidljaaaaaaaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaaaaaaaadlkdlldkedlmdlndlodlkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadlpdlqdlrdlsdkmdltdlpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadludkpdkqdlvdlwdjmdaTdaTdaTdaTdaTdlxdlydaTdaTdaTdaTdaTaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaaicMVdlzdlAdlBcSkaaicXLdlCcVacXOdjydbhdkDdlDdbgdlEdbgdlDdbgdlFdjycVacVadlGdlHdlIdlJdiqdiqdlKdlLdiqdlMdlNdivdlOdlPdlQdizdlRdlSdlTdlUdlVdlUdlVdgUdgUcXbcyLaaiaaiaaiaaidjRdlWdjRdfGdjTdlXdjTdlddlddlddlddlddlddlddlddlddlddlddlddlddlYdlZdmadmbdmcdmddmedmfdiQaaaaacaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaacaaadiWdmgdmhdmidmjdmkdiWaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaadjddmldkkdmmdmndmodjdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadjidmpdmqdmrdmsdjmaafaafaaidaTdmtdmudmvdmwdmxdaTaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaaicMVdlzdlAdlBcSkaaicXLdlCcVacXOdjydbgdkDdlDdbhdlEdbhdlDdbhdlFdjycVacVadlGdlHdlIdlJdiqdiqdlKdlLdiqdlMdlNdivdlOdlPdlQdizdlRdlSdlTdlUdlVdlUdlVdgUdgUcXbcyLaaiaaiaaiaaidjRdlWdjRdfGdjTdlXdjTdlddlddlddlddlddlddlddlddlddlddlddlddlddlYdlZdmadmbdmcdmddmedmfdiQaaaaacaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaacaaadiWdmgdmhdmidmjdmkdiWaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaadjddmldkkdmmdmndmodjdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadjidmpdmqdmrdmsdjmaafaafaaidaTdmtdmudmvdmwdmxdaTaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaaicMVdkAdkAdmydhWdhXdhYdmzcZidmAdjycVadmBcZjcZidmCcZicZicZidmDdmCdmEcVadmFdmGdgKdmHdiqdmIdmJdmKdmLdlMdmMdmNdmOdjHdmPdmQdmQdmQdmQdmQdmQdmQdmQdgUdmRdmScyLcyLcyLaaiaaidjRdmTdjRaaadjTdmUdjTdlddlddlddlddlddlddlddlddlddlddlddlddlddmVdmWdmXdmYdmZdnadnbdlidjVaaaaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaaaaadkcdlldncdnddkgdlodkcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadkidlqdkkdnednfdltdkiaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadkodkpdngdmrdnhdjmaafaafaaidaTdnidnjdnkdlydlydaTaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafabxcMVcMVcMVcMVcMVabxdjrdnlddscVadjycVacVacXOdnmdjycVacVadnmdnndnodnpdnqdnrdnsdgKdntdiqdiqdnudnvdiqdnwdnxdmNdnydlPdnzdnAdnBdnCdnDdnEdnFdnGdnHdnIdnJdnKcDecDecyLaaiaaaaaaaaaaaaaaaaaaaaaaaadlddlddlddlddlddlddlddlddlddlddlddlddlddnLdlZdnMdmbdnNdnOdnbdnPdleaaaaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaaaaadnQdnRdnSdmidnTdnUdnQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnVdnWdkkdmmdnXdnYdnVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnZdoadkqdobdocdjmaafaafaafdaTdoddoddoddoedmxdaTaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafabxabxaaiaaiaaiabxabxdofdogdohdoidbhdojdokdoldomdondoodopdoqdordosdotdoucVadovdgKdowdiqdiqdnudoxdiqdlMdoydmNdozdoAdmPdoBdoCdoDdoEdoFdoGdoHdoIdoJdoKdoLdoMdoNcyLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadlddlddlddlddlddlddlddlddlddlddlddldaaaaaadljdlfdjXdjYdnbdlidljaaaaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaaaaadlkdlldncdkfdkgdlodlkaaaaaaaaaaaadoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaaaaaaaadlpdlqdkkdkldnXdltdlpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadludkpdkqdoPdnhdjmaafaafdaTdaTdlydoQdaUdaTdaTdaTaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafabxabxaaiaaiaaiabxabxdofdogdohdoidbgdojdokdoldomdondoodopdoqdordosdotdoucVadovdgKdowdiqdiqdnudoxdiqdlMdoydmNdozdoAdmPdoBdoCdoDdoEdoFdoGdoHdoIdoJdoKdoLdoMdoNcyLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadlddlddlddlddlddlddlddlddlddlddlddldaaaaaadljdlfdjXdjYdnbdlidljaaaaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaaaaadlkdlldncdkfdkgdlodlkaaaaaaaaaaaadoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaaaaaaaadlpdlqdkkdkldnXdltdlpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadludkpdkqdoPdnhdjmaafaafdaTdaTdlydoQdaUdaTdaTdaTaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaaiaaiaaiaaiaaidoRdoSdoTdoUdoVdoUdoWdoXdoVdoUdoYdoXdoVdoVdoWdoZdpadpbdgKdpcdpddpedpfdpgdphdpidpjdmNdlOdoAdmPdoBdoCdpkdpldpmdpndpocyLdnIdnJdnKdppdpqcyLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaadprdiQdpsdptdpudiRdiRdiRdiRdiRdiQdpvdjXdpwdpxdpydiQaaaaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaaaaadiWdpzdpAdpBdkgdpCdiWaaaaaaaaadoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaaaaadjddpDdkkdpEdpFdpGdjdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadjidpHdpIdpJdpKdjmaafaafaafdaTdpLdaUdaUdaTaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaaaaaaaaaaaidpNdpMdfadfadpOdpMdpPdfadpOdpMdpPdfadpOdpQcTsabxdpadpRdgKdmNdmNdmNdmNdmNdmNdpSdmNdmNdpTdpUdpVdpWdpWdpWdpWdpWdpWdpWdpWdpWdpXdpYcyLcyLcyLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadjVdlfdjXdjYdnbdlidjVaaaaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaaaaadkcdlldncdkfdkgdlodkcaaaaaaaaadoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaaaaadkidlqdkkdkldnXdltdkiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadkodkpdkqdoPdnhdjmaafaafaafdaTdaUdpZdqadqaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaaaaaaaaaaaidpMdpNdeZdeZdpOdpNdpPdeZdpOdpNdpPdeZdpOdpQcTsabxdpadpRdgKdmNdmNdmNdmNdmNdmNdpSdmNdmNdpTdpUdpVdpWdpWdpWdpWdpWdpWdpWdpWdpWdpXdpYcyLcyLcyLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadjVdlfdjXdjYdnbdlidjVaaaaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaaaaadkcdlldncdkfdkgdlodkcaaaaaaaaadoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaaaaadkidlqdkkdkldnXdltdkiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadkodkpdkqdoPdnhdjmaafaafaafdaTdaUdpZdqadqaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaayaayaayaayaayaayaayaayaayaayaayaayaayaayaayaayaayaayaayaayaayaayaaadqbaaaabxcMVdqccSkcSjcMVdqccSkcSjcMVdqccSkcSjcMVdpadqddqedqfdqgdqhdqidqjdqkdqldqmdqndqodqpdqqdpWdqrdqsdqtdqudqvdqwdqxdpWdpWdnKcyLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadlYdlZdmadqydmcdjYdnbdkadleaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaadnQdqzdncdkfdkgdqzdnQaaaaaadoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaadnVdkndkkdkldnXdqAdnVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnZdkpdkqdoPdnhdjmdjmaafaafdaTdaTdaTdqadqaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaaaaeaaeaaeaaaaaeaaeaaeaaaaaeaaeaaeaaaaaeaaeaaeaaaaaeaaeaaeaaaaayaaedqBaaeabxcMVdqCdqDdqEcMVdqFdqGdqHcMVdqIdqJdqKcMVdpadqLdqMdqfdqNdqOdqPdqQdqRdqSdqTdqndqUdqVdqWdpWdqXdqXdqYdqvdqvdqZdqZdradpWdnKcyLdrbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadrcdrddredrfdrgdjYdrhdridmadlZdrjdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdrkdrldrmdrndrodrpdrqdrrdrmdrsdrtdoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaadrudrsdrvdrwdrxdrydrzdrAdrvdrBdrwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadrCdrDdrEdrFdrGdoPdnhdrHdjmaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaadrIdrJdrKaaadrIdrJdrKaaadrIdrJdrKaaadrIdrJdrKaaadrIdrJdrKaaaaayaaeaaeaaaaaacMVdrLdrMdrLcMVdrNdrOdrNcMVdrPdrQdrPcMVdpadrRdrSdqfdrTdrUdrVdqRdqRdrWdrXdrYdrZdsadsbdscdsddsedsfdsedsedsgdsedshdpWdnKdsidsjdskaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnLdlZdnMdqydsldsndsmdspdsodsqdsrdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdssdstdsudswdsvdsxdsydsAdszdsBdsCdoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaadsDdsEdsFdsGdsHdsJdsIdsKdsLdsMdsNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadsOdsPdsQdsRdsSdoPdnhdsTdjmaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaadrIdrJdrKaaadrIdrJdrKaaadrIdrJdrKaaadrIdrJdrKaaadrIdrJdrKaaaaayaaeaaeaaaaaacMVdrLdrMdrLcMVdrNdrOdrNcMVdrPdrQdrPcMVdpadrRdrSdqfdrTdrUdrVdqRdqRdrWdrXdrYdrZdsadsbdscdsddsedsfdsedsedsgdsedshdpWdnKdsidsjdskaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnLdlZdnMdqydsldsmdsndsodspdsqdsrdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdssdstdsudsvdswdsxdsydszdsAdsBdsCdoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaadsDdsEdsFdsGdsHdsIdsJdsKdsLdsMdsNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadsOdsPdsQdsRdsSdoPdnhdsTdjmaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaedrIdsUdrKaaedrIdsUdrKaaedrIdsUdrKaaedrIdsUdrKaaedrIdsUdrKaaeaazaaaaaeaaeaaacMVdrLdsVdrLcMVdrNdsWdrNcMVdrPdsXdrPcMVdpadsYdsZdqfdrTdtadqRdqRdqRdtbdtcdtddtedtfdtgdthdtidtjdtkdtldtldtmdsedtndpWdnKcDedtodtpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadljdlfdjXdjYdtqdtrdtsdttdtudkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdtvdtwdtxdtydtzdkfdtAdrrdtBdrldrndoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaadrAdrBdtCdrwdtDdkldtEdtFdtGdtHdtIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadtJdtKdtLdtMdtNdoPdnhdtOdjmaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaadrIdsUdrKaaadrIdsUdrKaaadrIdsUdrKaaadrIdsUdrKaaadrIdsUdrKaaaaaeaaaaaaaaeaaecMVcMVcMVcMVcMVcMVcMVcMVcMVcMVcMVcMVcMVdpadsYdtPdqfdqNdqOdtQdqRdqRdqSdtRdqndlOdoAdtSdpWdtTdtUdtVdtWdtXdtYdtZduadpWdubcDeducdtpaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadprdiQdpsdptdpudiRdiRdiRdiRdiRdiQduddjXdjYduedridnMdlZdmbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdrrdrldtBdrndufdkfdkgdugdnQduhduhdoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaduiduidnVdujdkkdkldukdrAdtCdrBdrwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadrCdrDduldrFdumdoPdnhdundjmaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaadrIdsUdrKaaadrIdsUdrKaaadrIdsUdrKaaadrIdsUdrKaaadrIdsUdrKaaaaaeaaaaaaaaaaaeaaeaaeaaeaaaaaaaaeaaeaaeaaaabxduoduoduodpadupdpadqfdqgduqdurdusdutduudqfdqfduvduwduxdpWdpWduydtWduzduAduBdtZdpWdpWdnKcDeduCdtpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaduDduDduDduDduDduDduDduDduDduDduDaaaaaaaaadjVdlfduEduFdnbdlfdleaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaadnQdugdncduGduHdncdnQaaaaaadoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaadnVdnXduIduJdnXdujdnVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnZduKdkqduLduMdjmdjmaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaayaayaaeaaadrIdsUdrKaaadrIdsUdrKaaadrIdsUdrKaaadrIdsUdrKaaadrIdsUdrKaaaaaeaaaaaaaaaaaaaaeduNduOduOduOduOduoduPduQduoduoduRduRduSduTduUdqfdqfdqfdqfdqfdqfdqfdqfduVduWduXduYduZdpWdpWdpWdpWdpWdpWdpWdpWdpWdnKcDedvadtpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaduDduDduDduDduDduDduDduDduDduDduDduDdlYdlZdmadqydmcdjYdnbdnPdleaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaadnQdnRdncdkfdkgdvbdnQaaaaaadoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaadnVdvcdkkdkldnXdnYdnVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnZdoadkqdoPdvddjmaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadvedvedvedvedvedvedveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaaaaeaaaaaaaaedvfaaeaaaaaedvfaaeaaaaaedvfaaeaaaaaedvfaaeaaaaaedvfaaeaaadvgaaaaaadvhdvidvidvjdvkdvldvmdvndvodvpdvqdvrdvsdvtdvtdvudvvdvwdvxdvydvzdvudvrdvAdvBdvCdvDdvEdvFdvGdvHdvIdvJdvKdvLdvMdvNdvOdvPdvQdnKdvRdvSdvTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaduDduDduDduDduDduDduDduDduDduDduDduDdvUdvVdvWdvXdvYdvZdwadlfdleaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaadnQdugdwbdwcdkgdncdnQaaaaaadoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaadnVdnXdkkdwddwedujdnVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnZduKdwfdwgdnhdjmaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadvedvedvedvedvedvedvedvedveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaedwhdwidwidwidwjdwidwidwidwjdwidwidwidwjdwidwidwidwjdwidwidwidwjdwidwidwidwidwkdwldwmdwndwodwpdwqdwrdwsdwtdwudwvdwxdwwdwydwzdwAdwBdwCdwDdwEduXduZduZdwFduZdwGduZdwHdwIduZduZdwJduZdwFdwKdwLdwMdwNdwOdwPdwQcyLdwRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaduDduDduDduDduDduDduDduDduDduDduDduDdnLdlZdnMdqydwSdwTdwUdridmadlZdmbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdrrdrldrmdrndwVdkfdkgdugdnQduhduhdoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaduiduidnVdujdkkdkldwWdrAdrvdrBdrwaaaaaaaaaaaadwXdwXdwXdwXdwXdwXdwXaaaaaadrCdrDdrEdrFdwYdwZdxadjmaafaafaafdxbdxbdxbdxbdxbdxbdxbaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadvedvedvedvedvedvedvedvedveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaedwhdwidwidwidwjdwidwidwidwjdwidwidwidwjdwidwidwidwjdwidwidwidwjdwidwidwidwidwkdwldwmdwndwodwpdwqdwrdwsdwtdwudwvdwwdwxdwydwzdwAdwBdwCdwDdwEduXduZduZdwFduZdwGduZdwHdwIduZduZdwJduZdwFdwKdwLdwMdwNdwOdwPdwQcyLdwRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaduDduDduDduDduDduDduDduDduDduDduDduDdnLdlZdnMdqydwSdwTdwUdridmadlZdmbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdrrdrldrmdrndwVdkfdkgdugdnQduhduhdoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaduiduidnVdujdkkdkldwWdrAdrvdrBdrwaaaaaaaaaaaadwXdwXdwXdwXdwXdwXdwXaaaaaadrCdrDdrEdrFdwYdwZdxadjmaafaafaafdxbdxbdxbdxbdxbdxbdxbaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadvedvedvedvedvedvedvedvedveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaaaaaeaaaaaaaaedvfaaeaaaaaedvfaaeaaaaaedvfaaeaaaaaedvfaaeaaaaaedvfaaeaaaaaeaaaaaadvhdvidvidxcdxddxedxfduOduodxgdxhduoduodxiduQdxjduodxkdxldxldxmdxldxndxodxndxpdxqdxrdxsdxqdxrdxpdxtdxudxvduodwDdwDduoduocyLcyLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaduDduDduDduDduDduDduDduDduDduDduDaaaaaaaaadljdlfdjXdjYdtqdxwdxxdxydxzdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdxAdxBdxCdxDdtzdkfdxEdrrdrmdrldrndoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaadrAdrBdrvdrwdxFdkldtEdxGdxHdxIdxJaaaaaaaaadwXdwXdwXdwXdwXdwXdwXdwXdwXaaadxKdxLdxMdxNdtNdoPdnhdjmdxbdxbdxbdxbdxOdxPdxQdxRdxOdxbdxbdxbdxbdxbdxbdxbdxbdxbdxbdxbdxbaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadvedvedvedvedvedvedvedvedveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaayaayaaeaaedrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaaaaeaaaaaaaaaaaaaaedxTduOduOduOduOduodxUdxVdxWaaadxXdxYdxZdyadybdxldycdyddyedxndyfdygdyhdyidyjdykdyldymdyhdyndyodypduodyqdyrdysdxWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadprdiQdpsdptdpudiRdiRdiRdiRdiRdiQdytdyudsndyvdywdyxdyydyzdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdyAdyBdyCdyEdyDdsxdyFdyHdyGdyIdyJdoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaadyKdsEdyLdyMdyNdsJdyOdyPdyQdyRdySaaaaaaaaadwXdwXdwXdwXdwXdwXdwXdwXdwXaaadyTdyUdyVdyWdyXdyYdyZdzadzbdzcdzcdzcdzddzedzddzfdzddzcdzgdzcdzcdzcdzhdzidzjdzkdzldzmdxbdxbaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadvedvedvedvedvedvedvedvedveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaayaayaaeaaedrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaaaaeaaaaaaaaaaaaaaedxTduOduOduOduOduodxUdxVdxWaaadxXdxYdxZdyadybdxldycdyddyedxndyfdygdyhdyidyjdykdyldymdyhdyndyodypduodyqdyrdysdxWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadprdiQdpsdptdpudiRdiRdiRdiRdiRdiQdytdyudsmdyvdywdyxdyydyzdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdyAdyBdyCdyDdyEdsxdyFdyGdyHdyIdyJdoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaadyKdsEdyLdyMdyNdsIdyOdyPdyQdyRdySaaaaaaaaadwXdwXdwXdwXdwXdwXdwXdwXdwXaaadyTdyUdyVdyWdyXdyYdyZdzadzbdzcdzcdzcdzddzedzddzfdzddzcdzgdzcdzcdzcdzhdzidzjdzkdzldzmdxbdxbaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadvedvedvedvedvedvedvedvedveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzndzndzndzndzndzndznaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaadrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaaaaeaaaaaaaaaaaeaaeaaaaaaaaaaaaaaaduodzodzpdzqaaedxXdzrdzsdztdzudxldzvdzwdzxdxndzydzzdyhdzAdzBdzCdzDdzEdyhdzFdzGdzHduodzIdzJdzKdzqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadjVdlfdjXdjYdzLdridnMdlZdrjdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdrkdrldtBdrndzMdkfdtAdrrdtBdrsdrtdoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaadrudrsdtCdrwdzNdkldzOdrAdtCdrBdrwaaaaaaaaadwXdwXdwXdwXdwXdwXdwXdwXdwXaaadrCdrDdzPdzQdzRdzSdzTdzTdzUdzVdzWdzXdzYdzZdAadAbdAcdzZdAddAedAfdAgdAhdAedAedAedAedAidAjdxbaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadvedvedvedvedvedvedvedvedveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzndzndzndzndzndzndzndzndznaaaaaaaaaaaaaaaaaaaaaaaaaaeaaadrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaadrIdxSdrKaaaaayaaaaaaaaeaaeaaaaaaaaaaaaaaaaaaduodAkdAkduoaaidAlduQdAmduPduQdxldAndAodApdAqdArdAsdAtdAudAvdAwdAxdAydAzdAAdABdACdADdAEdAFduoduoaaedAGaccaccaccaccaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadlYdlZdmadqydAHdjYdnbdAIdleaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaadnQdAJdncdkfdkgdAKdnQaaaaaadoOdoOdoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaadnVdALdkkdkldnXdAMdnVaaaaaaaaaaaaaaadwXdwXdwXdwXdwXdwXdwXdwXdwXaaaaaaaaaaaadnZdANdoPdAOdjmdxbdxbdAPdAQdARdxbdAPdAQdASdxbdAPdxbdxbdxbdxbdxbdxbdxbdAedAidAedxbaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadvedvedvedvedvedvedveaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzndzndzndzndzndzndzndzndznaaaaaaaaaaaaaaaaaaaaaaaaaayaaedrIdxSdrKaaedrIdxSdrKaaedrIdxSdrKaaedrIdxSdrKaaedrIdxSdrKaaeaayaaaaaeaaeaaaaaaaaaaaaaaaaaaaaadATdAUdAVdATabxdAWdAXdAYdAXdAWdxldAZdBadBbdxndBcdBddyhdBedBfdBgdBfdBhdyhdBidBjdBkdADdBldBmdBndBoaaaaaeaaeaaaaaaaccaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadBpdBqdBrdBsdBtdBudpxdlidljaaaaaadkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbdkbaaaaaadlkdlldpAdBvdkgdlodlkaaaaaaaaadoOdoOdoOdoOdoOdoOdoOaaaaaaaaaaaaaaaaaaaaadlpdlqdkkdBwdpFdltdlpaaaaaaaaaaaaaaadwXdwXdwXdwXdwXdwXdwXdwXdwXaaaaaaaaaaaadludBxdBydBzdjmaafaafdxbdBAdBBdBCdxbdBDdBEdBFdxbaafaafaafaafaafaafdBGdBGdBHdBGdBGaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadvedvedvedvedvedvedveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -10175,4 +10175,3 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 "}
-

maps/northern_star/polaris-2.dmm

@@ -1357,7 +1357,7 @@
 "Ae" = (/obj/structure/closet/secure_closet/bar,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/restaurant)
 "Af" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/cash_register/civilian{ icon_state = "register_idle"; dir = 8},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant)
 "Ag" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/white/diagonal,/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant)
-"Ah" = (/obj/machinery/computer/ordercomp,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command)
+"Ah" = (/obj/machinery/computer/supplycomp/control,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command)
 "Ai" = (/obj/machinery/button/remote/blast_door{id = "crescent_checkpoint_access"; name = "Crescent Checkpoint Access"; pixel_x = -6; pixel_y = -24; req_access = list(101)},/obj/machinery/button/remote/blast_door{id = "crescent_thunderdome"; name = "Thunderdome Access"; pixel_x = 6; pixel_y = -24; req_access = list(101)},/obj/machinery/button/remote/blast_door{id = "crescent_vip_shuttle"; name = "VIP Shuttle Access"; pixel_x = 6; pixel_y = -34; req_access = list(101)},/obj/machinery/turretid{pixel_x = 28; pixel_y = -28; req_access = list(101)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command)
 "Aj" = (/obj/machinery/computer/shuttle_control{req_access = list(101); shuttle_tag = "Centcom"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command)
 "Ak" = (/obj/machinery/computer/communications,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command)

maps/southern_cross/datums/supplypacks/munitions.dm

@@ -3,7 +3,7 @@
 *	related to sc weapons live.
 */
 
-/datum/supply_packs/munitions/bolt_rifles_explorer
+/datum/supply_pack/munitions/bolt_rifles_explorer
  	name = "Weapons - Surplus Hunting Rifles"
  	contains = list(
  			/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 2,
@@ -14,7 +14,7 @@
  	containername = "Hunting Rifle crate"
  	access = access_explorer
 
-/datum/supply_packs/munitions/phase_carbines_explorer
+/datum/supply_pack/munitions/phase_carbines_explorer
  	name = "Weapons - Surplus Phase Carbines"
  	contains = list(
  			/obj/item/weapon/gun/energy/phasegun = 2,
@@ -24,7 +24,7 @@
  	containername = "Phase Carbine crate"
  	access = access_explorer
 
-/datum/supply_packs/munitions/phase_rifles_explorer
+/datum/supply_pack/munitions/phase_rifles_explorer
  	name = "Weapons - Phase Rifles"
  	contains = list(
  			/obj/item/weapon/gun/energy/phasegun/rifle = 2,

maps/southern_cross/southern_cross-1.dmm

@@ -6513,7 +6513,7 @@
 "cvm" = (/obj/structure/bed/chair,/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/brown/border{dir = 5},/obj/machinery/atm{pixel_y = 30},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
 "cvn" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced/polarized{id = "quart_tint"},/obj/machinery/ai_status_display{layer = 4},/turf/simulated/floor/plating,/area/quartermaster/qm)
 "cvo" = (/obj/structure/filingcabinet,/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/brown/border{dir = 9},/turf/simulated/floor/tiled,/area/quartermaster/qm)
-"cvp" = (/obj/machinery/computer/supplycomp,/obj/machinery/status_display/supply_display{pixel_y = 32},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/brown/border{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/qm)
+"cvp" = (/obj/machinery/computer/supplycomp/control,/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cvq" = (/obj/machinery/computer/security/mining,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/brown/border{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cvr" = (/obj/structure/table/standard,/obj/item/weapon/cartridge/quartermaster{pixel_x = 6; pixel_y = 5},/obj/item/weapon/cartridge/quartermaster,/obj/item/weapon/cartridge/quartermaster{pixel_x = -4; pixel_y = 7},/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = 0; pixel_y = 28},/obj/machinery/newscaster{pixel_x = 30; pixel_y = 0},/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/brown/border{dir = 5},/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cvs" = (/obj/structure/table/rack,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/ai_monitored/storage/emergency/eva)
@@ -6879,7 +6879,7 @@
 "cCo" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled,/area/quartermaster/delivery)
 "cCp" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/delivery)
 "cCq" = (/obj/structure/table/steel,/obj/item/weapon/wrapping_paper,/obj/item/weapon/wrapping_paper,/obj/item/weapon/wrapping_paper,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/machinery/light_switch{pixel_x = 36; pixel_y = 0},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/brown/bordercorner,/turf/simulated/floor/tiled,/area/quartermaster/delivery)
-"cCr" = (/obj/machinery/computer/ordercomp,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/brown/bordercorner2{dir = 9},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
+"cCr" = (/obj/machinery/computer/supplycomp,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/brown/bordercorner2{dir = 9},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
 "cCs" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/quartermaster/foyer)
 "cCt" = (/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/quartermaster/foyer)
 "cCu" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/turf/simulated/floor/tiled,/area/quartermaster/foyer)
@@ -7052,7 +7052,7 @@
 "cFF" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/quartermaster/delivery)
 "cFG" = (/obj/structure/table/standard,/obj/item/weapon/coin/silver{pixel_x = -3; pixel_y = 3},/obj/item/weapon/coin/silver,/obj/item/device/retail_scanner/civilian{icon_state = "retail_idle"; dir = 1},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/brown/border{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cFH" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/effect/landmark/start{name = "Cargo Technician"},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/brown/border{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/office)
-"cFI" = (/obj/machinery/computer/supplycomp,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/brown/border{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/office)
+"cFI" = (/obj/machinery/computer/supplycomp/control,/turf/simulated/floor/tiled,/area/quartermaster/office)
 "cFJ" = (/obj/structure/filingcabinet/filingcabinet,/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/brown/bordercorner{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/office)
 "cFK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office)
 "cFL" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office)

maps/southern_cross/southern_cross-6.dmm

@@ -645,7 +645,7 @@
 "mu" = (/obj/machinery/biogenerator,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
 "mv" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
 "mw" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/cooker/fryer,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
-"mx" = (/obj/machinery/computer/ordercomp,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command)
+"mx" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/machinery/computer/supplycomp/control,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command)
 "my" = (/obj/structure/bed/chair{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command)
 "mz" = (/obj/machinery/computer/robotics,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command)
 "mA" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/simulated/shuttle/plating/airless,/area/shuttle/transport1/centcom)
@@ -2147,8 +2147,8 @@
 "Po" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/light/small{dir = 4},/turf/simulated/shuttle/floor/skipjack,/area/skipjack_station/start)
 "Pp" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/simulated/shuttle/floor/white,/area/skipjack_station/start)
 "Pq" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
-"Pr" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/item/weapon/tool/crowbar,/obj/item/device/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
+"Pr" = (/obj/item/weapon/tool/wrench,/obj/item/weapon/mop,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
-"Ps" = (/obj/item/weapon/tool/wrench,/obj/item/weapon/mop,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
+"Ps" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/item/weapon/tool/crowbar,/obj/item/device/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
 "Pt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/syndicate_station/start)
 "Pu" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start)
 "Pv" = (/obj/structure/bed/chair/comfy/red,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start)
@@ -2478,7 +2478,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaOxIdaaaaaaaaaaaaaaMtObOcOcOcOyMtOzOAOBOCOzOAOBMtNLOcOcOEObMtaaaaaaaaaaIdIdIdIdabIdIdIdIdaaaaaaaaaaOFOGOpOHMpMBMBNPMpOIOpOpOJMpMBOKOLOpMBMBMBOKOpMBMpMpMpMpNZNZNZOMMpMpaaaaaaaaaaIdIdIdIdabaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaONaaaaaaaaaaaaaaaaOOObOcOcOcOcOCNtNtNtNtNtNtNtOCOcOcOPOcObOOaaaaaaaaaaaaIdIdIdabIdIdIdIdaaaaaaaaaaOFOQOROpOSOpOpOpOSOpOpOpOpOSOpOpOpOpOpOTOpOpOpNZNZNZNZOUNZNZNZNZOVMpaaaaaaaaaaaaIdIdIdabaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaONaaaaaaaaaaaaaaaaOWOXOcOYOZOcMtPaPbNtNtNtPcPdMtOcPeOcPfObOWaaaaaaaaaaaaIdIdIdabIdIdIdaaaaaaaaaaaaOFPgOpPhMpMBMBNPMpOIOpOpOJMpMBNWMBOpMBMBMBNWOpMBMpMpMpMpPiNZNZPjMpMpaaaaaaaaaaaaIdIdIdabaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaONaaaaaaaaaaaaaaaaPkOXOcOcMtPlMtMtMtPmPnPoMtMtMtPpMtPqPsPrPkaaaaaaaaaaaaaaIdIdabIdIdIdaaaaaaaaaaaaPtPuMBPvMpMBMBOnMpOoOpOpOqMpMpMpMpOrMpPwMpMSOrMpMpPxPxMpPyPzPAMpMpaaaaaaaaaaaaaaIdIdIdabaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaONaaaaaaaaaaaaaaaaPkOXOcOcMtPlMtMtMtPmPnPoMtMtMtPpMtPqPrPsPkaaaaaaaaaaaaaaIdIdabIdIdIdaaaaaaaaaaaaPtPuMBPvMpMBMBOnMpOoOpOpOqMpMpMpMpOrMpPwMpMSOrMpMpPxPxMpPyPzPAMpMpaaaaaaaaaaaaaaIdIdIdabaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaONaaaaaaaaaaaaaaMtMtPBPCPCMtPDPEPDPFPGPHPIPFPJPKPLMtPMPNPOMtMtaaaaaaaaaaaaIdIdabIdIdaaaaaaaaaaaaaaMpMpPPPQMpMBMBNPMpPRMBMBPRMpPSPTMpMBMpMpMpPUOpPVOpPWPXMpMpMpMpMpaaaaaaaaaaaaaaaaIdIdIdabaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaONaaaaaaaaaaaaaaMtMtPYPYMtMtPDPDPDPZPGQaPIPZPLPLQbMtMtPYPYMtMtaaaaaaaaaaaaIdIdabIdIdaaaaaaaaaaaaaaaaMpMpMpMpNyMBMBMpMpMpQcMpMpNZNZQdMBNPMpQeQfOpOpQgQhQiMpMDMEMFaaaaaaaaaaaaaaaaaaaaIdIdabaaaa
 aaaaabababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaONaaaaaaaaaaaaaaaaMtODODMtMtQkQlPDQmQnNtQnQmPLPLQoMtMtODODMtaaaaaaaaaaaaaaIdIdabIdaaaaaaaaaaaaaaaaaaaaaaMpMpMpMBMBMBMpNENZMpQpNZNZQqQrQsMpOpOpOpOpQtQuQvMpMDMEMXaaaaaaaaaaaaaaaaaaaaIdIdabaaaa
@@ -2499,4 +2499,3 @@ aaaaRfababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 "}
-

nano/templates/supply_records.tmpl

@@ -0,0 +1,226 @@
+<H2>Supply Records</H2>
+
+<!-- Supply points and shuttle status -->
+<div class='statusDisplay'>
+	<!-- List points -->
+	Supply points: {{:data.supply_points}}<br>
+	
+	<!-- Shuttle status -->
+	<div class='item'>
+		<H4>Supply Shuttle</H4>
+		<div class='itemLabelNarrow'>
+			Location:<br>
+			Engines:
+		</div>
+		<div class='itemContent'>
+			{{:data.shuttle.location}}<br>
+			{{:data.shuttle.engine}}
+		</div>
+		{{if data.shuttle.mode == 4}}
+			<div class='itemLabelNarrow'>
+				ETA:
+			</div>
+			<div class='itemContent'>
+				{{:data.shuttle.time}} minutes
+			</div>
+		{{/if}}
+		{{if data.shuttle_auth}}
+			<!-- Shuttle control -->
+			{{if data.shuttle.launch == 1 && data.shuttle.mode == 0}} <!-- Shuttle must be docked -->
+				{{:helper.link('Send away', 'suitcase', {'send_shuttle' : 'send_away'})}}
+			{{else data.shuttle.launch == 2 && (data.shuttle.mode == 3 || data.shuttle.mode == 1)}} <!-- Shuttle must be departing, but not have left yet -->
+				{{:helper.link('Cancel launch', 'stop', {'send_shuttle' : 'cancel_shuttle'})}}
+			{{else data.shuttle.launch == 1 && data.shuttle.mode == 5}} <!-- Shuttle has reached the other destination, and can be sent back to station -->
+				{{:helper.link('Send shuttle', 'suitcase', {'send_shuttle' : 'send_to_station'})}}
+			{{/if}}
+			{{if data.shuttle.force}}
+				{{:helper.link('Force launch', 'alert', {'send_shuttle' : 'force_shuttle'})}}
+			{{/if}}
+		{{/if}}
+	</div>
+</div>
+
+<!-- Menu -->
+{{if data.currentTab == 0}}
+	<div>	
+		<!-- List supply packs -->
+		<div class='item'>
+			{{:helper.link('Request items', 'note', {'switch_tab' : 1})}}
+		</div>
+		
+		<!-- Accepted orders -->
+		<div class='item'>
+			{{:helper.link('View accepted orders', 'cart', {'switch_tab' : "Approved"})}}
+		</div>
+		
+		<!-- Pending orders -->
+		<div class='item'>
+			{{:helper.link('View pending requests', 'cart', {'switch_tab' : "Requested"})}}
+		</div>
+		
+		<!-- Order history -->
+		{{:helper.link('View order history', 'document', {'switch_tab' : "All"})}}
+		
+		<!-- Receipt history -->
+		<div class='item'>
+			{{:helper.link('View export history', 'document', {'switch_tab' : "Export"})}}
+		</div>
+	</div>
+	
+{{else}}
+	{{:helper.link('Back to menu', 'arrowreturn-1-w', {'switch_tab' : 0})}}
+
+	
+	<!-- List supply pack categories -->
+	{{if data.currentTab == 1}}
+		{{for data.supply_packs}}
+			<div class='item'>
+				{{:helper.link(value.name, 'bookmark', {'switch_tab' : value.name})}}
+			</div>
+		{{/for}}
+	
+	<!-- List exported crates, their contents, and their values -->
+	{{else data.currentTab == "Export"}}
+		<H3>Exported Crates</H3>
+		{{for data.receipts}}
+			<hr>
+			<div class='item'>
+				{{for value.title :titleVal:titleIndex}}
+					<div class='itemLabelNarrow'>
+						{{:titleVal.field}}
+					</div>
+					<div class='itemContent'>
+						{{:titleVal.entry}}
+						{{if data.order_auth}}
+							<span style='float:right; width:64px;'>
+								{{:helper.link('Edit', 'wrench', {'order_ref' : value.ref, 'edit' : titleVal.field, 'default' : titleVal.entry, 'user' : data.user})}}
+							</span>
+						{{/if}}
+					</div>
+				{{/for}}
+				
+				{{if value.error}}
+					<div class='itemLabelNarrow'>
+						<span class='bad'>
+							Error
+						</span>
+					</div>
+					<div class='itemContent'>
+						{{:value.error}}
+					</div>
+				{{else}}
+					{{for value.contents :contentVal:contentIndex}}
+						<div class='itemContent'>
+							{{:contentVal.quantity}}x {{:contentVal.object}} - {{:contentVal.value}} points
+						</div>
+						{{if data.order_auth}}
+							<div class='itemContent'>
+								{{:helper.link('Edit Quantity','wrench', {'export_ref' : value.ref, 'edit' : 1, 'default' : contentVal.quantity, 'index' : contentIndex, 'user' : data.user})}}
+								{{:helper.link('Delete Entry', 'trash', {'export_ref' : value.ref, 'delete' : 1, 'index' : contentIndex, 'user' : data.user})}}
+							</div>
+						{{/if}}
+					{{/for}}
+				{{/if}}
+				
+				{{if data.order_auth}}
+					<br>{{:helper.link('Add item to record', 'plus', {'export_ref' : value.ref, 'add_item' : 1, 'user' : data.user})}}
+					<br>{{:helper.link('Delete record', 'trash', {'export_ref' : value.ref, 'delete' : 1, 'user' : data.user})}}
+				{{/if}}
+			</div>
+		{{empty}}
+			<div class='average'>No receipts on record!</div>
+		{{/for}}
+	
+	<!-- Browse orders -->
+	<!-- currentTab == "Approved": Orders waiting to be shipped -->
+	<!-- currentTab == "Requested": Orders waiting to be accepted -->
+	<!-- currentTab == "All": All orders -->	
+	{{else data.currentTab == "Approved" || data.currentTab == "Requested" || data.currentTab == "All"}}
+		<H3>{{:data.currentTab}} Orders</H3>
+		{{for data.orders}}
+			{{if (value.status == data.currentTab) || (data.currentTab == "All")}}
+				<hr>
+				<div class='item'>
+					{{for value.entries :entryVal:entryIndex}}
+						<!-- Hide null entries -->
+						{{if entryVal.entry}}
+							<div class='itemLabelNarrow'>
+								{{:entryVal.field}}
+							</div>
+							<div class='itemContent'>
+								{{:entryVal.entry}}
+								{{if data.order_auth}}
+									<span style='float:right; width:64px;'>
+										{{:helper.link('Edit', 'wrench', {'order_ref' : value.ref, 'edit' : entryVal.field, 'default' : entryVal.entry, 'user' : data.user})}}
+									</span>
+								{{/if}}
+							</div>
+						{{/if}}
+					{{/for}}
+					
+					{{if data.currentTab == "All"}}
+						<div class='itemLabelNarrow'>
+							Status
+						</div>
+						<div class='itemContent'>
+							{{:value.status}}
+						</div>
+						{{if data.order_auth}}
+							<br>{{:helper.link('Delete record', 'trash', {'order_ref' : value.ref, 'delete' : 1, 'user' : data.user})}}
+						{{/if}}
+					{{/if}}
+					
+					{{if data.order_auth && data.currentTab == "Requested"}}
+						{{:helper.link('Approve', 'check', {'order_ref' : value.ref, 'approve' : 1, 'user' : data.user})}}
+						{{:helper.link('Deny',   'cancel', {'order_ref' : value.ref, 'deny' : 1,    'user' : data.user})}}
+					{{/if}}
+				</div>
+			{{/if}}
+		{{empty}}
+			<div class='average'>No orders on record!</div>
+		{{/for}}
+		
+		{{if data.currentTab == "Requested" && data.order_auth}}
+			{{:helper.link('Clear all requests', 'trash', {'clear_all_requests' : 1, 'user' : data.user})}}
+		{{/if}}
+	
+	<!-- List supplypacks from individual category -->
+	<!-- currentTab will be set to the category name -->
+	{{else}}
+		{{for data.supply_packs}}
+			{{if data.currentTab == value.name}}
+				<div class='item'>
+					{{:helper.link('Back to categories', 'arrow-return-1-w', {'switch_tab' : 1})}}
+				</div>
+				
+				{{for value.category_packs :packValue:packIndex}}
+					{{if !packValue.contraband || data.contraband}}
+						<div class='item'>
+							<!-- Sending 'expand' will toggle the value of packValue.expand -->
+							{{:helper.link(packValue.name + ' - ' + packValue.cost, packValue.expand ? 'folder-open' : 'folder-collapsed', {'cartridge_topic' : 1, 'pack_ref' : packValue.ref, 'expand' : 1})}}
+						</div>
+					
+						{{if packValue.expand}}
+							<div class='item'>
+								<div class='itemLabel'>
+									{{if packValue.random}}
+										Contains any {{:packValue.random}} of:<br>
+									{{/if}}
+								
+									{{for packValue.manifest :manifestElem:manifestIndex}}
+										{{:manifestElem}}<br>
+									{{/for}}
+								</div>
+							
+								<div class='itemContent'>
+									{{:helper.link('Request', 'cart', {'cartridge_topic' : 1, 'pack_ref' : packValue.ref, 'request' : 1, 'user' : data.user})}}
+								</div>
+							</div>
+							<hr>
+						{{/if}}
+					{{/if}}
+				{{/for}}
+			{{/if}}
+		{{/for}}
+	{{/if}}		
+{{/if}}

polaris.dme

@@ -49,6 +49,7 @@
 #include "code\__defines\species_languages.dm"
 #include "code\__defines\stat_tracking.dm"
 #include "code\__defines\subsystems.dm"
+#include "code\__defines\supply.dm"
 #include "code\__defines\targeting.dm"
 #include "code\__defines\turfs.dm"
 #include "code\__defines\unit_tests.dm"
@@ -355,7 +356,6 @@
 #include "code\game\shuttle_engines.dm"
 #include "code\game\skincmd.dm"
 #include "code\game\sound.dm"
-#include "code\game\supplyshuttle.dm"
 #include "code\game\trader_visit.dm"
 #include "code\game\antagonist\_antagonist_setup.dm"
 #include "code\game\antagonist\antagonist.dm"