Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi

code/datums/components/crafting/recipes/recipes_misc.dm

@@ -336,6 +336,18 @@
 	subcategory = CAT_TOOL
 	category = CAT_MISC
 
+/datum/crafting_recipe/blackmarket_uplink
+	name = "Black Market Uplink"
+	result = /obj/item/blackmarket_uplink
+	time = 20
+	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	reqs = list(/obj/item/stock_parts/subspace/amplifier = 1,
+		/obj/item/stack/cable_coil = 15,
+		/obj/item/radio = 1,
+		/obj/item/analyzer = 1)
+	subcategory = CAT_MISCELLANEOUS
+	category = CAT_MISC
+
 /datum/crafting_recipe/heretic/codex
 	name = "Codex Cicatrix"
 	result = /obj/item/forbidden_book

code/datums/shuttles.dm

@@ -204,12 +204,11 @@
 	// first 10 minutes only
 	return world.time - SSticker.round_start_time < 6000
 
-// this is broken and does not work. Thanks TG
-// /datum/map_template/shuttle/emergency/airless/post_load()
-// 	. = ..()
-// 	//enable buying engines from cargo
-// 	var/datum/supply_pack/P = SSshuttle.supply_packs[/datum/supply_pack/engineering/shuttle_engine]
-// 	P.special_enabled = TRUE
+/datum/map_template/shuttle/emergency/construction/post_load()
+	. = ..()
+	//enable buying engines from cargo
+	var/datum/supply_pack/P = SSshuttle.supply_packs[/datum/supply_pack/engineering/shuttle_engine]
+	P.special_enabled = TRUE
 
 
 /datum/map_template/shuttle/emergency/asteroid