Supply shuttle, initial_move() fixes, dock fixes

Supply has been almost completely replaced by -tg-'s system.

No fancy UI, unfortunately, but modifying bay's directly was not possible.

code/controllers/Processes/shuttles.dm

@@ -41,6 +41,24 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
 
 	shuttle_master = src
 
+	var/watch = start_watch()
+	log_startup_progress("Initializing shuttle docks...")
+	initialize_docks()
+	log_startup_progress("  Docks initalized in [stop_watch(watch)]s.")
+
+	if(!emergency)
+		WARNING("No /obj/docking_port/mobile/emergency placed on the map!")
+	if(!supply)
+		WARNING("No /obj/docking_port/mobile/supply placed on the map!")
+
+	ordernum = rand(1,9000)
+
+	for(var/typepath in subtypesof(/datum/supply_packs))
+		var/datum/supply_packs/P = new typepath()
+		if(P.name == "HEADER") continue		// To filter out group headers
+		supply_packs["[P.type]"] = P
+	initial_move()
+
 /datum/controller/process/shuttle/doWork()
 	points += points_per_decisecond * schedule_interval
 	for(var/thing in mobile)
@@ -50,6 +68,9 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
 			continue
 		mobile.Remove(thing)
 
+/datum/controller/process/shuttle/proc/initialize_docks()
+	for(var/obj/docking_port/D in world)
+		D.register()
 
 
 /datum/controller/process/shuttle/proc/getShuttle(id)
@@ -190,3 +211,127 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
 				S.dwidth = M.dwidth
 				S.dheight = M.dheight
 		moveShuttle(M.id, "[M.roundstart_move]", 0)
