Merge branch 'master' of https://github.com/tgstation/-tg-station into despitebestattemptsthedeweydecimalsystemhasnotyetbeenadaptedtoworkwithsql

Conflicts:
	README.md

code/controllers/subsystem/mobs.dm

@@ -19,4 +19,5 @@ var/datum/subsystem/mobs/SSmob
 		if(thing)
 			thing:Life(seconds)
 			continue
+		WARNING("Found a null in the mob list. Removing.")
 		mob_list.Remove(thing)

code/controllers/subsystem/shuttles.dm

@@ -24,10 +24,13 @@ var/datum/subsystem/shuttle/SSshuttle
 	var/points_per_decisecond = 0.005	//points gained every decisecond
 	var/points_per_slip = 2				//points gained per slip returned
 	var/points_per_crate = 5			//points gained per crate returned
-	var/points_per_intel = 100			//points gained per intel returned
+	var/points_per_intel = 250			//points gained per intel returned
 	var/points_per_plasma = 5			//points gained per plasma returned
+	var/points_per_design = 25			//points gained per max reliability research design returned (only for initilally unreliable designs)
 	var/centcom_message = ""			//Remarks from Centcom on how well you checked the last order.
-	var/list/discoveredPlants = list()	//Unique typepaths for unusual things we've already sent CentComm, associated with their potencies
+	var/list/discoveredPlants = list()	//Typepaths for unusual plants we've already sent CentComm, associated with their potencies
+	var/list/techLevels = list()
+	var/list/researchDesigns = list()
 	var/list/shoppinglist = list()
 	var/list/requestlist = list()
 	var/list/supply_packs = list()
@@ -306,7 +309,7 @@ var/datum/subsystem/shuttle/SSshuttle
 		var/obj/structure/largecrate/LC = Crate
 		LC.manifest = slip
 		LC.update_icon()
-	
+
 	return Crate
 
 /datum/subsystem/shuttle/proc/generateSupplyOrder(packId, _orderedby, _orderedbyRank, _comment)

code/controllers/subsystem/shuttles/emergency.dm

@@ -106,7 +106,8 @@
 			if(time_left <= 0 && !SSshuttle.emergencyNoEscape)
 				//move each escape pod to its corresponding transit dock
 				for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile)
-					M.enterTransit()
+					if(M.z == ZLEVEL_STATION) //Will not launch from the mine/planet
+						M.enterTransit()
 				//now move the actual emergency shuttle to its transit dock
 				enterTransit()
 				mode = SHUTTLE_ESCAPE
@@ -131,16 +132,13 @@
 	width = 3
 	height = 4
 
-	New()
-		if(id == "pod")
-			WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.")
-		..()
+/obj/docking_port/mobile/pod/New()
+	if(id == "pod")
+		WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.")
+	..()
 
-	request()
-		return
-
-	cancel()
-		return
+/obj/docking_port/mobile/pod/cancel()
+	return
 
 /*
 	findTransitDock()
@@ -148,3 +146,27 @@
 		if(.)	return .
 		return ..()
 */
+
+/obj/machinery/computer/shuttle/pod
+	name = "pod control computer"
+	admin_controlled = 1
+	shuttleId = "pod"
+	possible_destinations = "pod_asteroid"
+	icon = 'icons/obj/terminals.dmi'
+	icon_state = "dorm_available"
+	density = 0
+
+/obj/machinery/computer/shuttle/pod/update_icon()
+	return
+
+/obj/machinery/computer/shuttle/pod/emag_act(mob/user as mob)
+	user << "<span class='warning'> Access requirements overridden. The pod may now be launched manually at any time.</span>"
+	admin_controlled = 0
+	icon_state = "dorm_emag"
+
+/obj/docking_port/stationary/random/initialize()
+	..()
+	var/target_area = /area/mine/unexplored
+	var/turfs = get_area_turfs(target_area)
+	var/T=pick(turfs)
+	src.loc = T

code/controllers/subsystem/shuttles/supply.dm

@@ -143,6 +143,32 @@
 				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(SSshuttle.techLevels[tech.id])
+					if(cost)
+						SSshuttle.techLevels[tech.id] = tech.level
+						SSshuttle.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 SSshuttle.researchDesigns) continue
+
+					if(initial(design.reliability) < 100 && design.reliability >= 100)
+						// Maxed out reliability designs only.
+						SSshuttle.points += SSshuttle.points_per_design
+						SSshuttle.researchDesigns += design.id
+						msg += "<font color=green>+[SSshuttle.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.rarity == 0) // Mundane species