Factional Cargo, done in a day

check_regex.yaml

@@ -31,7 +31,7 @@ standards:
     - exactly: [4, "/mob text paths", '"/mob']
     - exactly: [33, "/obj text paths", '"/obj']
     - exactly: [0, "/turf text paths", '"/turf']
-    - exactly: [114, "text2path uses", "text2path"]
+    - exactly: [113, "text2path uses", "text2path"]
 
     - exactly: [18, "world<< uses", 'world[ \t]*<<']
     - exactly: [0, "world.log<< uses", 'world.log[ \t]*<<']

code/controllers/subsystem/shuttle.dm

@@ -30,23 +30,11 @@ SUBSYSTEM_DEF(shuttle)
 
 	/// Whether express consoles are blocked from ordering anything or not
 	var/supplyBlocked = FALSE
-	/// Order number given to next cargo order
-	var/ordernum = 1
-	/// List of all singleton supply pack instances
-	var/list/supply_packs = list()
 
 	/// Stops ALL shuttles from being able to move
 	var/lockdown = FALSE
 
 /datum/controller/subsystem/shuttle/Initialize(timeofday)
-	ordernum = rand(1, 9000)
-
-	for(var/pack in subtypesof(/datum/supply_pack))
-		var/datum/supply_pack/P = new pack()
-		if(!P.contains)
-			continue
-		supply_packs[P.type] = P
-
 	for(var/obj/docking_port/stationary/stationary_port as anything in stationary)
 		stationary_port.load_roundstart()
 		CHECK_TICK
@@ -193,10 +181,7 @@ SUBSYSTEM_DEF(shuttle)
 		transit_requesters = SSshuttle.transit_requesters
 	if (istype(SSshuttle.transit_request_failures))
 		transit_request_failures = SSshuttle.transit_request_failures
-	if (istype(SSshuttle.supply_packs))
-		supply_packs = SSshuttle.supply_packs
 
-	ordernum = SSshuttle.ordernum
 	lockdown = SSshuttle.lockdown
 
 /datum/controller/subsystem/shuttle/proc/is_in_shuttle_bounds(atom/A)

code/game/objects/items/storage/filled_guncases.dm

@@ -23,6 +23,9 @@
 /obj/item/storage/guncase/pistol/shadow
 	gun_type = /obj/item/gun/ballistic/revolver/shadow
 
+/obj/item/storage/guncase/pistol/ashhand
+	gun_type = /obj/item/gun/ballistic/revolver/ashhand
+
 /obj/item/storage/guncase/hellfire
 	gun_type = /obj/item/gun/ballistic/shotgun/hellfire
 
@@ -52,6 +55,14 @@
 /obj/item/storage/guncase/absolution
 	gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow/absolution
 
+/obj/item/storage/guncase/firestorm
+	gun_type = /obj/item/gun/ballistic/automatic/smg/firestorm
+	mag_type = /obj/item/ammo_box/magazine/c45_firestorm_mag
+
+/obj/item/storage/guncase/vickland
+	gun_type = /obj/item/gun/ballistic/automatic/marksman/vickland
+	mag_type = /obj/item/ammo_box/vickland_a308
+
 /* Scarbourough */
 
 /obj/item/storage/guncase/pistol/a357
@@ -86,6 +97,34 @@
 	gun_type = /obj/item/gun/ballistic/automatic/marksman/boomslang/indie
 	mag_type = /obj/item/ammo_box/magazine/boomslang/short
 
