Upp req console, tank and cas printers

code/controllers/shuttle_controller.dm

@@ -21,7 +21,7 @@
 	process_shuttles = list()
 	locs_crash = list()
 
-	var/datum/shuttle/ferry/shuttle
+	var/datum/shuttle/ferry/supply/shuttle
 
 	// Supply shuttle
 	shuttle = new/datum/shuttle/ferry/supply()
@@ -40,8 +40,9 @@
 
 	shuttles["Supply"] = shuttle
 	process_shuttles += shuttle
-
 	GLOB.supply_controller.shuttle = shuttle
+	GLOB.supply_controller_upp.shuttle = shuttle
+
 
 //---ELEVATOR---//
 	// Elevator I

code/controllers/subsystem/ticker.dm

@@ -284,6 +284,7 @@ SUBSYSTEM_DEF(ticker)
 		to_chat_spaced(world, html = FONT_SIZE_BIG(SPAN_ROLE_BODY("<B>Welcome to [GLOB.round_statistics.round_name]</B>")))
 
 	GLOB.supply_controller.start_processing()
+	GLOB.supply_controller_upp.start_processing()
 
 	for(var/i in GLOB.closet_list) //Set up special equipment for lockers and vendors, depending on gamemode
 		var/obj/structure/closet/C = i

code/datums/supply_packs/_supply_packs.dm

@@ -25,11 +25,14 @@
 	/// How much "heat" this crate adds, too much heat will send an investigation. Only use for contraband.
 	var/crate_heat = 0
 
+/datum/supply_packs/proc/Get_contains()
+	return contains
+
 /datum/supply_packs/New()
 	if(randomised_num_contained)
 		manifest += "Contains any [randomised_num_contained] of:"
 	manifest += "<ul>"
-	for(var/atom/movable/path in contains)
+	for(var/atom/movable/path in Get_contains())
 		if(!path) continue
 		manifest += "<li>[initial(path.name)]</li>"
 	manifest += "</ul>"

code/datums/supply_packs/black_market.dm

@@ -825,7 +825,7 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted
 /datum/supply_packs/contraband/ammo/bizon
 	name = "Magazines box (Type 64, 10x mags)"
 	dollar_cost = 40
-	contains = list(/obj/item/ammo_box/magazine/type64)
+	contains = list(/obj/item/ammo_box/magazine/type64,)
 	containertype = /obj/structure/largecrate/black_market
 
 /datum/supply_packs/contraband/ammo/m1911

code/datums/supply_packs/upp_ammo.dm