+
+/datum/supply_order
+	var/ordernum
+	var/datum/supply_packs/object = null
+	var/orderedby = null
+	var/orderedbyRank
+	var/comment = null
+
+/datum/supply_order/proc/generateRequisition(atom/_loc)
+	if(!object)
+		return
+
+	var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(_loc)
+	reqform.name = "requisition form - [object.name]"
+	reqform.info += "<h3>[station_name] Supply Requisition Form</h3><hr>"
+	reqform.info += "INDEX: #[ordernum]<br>"
+	reqform.info += "REQUESTED BY: [orderedby]<br>"
+	reqform.info += "RANK: [orderedbyRank]<br>"
+	reqform.info += "REASON: [comment]<br>"
+	reqform.info += "SUPPLY CRATE TYPE: [object.name]<br>"
+	reqform.info += "ACCESS RESTRICTION: [get_access_desc(object.access)]<br>"
+	reqform.info += "CONTENTS:<br>"
+	reqform.info += object.manifest
+	reqform.info += "<hr>"
+	reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:<br>"
+
+	reqform.update_icon()	//Fix for appearing blank when printed.
+
+	return reqform
+
+/datum/supply_order/proc/createObject(atom/_loc, errors=0)
+	if(!object)
+		return
+
+	world << "Supply order [src] creating object [object] at atom [_loc]."
+
+		//create the crate
+	var/atom/Crate = new object.containertype(_loc)
+	Crate.name = "[object.containername] [comment ? "([comment])":"" ]"
+	if(object.access)
+		Crate:req_access = list(text2num(object.access))
+
+		//create the manifest slip
+	var/obj/item/weapon/paper/manifest/slip = new /obj/item/weapon/paper/manifest()
+	slip.erroneous = errors
+	slip.points = object.cost
+	slip.ordernumber = ordernum
+
+	var/stationName = (errors & MANIFEST_ERROR_NAME) ? new_station_name() : station_name()
+	var/packagesAmt = shuttle_master.shoppinglist.len + ((errors & MANIFEST_ERROR_COUNT) ? rand(1,2) : 0)
+
+	slip.info = "<h3>[command_name()] Shipping Manifest</h3><hr><br>"
+	slip.info +="Order #[ordernum]<br>"
+	slip.info +="Destination: [stationName]<br>"
+	slip.info +="[packagesAmt] PACKAGES IN THIS SHIPMENT<br>"
+	slip.info +="CONTENTS:<br><ul>"
+
+		//we now create the actual contents
+	var/list/contains
+	if(istype(object, /datum/supply_packs/misc/randomised))
+		var/datum/supply_packs/misc/randomised/SO = object
+		contains = list()
+		if(object.contains.len)
+			for(var/j=1, j<=SO.num_contained, j++)
+				contains += pick(object.contains)
+	else
+		contains = object.contains
+
+	for(var/typepath in contains)
+		if(!typepath)	continue
+		var/atom/A = new typepath(Crate)
+		if(object.amount && A.vars.Find("amount") && A:amount)
+			A:amount = object.amount
+		slip.info += "<li>[A.name]</li>"	//add the item to the manifest (even if it was misplaced)
+
+	if(istype(Crate, /obj/structure/closet/critter)) // critter crates do not actually spawn mobs yet and have no contains var, but the manifest still needs to list them
+		var/obj/structure/closet/critter/CritCrate = Crate
+		if(CritCrate.content_mob)
+			var/mob/crittername = CritCrate.content_mob
+			slip.info += "<li>[initial(crittername.name)]</li>"
+
+	if((errors & MANIFEST_ERROR_ITEM))
+		//secure and large crates cannot lose items
+		if(findtext("[object.containertype]", "/secure/") || findtext("[object.containertype]","/largecrate/"))
+			errors &= ~MANIFEST_ERROR_ITEM
+		else
+			var/lostAmt = max(round(Crate.contents.len/10), 1)
+			//lose some of the items
+			while(--lostAmt >= 0)
+				qdel(pick(Crate.contents))
+
+	//manifest finalisation
+	slip.info += "</ul><br>"
+	slip.info += "CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS<hr>" // And now this is actually meaningful.
+	slip.loc = Crate
+	if(istype(Crate, /obj/structure/closet/crate))
+		var/obj/structure/closet/crate/CR = Crate
+		CR.manifest = slip
+		CR.update_icon()
+	if(istype(Crate, /obj/structure/largecrate))
+		var/obj/structure/largecrate/LC = Crate
+		LC.manifest = slip
+		LC.update_icon()
+
+	return Crate
+
+/datum/controller/process/shuttle/proc/generateSupplyOrder(packId, _orderedby, _orderedbyRank, _comment)
+	if(!packId)
+		return
+	var/datum/supply_packs/P = supply_packs["[packId]"]
+	if(!P)
+		return
+
+	var/datum/supply_order/O = new()
+	O.ordernum = ordernum++
+	O.object = P
+	O.orderedby = _orderedby
+	O.orderedbyRank = _orderedbyRank
+	O.comment = _comment
+
+	requestlist += O
+
+	return O
+

code/controllers/Processes/shuttles/emergency.dm

@@ -14,19 +14,13 @@
 	var/datum/announcement/priority/emergency_shuttle_called = new(0, new_sound = sound('sound/AI/shuttlecalled.ogg'))
 	var/datum/announcement/priority/emergency_shuttle_recalled = new(0, new_sound = sound('sound/AI/shuttlerecalled.ogg'))
 
+/obj/docking_port/mobile/emergency/register()
+	if(!..())
+		return 0 //shuttle master not initialized
 
-/obj/docking_port/mobile/emergency/New()
-	..()
-	spawn(0)
-		if(!shuttle_master)
-			sleep(50)
-			if(!shuttle_master)
-				sleep(50)
-				if(!shuttle_master)
-					throw EXCEPTION("docking port [src] could not initialize")
-					return 0 //give up
-
-		shuttle_master.emergency = src
+	shuttle_master.emergency = src
+	log_to_dd("EMERGENCY FUCKING DOCKING PORT CREATED GOD FUCKING DAMNIT")
+	return 1
 
 /obj/docking_port/mobile/emergency/timeLeft(divisor)
 	if(divisor <= 0)

code/controllers/Processes/shuttles/supply.dm