+/obj/item/storage/guncase/boomslangmilitary
+	gun_type = /obj/item/gun/ballistic/automatic/marksman/boomslang
+	mag_type = /obj/item/ammo_box/magazine/boomslang/short
+
+/obj/item/storage/guncase/rattlesnake
+	gun_type = /obj/item/gun/ballistic/automatic/pistol/rattlesnake
+	mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
+
+/obj/item/storage/guncase/bulldog
+	gun_type = /obj/item/gun/ballistic/shotgun/automatic/bulldog
+	mag_type = /obj/item/ammo_box/magazine/m12g_bulldog
+
+/obj/item/storage/guncase/sidewinder
+	gun_type = /obj/item/gun/ballistic/automatic/smg/sidewinder
+	mag_type = /obj/item/ammo_box/magazine/m57_39_sidewinder
+
+/obj/item/storage/guncase/hydra
+	gun_type = /obj/item/gun/ballistic/automatic/assault/hydra
+	mag_type = /obj/item/ammo_box/magazine/m556_42_hydra
+
+/obj/item/storage/guncase/sbr80
+	gun_type = /obj/item/gun/ballistic/automatic/assault/hydra/dmr
+	mag_type = /obj/item/ammo_box/magazine/m556_42_hydra/small
+
+/obj/item/storage/guncase/taipan
+	gun_type = /obj/item/gun/ballistic/automatic/marksman/taipan
+	mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+
 /* Etherbor */
 
 /obj/item/storage/guncase/pistol/kalixpistol
@@ -96,6 +135,18 @@
 	gun_type = /obj/item/gun/energy/kalix
 	mag_type = /obj/item/stock_parts/cell/gun/kalix
 
+/obj/item/storage/guncase/energy/bg16
+	gun_type = /obj/item/gun/energy/kalix/pgf
+	mag_type = /obj/item/stock_parts/cell/gun/pgf
+
+/obj/item/storage/guncase/energy/hbg7
+	gun_type = /obj/item/gun/energy/kalix/pgf/heavy
+	mag_type = /obj/item/stock_parts/cell/gun/pgf
+
+/obj/item/storage/guncase/energy/hbg7l
+	gun_type = /obj/item/gun/energy/kalix/pgf/heavy/sniper
+	mag_type = /obj/item/stock_parts/cell/gun/pgf
+
 /* Serene Outdoors Guns */
 
 /obj/item/storage/guncase/pistol/m17
@@ -124,12 +175,32 @@
 	gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/modelh
 	mag_type = /obj/item/ammo_box/magazine/modelh
 
+/obj/item/storage/guncase/pistol/pistolec
+	gun_type = /obj/item/gun/ballistic/automatic/pistol/solgov
+	mag_type = /obj/item/ammo_box/magazine/pistol556mm
+
+/obj/item/storage/guncase/ssg669
+	gun_type = /obj/item/gun/ballistic/rifle/solgov
+	mag_type = /obj/item/ammo_box/a858
+
+/obj/item/storage/guncase/claris
+	gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/claris
+	mag_type = /obj/item/ammo_box/amagpellet_claris
+
+/obj/item/storage/guncase/gar
+	gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/gar
+	mag_type = /obj/item/ammo_box/magazine/gar
+
 /* VI */
 
 /obj/item/storage/guncase/pistol/commander
 	gun_type = /obj/item/gun/ballistic/automatic/pistol/commander
 	mag_type = /obj/item/ammo_box/magazine/co9mm
 
+/obj/item/storage/guncase/vector
+	gun_type = /obj/item/gun/ballistic/automatic/smg/vector
+	mag_type = /obj/item/ammo_box/magazine/smgm9mm
+
 /* Sharplite */
 
 /obj/item/storage/guncase/pistol/miniegun
@@ -148,11 +219,24 @@
 /obj/item/storage/guncase/energy/iongun
 	gun_type = /obj/item/gun/energy/ionrifle
 
+/obj/item/storage/guncase/hades
+	gun_type = /obj/item/gun/energy/e_gun/hades
+	mag_type = /obj/item/stock_parts/cell/gun/upgraded
+
 /* Old NT */
+
 /obj/item/storage/guncase/wt550
 	gun_type = /obj/item/gun/ballistic/automatic/smg/wt550
 	mag_type = /obj/item/ammo_box/magazine/wt550m9
 