@@ -0,0 +1,220 @@
+/datum/supply_packs/upp/ammo_rounds_box_5_45x39mm
+	name = "ammo box crate (5.45x39mm) (x600 rounds)"
+	contains = list(
+		/obj/item/ammo_box/rounds/type71,
+	)
+	cost = 20
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "5.45x39mm ammo crate"
+	group = "UPP Ammo"
+
+/datum/supply_packs/upp/ammo_rounds_box_5_45x39mm_ap
+	name = "ammo box crate (5.45x39mm AP) (x600 rounds)"
+	contains = list(
+		/obj/item/ammo_box/rounds/type71/ap,
+	)
+	cost = 40
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "5.45x39mm AP ammo crate"
+	group = "UPP Ammo"
+
+
+/datum/supply_packs/upp/ammo_8g_slug
+	name = "Magazine box (Type 23, 20x slug)"
+	contains = list(
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/slug,
+	)
+	cost = 10
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "Type 23 slug ammo crate"
+	group = "UPP Ammo"
+
+/datum/supply_packs/ammo_8g_dragon_breath
+	name = "Magazine box (Type 23, 10x dragon's breath)"
+	contains = list(
+		/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath,
+	)
+	cost = 20
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "Type 23 dragon's breath ammo crate"
+	group = "UPP Ammo"
+
+/datum/supply_packs/ammo_8g_flechette
+	name = "Magazine box (Type 23, 10x flechette)"
+	contains = list(
+		/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
+		/obj/item/ammo_magazine/handful/shotgun/heavy/flechette,
+	)
+	cost = 10
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "Type 23 flechette ammo crate"
+	group = "UPP Ammo"
+
+
+/datum/supply_packs/upp/ammo_Type64_x10
+	name = "Magazine box (Type 64, 10x regular mags)"
+	contains = list(
+		/obj/item/ammo_box/magazine/type64,
+	)
+	cost = 20
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "Type 64 magazines crate"
+	group = "UPP Ammo"
+
+/datum/supply_packs/upp/ammo_Type71_box
+	name = "Magazine box (Type 71, 10x regular mags)"
+	contains = list(
+		/obj/item/ammo_box/magazine/type71,
+	)
+	cost = 20
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "Type 71 magazines crate"
+	group = "UPP Ammo"
+
+/datum/supply_packs/upp/ammo_Type71_box_ap
+	name = "Magazine box (Type 71, 10x AP mags)"
+	contains = list(
+		/obj/item/ammo_box/magazine/type71/ap,
+	)
+	cost = 40
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "Type 71 AP magazines crate"
+	group = "UPP Ammo"
+
+/datum/supply_packs/upp/ammo_m2c_upp
+	name = "M2C ammunition crate (x2)"
+	contains = list(
+		/obj/item/ammo_magazine/m2c,
+		/obj/item/ammo_magazine/m2c,
+	)
+	cost = 25
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "\improper m2c ammunition crate"
+	group = "UPP Ammo"
+
+/datum/supply_packs/upp/ammo_pkp_mags
+	name = "Magazines (QYJ-72, 10x mags)"
+	contains = list(
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
+	)
+	cost = 30
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "QYJ-72 magazines crate"
+	group = "UPP Ammo"
+
+/datum/supply_packs/upp/ammo_minigun_mags
+	name = "Magazines (GSh-7.62, 6x mags)"
+	contains = list(
+		/obj/item/ammo_magazine/minigun,
+		/obj/item/ammo_magazine/minigun,
+		/obj/item/ammo_magazine/minigun,
+		/obj/item/ammo_magazine/minigun,
+		/obj/item/ammo_magazine/minigun,
+		/obj/item/ammo_magazine/minigun,
+	)
+	cost = 30
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "GSh-7.62 magazines crate"
+	group = "UPP Special Ammo"
+
+/datum/supply_packs/upp/ammo_Type88_x10
+	name = "Magazines (Type 88, 10x regular mags)"
+	contains = list(
+		/obj/item/ammo_magazine/sniper/svd,
+		/obj/item/ammo_magazine/sniper/svd,
+		/obj/item/ammo_magazine/sniper/svd,
+		/obj/item/ammo_magazine/sniper/svd,
+		/obj/item/ammo_magazine/sniper/svd,
+		/obj/item/ammo_magazine/sniper/svd,
+		/obj/item/ammo_magazine/sniper/svd,
+		/obj/item/ammo_magazine/sniper/svd,
+		/obj/item/ammo_magazine/sniper/svd,
+		/obj/item/ammo_magazine/sniper/svd,
+		/obj/item/ammo_magazine/sniper/svd,
+	)
+	cost = 20
+	containertype = /obj/structure/closet/crate/ammo
+	containername = "Type 88 magazines crate"
+	group = "UPP Special Ammo"
+
+/datum/supply_packs/upp/ammo_rpg_he
+	name = "HJRA-12 HE Rocket Crate (x3)"
+	contains = list(
+		/obj/item/ammo_magazine/rocket/upp,
+		/obj/item/ammo_magazine/rocket/upp,
+		/obj/item/ammo_magazine/rocket/upp,
+	)
+	cost = 30
+	containertype = /obj/structure/closet/crate/explosives
+	containername = "HJRA-12 HE Rocket Crate"
+	group = "UPP Special Ammo"
+
+/datum/supply_packs/upp/ammo_rpg_ap
+	name = "HJRA-12 AP Rocket Crate (x3)"
+	contains = list(
+		/obj/item/ammo_magazine/rocket/upp/at,
+		/obj/item/ammo_magazine/rocket/upp/at,
+		/obj/item/ammo_magazine/rocket/upp/at,
+	)
+	cost = 30
+	containertype = /obj/structure/closet/crate/explosives
+	containername = "HJRA-12 AP Rockets Crate"
+	group = "UPP Special Ammo"
+
+/datum/supply_packs/upp/ammo_rpg_wp
+	name = "HJRA-12 Extreme-Intensity Incendiary Rocket Crate (x3)"
+	contains = list(
+		/obj/item/ammo_magazine/rocket/upp/incen,
+		/obj/item/ammo_magazine/rocket/upp/incen,
+		/obj/item/ammo_magazine/rocket/upp/incen,
+	)
+	cost = 30
+	containertype = /obj/structure/closet/crate/explosives
+	containername = "HJRA-12 Extreme-Intensity Incendiary Rocket Crate"
+	group = "UPP Special Ammo"