@@ -0,0 +1,649 @@
+/obj/item/weapon/paper/manifest
+	name = "supply manifest"
+	var/erroneous = 0
+	var/points = 0
+	var/ordernumber = 0
+
+/obj/docking_port/mobile/supply
+	name = "supply shuttle"
+	id = "supply"
+	callTime = 1200
+
+	dir = 8
+	travelDir = 90
+	width = 12
+	dwidth = 5
+	height = 7
+	roundstart_move = "supply_away"
+
+/obj/docking_port/mobile/supply/New()
+	..()
+
+/obj/docking_port/mobile/supply/register()
+	if(!..())
+		return 0
+	shuttle_master.supply = src
+	return 1
+
+/obj/docking_port/mobile/supply/canMove()
+	if(z == ZLEVEL_STATION)
+		return forbidden_atoms_check(areaInstance)
+	return ..()
+
+/obj/docking_port/mobile/supply/request(obj/docking_port/stationary/S)
+	if(mode != SHUTTLE_IDLE)
+		return 2
+	return ..()
+
+/obj/docking_port/mobile/supply/dock()
+	. = ..()
+	if(.)	return .
+
+	buy()
+	sell()
+
+/obj/docking_port/mobile/supply/proc/buy()
+	if(z != ZLEVEL_STATION)		//we only buy when we are -at- the station
+		return 1
+
+	if(!shuttle_master.shoppinglist.len)
+		return 2
+
+	var/list/emptyTurfs = list()
+	for(var/turf/simulated/T in areaInstance)
+		if(T.density)
+			continue
+
+		var/contcount
+		for(var/atom/A in T.contents)
+			if(istype(A,/atom/movable/lighting_overlay))
+				continue
+			if(istype(A,/obj/machinery/light))
+				continue //hacky but whatever, shuttles need three spots each for this shit
+			if(!A.simulated)
+				continue
+			contcount++
+
+		if(contcount)
+			continue
+
+		emptyTurfs += T
+
+	world << "Supply shuttle buying items. emptyTurfs.len = [emptyTurfs.len]"
+
+	for(var/datum/supply_order/SO in shuttle_master.shoppinglist)
+		if(!SO.object)
+			throw EXCEPTION("Supply Order [SO] has no object associated with it.")
+			continue
+
+		world << "Supply shuttle buying [SO], [SO.object]."
+
+		var/turf/T = pick_n_take(emptyTurfs)		//turf we will place it in
+		if(!T)
+			shuttle_master.shoppinglist.Cut(1, shuttle_master.shoppinglist.Find(SO))
+			return
+
+		var/errors = 0
+		if(prob(5))
+			errors |= MANIFEST_ERROR_COUNT
+		if(prob(5))
+			errors |= MANIFEST_ERROR_NAME
+		if(prob(5))
+			errors |= MANIFEST_ERROR_ITEM
+		SO.createObject(T, errors)
+
+	shuttle_master.shoppinglist.Cut()
+
+
+/obj/docking_port/mobile/supply/proc/sell()
+	if(z != ZLEVEL_CENTCOMM)		//we only sell when we are -at- centcomm
+		return 1
+
+	var/plasma_count = 0
+	var/intel_count = 0
+	var/crate_count = 0
+
+	var/msg = ""
+	var/pointsEarned
+
+	for(var/atom/movable/MA in areaInstance)
+		if(MA.anchored)	continue
+		shuttle_master.sold_atoms += " [MA.name]"
+
+		// Must be in a crate (or a critter crate)!
+		if(istype(MA,/obj/structure/closet/crate) || istype(MA,/obj/structure/closet/critter))
+			shuttle_master.sold_atoms += ":"
+			if(!MA.contents.len)
+				shuttle_master.sold_atoms += " (empty)"
+			++crate_count
+
+			var/find_slip = 1
+			for(var/thing in MA)
+				// Sell manifests
+				shuttle_master.sold_atoms += " [thing:name]"
+				if(find_slip && istype(thing,/obj/item/weapon/paper/manifest))
+					var/obj/item/weapon/paper/manifest/slip = thing
+					// TODO: Check for a signature, too.
+					if(slip.stamped && slip.stamped.len) //yes, the clown stamp will work. clown is the highest authority on the station, it makes sense
+						// Did they mark it as erroneous?
+						var/denied = 0
+						for(var/i=1,i<=slip.stamped.len,i++)
+							if(slip.stamped[i] == /obj/item/weapon/stamp/denied)
+								denied = 1
+						if(slip.erroneous && denied) // Caught a mistake by Centcom (IDEA: maybe Centcom rarely gets offended by this)
+							pointsEarned = slip.points - shuttle_master.points_per_crate
+							shuttle_master.points += pointsEarned // For now, give a full refund for paying attention (minus the crate cost)
+							msg += "<font color=green>+[pointsEarned]</font>: Station correctly denied package [slip.ordernumber]: "
+							if(slip.erroneous & MANIFEST_ERROR_NAME)
+								msg += "Destination station incorrect. "
+							else if(slip.erroneous & MANIFEST_ERROR_COUNT)
+								msg += "Packages incorrectly counted. "
+							else if(slip.erroneous & MANIFEST_ERROR_ITEM)
+								msg += "Package incomplete. "
+							msg += "Points refunded.<BR>"
+						else if(!slip.erroneous && !denied) // Approving a proper order awards the relatively tiny points_per_slip
+							shuttle_master.points += shuttle_master.points_per_slip
+							msg += "<font color=green>+[shuttle_master.points_per_slip]</font>: Package [slip.ordernumber] accorded.<BR>"
+						else // You done goofed.
+							if(slip.erroneous)
+								msg += "<font color=red>+0</font>: Station approved package [slip.ordernumber] despite error: "
+								if(slip.erroneous & MANIFEST_ERROR_NAME)
+									msg += "Destination station incorrect."
+								else if(slip.erroneous & MANIFEST_ERROR_COUNT)
+									msg += "Packages incorrectly counted."
+								else if(slip.erroneous & MANIFEST_ERROR_ITEM)
+									msg += "We found unshipped items on our dock."
+								msg += "  Be more vigilant.<BR>"
+							else
+								pointsEarned = round(shuttle_master.points_per_crate - slip.points)
+								shuttle_master.points += pointsEarned
+								msg += "<font color=red>[pointsEarned]</font>: Station denied package [slip.ordernumber].  Our records show no fault on our part.<BR>"
+						find_slip = 0
+					continue
+
+				// Sell plasma
+				if(istype(thing, /obj/item/stack/sheet/mineral/plasma))
+					var/obj/item/stack/sheet/mineral/plasma/P = thing
+					plasma_count += P.amount
+
+				// Sell syndicate intel
+				if(istype(thing, /obj/item/documents/syndicate))
+					++intel_count
+
+				// Sell tech levels
+				if(istype(thing, /obj/item/weapon/disk/tech_disk))
+					var/obj/item/weapon/disk/tech_disk/disk = thing
+					if(!disk.stored) continue
+					var/datum/tech/tech = disk.stored
+
+					var/cost = tech.getCost(shuttle_master.techLevels[tech.id])
+					if(cost)
+						shuttle_master.techLevels[tech.id] = tech.level
+						shuttle_master.points += cost
+						msg += "<font color=green>+[cost]</font>: [tech.name] - new data.<BR>"
+
+				// Sell max reliablity designs
+				if(istype(thing, /obj/item/weapon/disk/design_disk))
+					var/obj/item/weapon/disk/design_disk/disk = thing
+					if(!disk.blueprint) continue
+					var/datum/design/design = disk.blueprint
+					if(design.id in shuttle_master.researchDesigns) continue
+
+					if(initial(design.reliability) < 100 && design.reliability >= 100)
+						// Maxed out reliability designs only.
+						shuttle_master.points += shuttle_master.points_per_design
+						shuttle_master.researchDesigns += design.id
+						msg += "<font color=green>+[shuttle_master.points_per_design]</font>: Reliable [design.name] design.<BR>"
+
+				// Sell exotic plants
+				if(istype(thing, /obj/item/seeds))
+					var/obj/item/seeds/S = thing
+					if(S.seed.get_trait(TRAIT_RARITY) == 0) // Mundane species
+						msg += "<font color=red>+0</font>: We don't need samples of mundane species \"[capitalize(S.seed.seed_name)]\".<BR>"
+					else if(shuttle_master.discoveredPlants[S.type]) // This species has already been sent to CentComm
+						var/potDiff = S.seed.get_trait(TRAIT_POTENCY) - shuttle_master.discoveredPlants[S.type] // Compare it to the previous best
+						if(potDiff > 0) // This sample is better
+							shuttle_master.discoveredPlants[S.type] = S.seed.get_trait(TRAIT_POTENCY)
+							msg += "<font color=green>+[potDiff]</font>: New sample of \"[capitalize(S.seed.seed_name)]\" is superior.  Good work.<BR>"
+							shuttle_master.points += potDiff
+						else // This sample is worthless
+							msg += "<font color=red>+0</font>: New sample of \"[capitalize(S.seed.seed_name)]\" is not more potent than existing sample ([shuttle_master.discoveredPlants[S.type]] potency).<BR>"
+					else // This is a new discovery!
+						shuttle_master.discoveredPlants[S.type] = S.seed.get_trait(TRAIT_POTENCY)
+						msg += "<font color=green>+[S.seed.get_trait(TRAIT_RARITY)]</font>: New species discovered: \"[capitalize(S.seed.seed_name)]\".  Excellent work.<BR>"
+						shuttle_master.points += S.seed.get_trait(TRAIT_RARITY) // That's right, no bonus for potency.  Send a crappy sample first to "show improvement" later
+		qdel(MA)
+		shuttle_master.sold_atoms += "."
+
+	if(plasma_count > 0)
+		pointsEarned = round(plasma_count * shuttle_master.points_per_plasma)
+		msg += "<font color=green>+[pointsEarned]</font>: Received [plasma_count] unit(s) of exotic material.<BR>"
+		shuttle_master.points += pointsEarned
+
+	if(intel_count > 0)
+		pointsEarned = round(intel_count * shuttle_master.points_per_intel)
+		msg += "<font color=green>+[pointsEarned]</font>: Received [intel_count] article(s) of enemy intelligence.<BR>"
+		shuttle_master.points += pointsEarned
+
+	if(crate_count > 0)
+		pointsEarned = round(crate_count * shuttle_master.points_per_crate)
+		msg += "<font color=green>+[pointsEarned]</font>: Received [crate_count] crate(s).<BR>"
+		shuttle_master.points += pointsEarned
+
+	shuttle_master.centcom_message = msg
+
+
+/proc/forbidden_atoms_check(atom/A)
+	var/list/blacklist = list(
+		/mob/living,
+		/obj/effect/blob,
+		/obj/effect/spider/spiderling,
+		/obj/item/weapon/disk/nuclear,
+		/obj/machinery/nuclearbomb,
+		/obj/item/device/radio/beacon,
+		/obj/machinery/the_singularitygen,
+		/obj/singularity,
+		/obj/machinery/teleport/station,
+		/obj/machinery/teleport/hub,
+		/obj/machinery/telepad,
+		/obj/machinery/clonepod
+	)
+	if(A)
+		if(is_type_in_list(A, blacklist))
+			return 1
+		for(var/thing in A)
+			if(.(thing))
+				return 1
+
+	return 0
+
+
+/obj/machinery/computer/ordercomp/attack_hand(mob/user)
+	if(..())
+		return
+	user.set_machine(src)
+	var/dat
+	if(temp)
+		dat = temp
+	else
+		dat += {"<div class='statusDisplay'>Shuttle Location: [shuttle_master.supply.name]<BR>
+		<HR>Supply Points: [shuttle_master.points]<BR></div>
+
+		<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>
+		<A href='?src=\ref[user];mach_close=computer'>Close</A>"}
+
+	// Removing the old window method but leaving it here for reference
+	//user << browse(dat, "window=computer;size=575x450")
+	//onclose(user, "computer")
+
+	// Added the new browser window method
+	var/datum/browser/popup = new(user, "computer", "Supply Ordering Console", 575, 450)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
+	return
+
+/obj/machinery/computer/ordercomp/Topic(href, href_list)
+	if(..())
+		return
+
+	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 = "<div class='statusDisplay'><b>Supply points: [shuttle_master.points]</b><BR>"
+			temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A><BR></div><BR>"
+			temp += "<b>Select a category</b><BR><BR>"
+			for(var/cat in all_supply_groups )
+				temp += "<A href='?src=\ref[src];order=[cat]'>[get_supply_group_name(cat)]</A><BR>"
+		else
+			last_viewed_group = href_list["order"]
+			var/cat = text2num(last_viewed_group)
+			temp = "<div class='statusDisplay'><b>Supply points: [shuttle_master.points]</b><BR>"
+			temp += "<A href='?src=\ref[src];order=categories'>Back to all categories</A><BR></div><BR>"
+			temp += "<b>Request from: [get_supply_group_name(cat)]</b><BR><BR>"
+			for(var/supply_type in shuttle_master.supply_packs )
+				var/datum/supply_packs/N = shuttle_master.supply_packs[supply_type]
+				if(N.hidden || N.contraband || N.group != cat) continue												//Have to send the type instead of a reference to
+				temp += "<A href='?src=\ref[src];doorder=[supply_type]'>[N.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)
+			visible_message("\The [src] flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
+			return
+
+		//Find the correct supply_pack datum
+		if(!shuttle_master.supply_packs["[href_list["doorder"]]"])	return
+
+		var/timeout = world.time + 600
+		var/reason = stripped_input(usr,"Reason:","Why do you require this item?","")
+		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
+
+		var/datum/supply_order/O = shuttle_master.generateSupplyOrder(href_list["doorder"], idname, idrank, reason)
+		if(!O) return
+		O.generateRequisition(loc)
+
+		reqtime = (world.time + 5) % 1e5
+
+		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 = "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A><BR><BR>Current approved orders: <BR><BR>"
+		for(var/datum/supply_order/SO in shuttle_master.shoppinglist)
+			temp += "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]<BR>"
+
+	else if (href_list["viewrequests"])
+		temp = "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A><BR><BR>Current requests: <BR><BR>"
+		for(var/datum/supply_order/SO in shuttle_master.requestlist)
+			temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby]<BR>"
+
+	else if (href_list["mainmenu"])
+		temp = null
+
+	add_fingerprint(usr)
+	updateUsrDialog()
+	return
+
+/obj/machinery/computer/supplycomp/attack_hand(mob/user)
+	if(!allowed(user))
+		user << "<span class='warning'>Access Denied.</span>"
+		return
+
+	if(..())
+		return
+	user.set_machine(src)
+	post_signal("supply")
+	var/dat
+	if (temp)
+		dat = temp
+	else
+		var/atDepot = (shuttle_master.supply.getDockedId() == "supply_away")
+		var/inTransit = (shuttle_master.supply.mode != SHUTTLE_IDLE)
+		var/canOrder = atDepot && !inTransit
+
+		dat += {"<div class='statusDisplay'><B>Supply shuttle</B><HR>
+		Location: [shuttle_master.supply.getStatusText()]<BR>
+		<HR>\nSupply Points: [shuttle_master.points]<BR>\n</div><BR>
+		[canOrder ? "\n<A href='?src=\ref[src];order=categories'>Order items</A><BR>\n<BR>" : "\n*Must be away to order items*<BR>\n<BR>"]
+		[inTransit ? "\n*Shuttle already called*<BR>\n<BR>": atDepot ? "\n<A href='?src=\ref[src];send=1'>Send to station</A><BR>\n<BR>":"\n<A href='?src=\ref[src];send=1'>Send to centcom</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[user];mach_close=computer'>Close</A><BR>
+		<HR>\n<B>Central Command messages:</B><BR> [shuttle_master.centcom_message ? shuttle_master.centcom_message : "Remember to stamp and send back the supply manifests."]"}
+
+	var/datum/browser/popup = new(user, "computer", "Supply Shuttle Console", 700, 455)
+	popup.set_content(dat)
+	popup.open()
+	return
+
+/obj/machinery/computer/supplycomp/emag_act(mob/user)
+	if(!hacked)
+		user << "<span class='notice'>Special supplies unlocked.</span>"
+		hacked = 1
+
+/obj/machinery/computer/supplycomp/Topic(href, href_list)
+	if(..())
+		return
+
+	if(isturf(loc) && ( in_range(src, usr) || istype(usr, /mob/living/silicon) ) )
+		usr.set_machine(src)
+
+	//Calling the shuttle
+	if(href_list["send"])
+		if(shuttle_master.supply.canMove())
+			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'>Main Menu</A>"
+
+		else if(shuttle_master.supply.getDockedId() == "supply_home")
+			temp = "The supply shuttle has departed.<BR><BR><A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+			shuttle_master.toggleShuttle("supply", "supply_home", "supply_away", 1)
+			investigate_log("[usr.key] has sent the supply shuttle away. Remaining points: [shuttle_master.points]. Shuttle contents:[shuttle_master.sold_atoms]", "cargo")
+		else
+			if(!shuttle_master.supply.request(shuttle_master.getDock("supply_home")))
+				temp = "The supply shuttle has been called and will arrive in [shuttle_master.supply.timeLeft(600)] minutes.<BR><BR><A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+				post_signal("supply")
+
+	else if (href_list["order"])
+		if(shuttle_master.supply.mode != SHUTTLE_IDLE) return
+		if(href_list["order"] == "categories")
+			//all_supply_groups
+			//Request what?
+			last_viewed_group = "categories"
+			temp = "<div class='statusDisplay'><b>Supply points: [shuttle_master.points]</b><BR>"
+			temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A><BR></div><BR>"
+			temp += "<b>Select a category</b><BR><BR>"
+			for(var/cat in all_supply_groups )
+				temp += "<A href='?src=\ref[src];order=[cat]'>[get_supply_group_name(cat)]</A><BR>"
+		else
+			last_viewed_group = href_list["order"]
+			var/cat = text2num(last_viewed_group)
+			temp = "<div class='statusDisplay'><b>Supply points: [shuttle_master.points]</b><BR>"
+			temp += "<A href='?src=\ref[src];order=categories'>Back to all categories</A><BR></div><BR>"
+			temp += "<b>Request from: [get_supply_group_name(cat)]</b><BR><BR>"
+			for(var/supply_type in shuttle_master.supply_packs )
+				var/datum/supply_packs/N = shuttle_master.supply_packs[supply_type]
+				if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat)
+					continue		//Have to send the type instead of a reference to
+				temp += "<A href='?src=\ref[src];doorder=[supply_type]'>[N.name]</A> Cost: [N.cost]<BR>"		//the obj because it would get caught by the garbage
+
+		/*temp = "Supply points: [supply_shuttle.points]<BR><HR><BR>Request what?<BR><BR>"
+
+		for(var/supply_name in supply_shuttle.supply_packs )
+			var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name]
+			if(N.hidden && !hacked) continue
+			if(N.contraband && !can_order_contraband) continue
+			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
+		temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"*/
+
+	else if (href_list["doorder"])
+		if(world.time < reqtime)
+			visible_message("\The [src] flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
+			return
+
+		//Find the correct supply_pack datum
+		if(!shuttle_master.supply_packs[href_list["doorder"]])
+			return
+
+		var/timeout = world.time + 600
+		var/reason = stripped_input(usr,"Reason:","Why do you require this item?","")
+		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
+
+		var/datum/supply_order/O = shuttle_master.generateSupplyOrder(href_list["doorder"], idname, idrank, reason)
+		if(!O)	return
+		O.generateRequisition(loc)
+
+		reqtime = (world.time + 5) % 1e5
+
+		temp = "Order request placed.<BR>"
+		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>"
+
+	else if(href_list["confirmorder"])
+		//Find the correct supply_order datum
+		var/ordernum = text2num(href_list["confirmorder"])
+		var/datum/supply_order/O
+		var/datum/supply_packs/P
+		temp = "Invalid Request"
+		for(var/i=1, i<=shuttle_master.requestlist.len, i++)
+			var/datum/supply_order/SO = shuttle_master.requestlist[i]
+			if(SO && SO.ordernum == ordernum)
+				O = SO
+				P = O.object
+				if(shuttle_master.points >= P.cost)
+					shuttle_master.requestlist.Cut(i,i+1)
+					shuttle_master.points -= P.cost
+					shuttle_master.shoppinglist += O
+					temp = "Thanks for your order."
+					investigate_log("[usr.key] has authorized an order for [P.name]. Remaining points: [shuttle_master.points].", "cargo")
+				else
+					temp = "Not enough supply points."
+				break
+		temp += "<BR><BR><A href='?src=\ref[src];viewrequests=1'>Back</A> <A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+
+	else if (href_list["vieworders"])
+		temp = "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A><BR><BR>Current approved orders: <BR><BR>"
+		for(var/datum/supply_order/SO in shuttle_master.shoppinglist)
+			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'>Main Menu</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)
+			var/datum/supply_order/SO = S
+			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'>Main Menu</A>"
+*/
+	else if (href_list["viewrequests"])
+		temp = "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A><BR><BR>Current requests: <BR><BR>"
+		for(var/datum/supply_order/SO in shuttle_master.requestlist)
+			temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby]  [shuttle_master.supply.getDockedId() == "supply_away" ? "<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>"
+
+	else if (href_list["rreq"])
+		var/ordernum = text2num(href_list["rreq"])
+		temp = "Invalid Request.<BR>"
+		for(var/i=1, i<=shuttle_master.requestlist.len, i++)
+			var/datum/supply_order/SO = shuttle_master.requestlist[i]
+			if(SO && SO.ordernum == ordernum)
+				shuttle_master.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"])
+		shuttle_master.requestlist.Cut()
+		temp = "List cleared.<BR>"
+		temp += "<BR><A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+
+	else if (href_list["mainmenu"])
+		temp = null
+
+	add_fingerprint(usr)
+	updateUsrDialog()
+	return
+
+/obj/machinery/computer/supplycomp/proc/post_signal(command)
+
+	var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435)
+
+	if(!frequency) return
+
+	var/datum/signal/status_signal = new
+	status_signal.source = src
+	status_signal.transmission_method = 1
+	status_signal.data["command"] = command
+
+	frequency.post_signal(src, status_signal)
+
+
+/**********
+    MISC
+ **********/
+
+
+/area/supply/station
+	name = "Supply Shuttle"
+	icon_state = "shuttle3"
+	requires_power = 0
+
+/area/supply/dock
+	name = "Supply Shuttle"
+	icon_state = "shuttle3"
+	requires_power = 0
+
+//SUPPLY PACKS MOVED TO /code/defines/obj/supplypacks.dm
+
+/obj/structure/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY
+	name = "\improper plastic flaps"
+	desc = "Completely impassable - or are they?"
+	icon = 'icons/obj/stationobjs.dmi' //Change this.
+	icon_state = "plasticflaps"
+	density = 0
+	anchored = 1
+	layer = 4
+	var/list/mobs_can_pass = list(
+		/mob/living/carbon/slime,
+		/mob/living/simple_animal/mouse,
+		/mob/living/silicon/robot/drone
+		)
+
+/obj/structure/plasticflaps/CanPass(atom/A, turf/T)
+	if(istype(A) && A.checkpass(PASSGLASS))
+		return prob(60)
+
+	var/obj/structure/stool/bed/B = A
+	if (istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
+		return 0
+
+	if(istype(A, /obj/vehicle))	//no vehicles
+		return 0
+
+	var/mob/living/M = A
+	if(istype(M))
+		if(M.lying)
+			return ..()
+		for(var/mob_type in mobs_can_pass)
+			if(istype(A, mob_type))
+				return ..()
+		if(istype(A, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = M
+			if(H.species.is_small)
+				return ..()
+		return 0
+
+	return ..()
+
+/obj/structure/plasticflaps/ex_act(severity)
+	switch(severity)
+		if (1)
+			qdel(src)
+		if (2)
+			if (prob(50))
+				qdel(src)
+		if (3)
+			if (prob(5))
+				qdel(src)
+
+/obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates
+	name = "\improper Airtight plastic flaps"
+	desc = "Heavy duty, airtight, plastic flaps."
+
+	New()
+		air_update_turf(1)
+		..()
+
+	Destroy()
+		air_update_turf(1)
+		return ..()
+
+	CanAtmosPass(turf/T)
+		return 0