+/obj/item/storage/guncase/gauss
+	gun_type = /obj/item/gun/ballistic/automatic/powered/gauss
+	mag_type = /obj/item/ammo_box/magazine/gauss
+
+/obj/item/storage/guncase/saber
+	gun_type = /obj/item/gun/ballistic/automatic/smg/skm_carbine/saber
+	mag_type = /obj/item/ammo_box/magazine/smgm9mm
+
 /* Minutemen */
 
 /obj/item/storage/guncase/pistol/cm23
@@ -167,18 +251,67 @@
 	gun_type = /obj/item/gun/ballistic/automatic/pistol/cm357
 	mag_type = /obj/item/ammo_box/magazine/cm357
 
+/obj/item/storage/guncase/cm5
+	gun_type = /obj/item/gun/ballistic/automatic/smg/cm5
+	mag_type = /obj/item/ammo_box/magazine/cm5_9mm
+
+/obj/item/storage/guncase/cm82
+	gun_type = /obj/item/gun/ballistic/automatic/assault/cm82
+	mag_type = /obj/item/ammo_box/magazine/p16
+
+/obj/item/storage/guncase/cmf4
+	gun_type = /obj/item/gun/ballistic/automatic/marksman/f4
+	mag_type = /obj/item/ammo_box/magazine/f4_308
+
+/obj/item/storage/guncase/cm15
+	gun_type = /obj/item/gun/ballistic/shotgun/cm15
+	mag_type = /obj/item/ammo_box/magazine/cm15_12g
+
+/obj/item/storage/guncase/cmf90
+	gun_type = /obj/item/gun/ballistic/automatic/marksman/f90
+	mag_type = /obj/item/ammo_box/magazine/f90
+
+/obj/item/storage/guncase/cm40
+	gun_type = /obj/item/gun/ballistic/automatic/hmg/cm40
+	mag_type = /obj/item/ammo_box/magazine/cm40_762_40_box
+
+/* Inteq */
+
+/obj/item/storage/guncase/skm_inteq
+	gun_type = /obj/item/gun/ballistic/automatic/assault/skm/inteq
+	mag_type = /obj/item/ammo_box/magazine/skm_762_40
+
+/obj/item/storage/guncase/commissioner
+	gun_type = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
+	mag_type = /obj/item/ammo_box/magazine/co9mm
+
+/obj/item/storage/guncase/mongrel
+	gun_type = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq
+	mag_type = /obj/item/ammo_box/magazine/smgm10mm
+
+/obj/item/storage/guncase/mastiff
+	gun_type = /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq
+	mag_type = /obj/item/ammo_box/magazine/m12g_bulldog
+
+/obj/item/storage/guncase/kingsnake
+	gun_type = /obj/item/gun/ballistic/automatic/pistol/rattlesnake/inteq
+	mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
+
+/obj/item/storage/guncase/ssg04
+	gun_type = /obj/item/gun/ballistic/automatic/marksman/f4/inteq
+	mag_type = /obj/item/ammo_box/magazine/f4_308
+
 /* idk */
 
 /obj/item/storage/guncase/pistol/disposable
 /obj/item/storage/guncase/pistol/disposable/PopulateContents()
 	new /obj/item/gun/ballistic/automatic/pistol/disposable(src)
 	new /obj/item/gun/ballistic/automatic/pistol/disposable(src)
 
-/obj/item/storage/guncase/p16
-	gun_type = /obj/item/gun/ballistic/automatic/assault/p16
-	mag_type = /obj/item/ammo_box/magazine/p16
-
-
 /obj/item/storage/guncase/skm
 	gun_type = /obj/item/gun/ballistic/automatic/assault/skm
 	mag_type = /obj/item/ammo_box/magazine/skm_762_40
+
+/obj/item/storage/guncase/skm_lmg
+	gun_type = /obj/item/gun/ballistic/automatic/hmg/skm_lmg
+	mag_type = /obj/item/ammo_box/magazine/skm_762_40/drum