Upp req console, tank and cas printers (#6988)

# About the pull request spliting the work on HvH gamemode to more PRs for easier rewievs. when making this PR I was told req shuttle would be repalced with new system in a week, it has been few months so I am gona add upp shuttle in future PR # Explain why it's good for the game more flexible and properly instanciented consoles and its own printers and req for UPP is greate for making events <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: add: UPP req console, dropship part fabricato and tank part fabricator /:cl: --------- Co-authored-by: vincibrv <[email protected]> Co-authored-by: Serhey <[email protected]> Co-authored-by: harryob <[email protected]>
cmss13-devs · Jan 7, 2025 · 300996b · 300996b
1 parent 30e6143
commit 300996b
Show file tree

Hide file tree

Showing 26 changed files with 1,519 additions and 68 deletions.
diff --git a/code/_globalvars/lists/mapping_globals.dm b/code/_globalvars/lists/mapping_globals.dm
@@ -3,7 +3,6 @@ GLOBAL_LIST_EMPTY(sorted_areas)
 /// An association from typepath to area instance. Only includes areas with `unique` set.
 GLOBAL_LIST_EMPTY_TYPED(areas_by_type, /area)
 
-GLOBAL_DATUM(supply_elevator, /turf)
 GLOBAL_DATUM(vehicle_elevator, /turf)
 GLOBAL_LIST_EMPTY(spawns_by_job)
 GLOBAL_LIST_EMPTY(spawns_by_squad_and_job)

diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm
@@ -21,28 +21,46 @@
 	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()
 	shuttle.location = 1
 	shuttle.warmup_time = 1
 	shuttle.move_time = ELEVATOR_TRANSIT_DURATION
 	for(var/area/A in GLOB.all_areas)
-		if(A.type == /area/supply/dock)
+		if(A.type == /area/supply/dock/uscm)
 			shuttle.area_offsite = A
 			break
 
 	for(var/area/A in GLOB.all_areas)
-		if(A.type == /area/supply/station)
+		if(A.type == /area/supply/station/uscm)
 			shuttle.area_station = A
 			break
 
 	shuttles["Supply"] = shuttle
 	process_shuttles += shuttle
-
 	GLOB.supply_controller.shuttle = shuttle
 
+	shuttle = new/datum/shuttle/ferry/supply/upp()
+	shuttle.location = 1
+	shuttle.warmup_time = 1
+	shuttle.move_time = ELEVATOR_TRANSIT_DURATION
+	for(var/area/A in GLOB.all_areas)
+		if(A.type == /area/supply/dock/upp)
+			shuttle.area_offsite = A
+			break
+
+	for(var/area/A in GLOB.all_areas)
+		if(A.type == /area/supply/station/upp)
+			shuttle.area_station = A
+			break
+
+	shuttles["Supply upp"] = shuttle
+	process_shuttles += shuttle
+
+	GLOB.supply_controller_upp.shuttle = shuttle
+
 //---ELEVATOR---//
 	// Elevator I
 	shuttle = new /datum/shuttle/ferry/elevator()

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -278,6 +278,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

diff --git a/code/datums/supply_packs/_supply_packs.dm b/code/datums/supply_packs/_supply_packs.dm
@@ -25,6 +25,9 @@
 	/// 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:"

diff --git a/code/datums/supply_packs/upp_ammo.dm b/code/datums/supply_packs/upp_ammo.dm
@@ -0,0 +1,172 @@
+/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_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, 4x mags)"
+	contains = list(
+		/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, 4x mags)"
+	contains = list(
+		/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_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"