Merge pull request #12563 from kevinz000/shuttles

fixes master (shuttles not loading)

code/modules/research/designs/comp_board_designs/comp_board_designs_sec.dm

@@ -10,6 +10,14 @@
 	category = list("Computer Boards")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
 
+/datum/design/board/shuttleseccamera
+	name = "Computer Design (Shuttle-Linked Security Camera)"
+	desc = "Same as a regular security camera console, but when linked to a shuttle, will specifically access cameras on that shuttle."
+	id = "shuttleseccamera"
+	build_path = /obj/item/circuitboard/computer/security/shuttle
+	category = list("Computer Boards")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
 /datum/design/board/secdata
 	name = "Computer Design (Security Records Console)"
 	desc = "Allows for the construction of circuit boards used to build a security records console."

code/modules/shuttle/shuttle.dm

@@ -183,7 +183,7 @@
 		name = "dock[SSshuttle.stationary.len]"
 	if(!area_type)
 		var/area/place = get_area(src)
-		area_type = place?.type // We might be created in nullspace
+		area_type = place?.type || SHUTTLE_DEFAULT_UNDERLYING_AREA // We might be created in nullspace
 
 	if(mapload)
 		for(var/turf/T in return_turfs())
@@ -218,6 +218,9 @@
 		if(!roundstart_template)
 			CRASH("Invalid path ([roundstart_template]) passed to docking port.")
 
+	if(roundstart_template)
+		SSshuttle.manipulator.action_load(roundstart_template, src)
+
 //returns first-found touching shuttleport
 /obj/docking_port/stationary/get_docked()
 	. = locate(/obj/docking_port/mobile) in loc
@@ -704,7 +707,7 @@
 	if(timeleft > 1 HOURS)
 		return "--:--"
 	else if(timeleft > 0)
-		return "[add_leading(num2text((timeleft / 60) % 60), 2, "0")]:[add_leading(num2text(timeleft % 60), 2, " ")]"
+		return "[add_leading(num2text((timeleft / 60) % 60), 2, "0")]:[add_leading(num2text(timeleft % 60), 2, "0")]"
 	else
 		return "00:00"
 

code/modules/shuttle/shuttle_creation/shuttle_upgrades.dm

@@ -4,9 +4,9 @@
 	icon = 'icons/obj/module.dmi'
 	icon_state = "shuttledisk"
 	force = 0
-	throwforce = 8
-	throw_speed = 3
-	throw_range = 5
+	throwforce = 0
+	throw_speed = 1
+	throw_range = 7
 	density = FALSE
 	anchored = FALSE
 	item_flags = NOBLUDGEON