small cargo code cleanup (#3941)

* move everything

* stuff

* done

* done

* i hate nanoui

* that

* listmaniia

* that

* okay that's a higgs bugson moment

* oh god git why

* a

* a

* fixes

* keyboard moment

code/_rendering/atom_huds/data_huds.dm

@@ -45,6 +45,8 @@
 /mob/living/update_hud_med_health()
 	. = ..()
 	var/image/I = hud_list[LIFE_HUD]
+	if(!I)
+		return
 	if(stat == DEAD)
 		I.icon_state = "-100"
 	else
@@ -52,6 +54,8 @@
 
 /mob/proc/update_hud_med_status()
 	var/image/holder = hud_list[STATUS_HUD]
+	if(!holder)
+		return
 	var/foundVirus = check_viruses()
 	if(isSynthetic())
 		holder.icon_state = "robo"
@@ -73,18 +77,20 @@
 	var/image/Itrack = hud_list[IMPTRACK_HUD]
 	var/image/Ichem = hud_list[IMPCHEM_HUD]
 	var/image/Iloyal = hud_list[IMPLOYAL_HUD]
-	Itrack.icon_state = Ichem.icon_state = Iloyal.icon_state = ""
+	Itrack?.icon_state = ""
+	Ichem?.icon_state = ""
+	Iloyal?.icon_state = ""
 	for(var/obj/item/implant/I in src)
 		if(!I.implanted)
 			continue
 		if(I.malfunction)
 			continue
 		if(istype(I, /obj/item/implant/tracking))
-			Itrack.icon_state = "tracking"
+			Itrack?.icon_state = "tracking"
 		if(istype(I, /obj/item/implant/loyalty))
-			Iloyal.icon_state = "loyal"
+			Iloyal?.icon_state = "loyal"
 		if(istype(I, /obj/item/implant/chem))
-			Ichem.icon_state = "chem"
+			Ichem?.icon_state = "chem"
 
 /mob/proc/update_hud_sec_job()
 	return
@@ -92,6 +98,8 @@
 /mob/living/carbon/human/update_hud_sec_job()
 	. = ..()
 	var/image/holder = hud_list[ID_HUD]
+	if(!holder)
+		return
 	if(wear_id)
 		var/obj/item/card/id/I = wear_id.GetID()
 		if(I)
@@ -103,10 +111,12 @@
 
 /mob/proc/update_hud_sec_status()
 	var/image/holder = hud_list[WANTED_HUD]
-	holder.icon_state = ""
+	holder?.icon_state = ""
 
 /mob/living/carbon/human/update_hud_sec_status()
 	var/image/holder = hud_list[WANTED_HUD]
+	if(!holder)
+		return
 	holder.icon_state = ""
 	var/perpname = name
 	if(wear_id)
@@ -132,6 +142,8 @@
 
 /mob/proc/update_hud_antag()
 	var/image/holder = hud_list[ANTAG_HUD]
+	if(!holder)
+		return
 	holder.icon_state = ""
 	if(mind?.special_role)
 		// ANTAG DATUM REFACTOR WHEN AUHGAOUSHGODHGHOAD

code/_rendering/clickcatcher/clickcatcher.dm

@@ -47,7 +47,7 @@
 
 /atom/movable/screen/click_catcher/proc/Parse(scr_loc, turf/origin, client/C)
 	// screen-loc: Pixel coordinates in screen_loc format ("[tile_x]:[pixel_x],[tile_y]:[pixel_y]")
-	if(!scr_loc)
+	if(!scr_loc || !origin)
 		return null
 	var/tX = splittext(scr_loc, ",")
 	var/tY = splittext(tX[2], ":")

code/controllers/subsystem/supply.dm

@@ -189,72 +189,35 @@ SUBSYSTEM_DEF(supply)
 
 	var/orderedamount = shoppinglist.len
 	var/list/clear_turfs = get_clear_turfs()
-
 	for(var/datum/supply_order/SO in shoppinglist)
-		if(!clear_turfs.len)
+		// if there's no space left don't cram in the rest
+		var/turf/T = pick_n_take(clear_turfs)
+		if(!T)
 			break
 
-		var/i = rand(1,clear_turfs.len)
-		var/turf/pickedloc = clear_turfs[i]
-		clear_turfs.Cut(i,i+1)
-
 		SO.status = SUP_ORDER_SHIPPED
 		var/datum/supply_pack/SP = SO.object
-
-		var/obj/A = new SP.containertype(pickedloc)
-		A.name = "[SP.containername] [SO.comment ? "([SO.comment])":"" ]"
+		var/atom/movable/container = SP.Instantiate(T)
+		if(SO.comment)
+			container.name += " [SO.comment]"
 
 		// Supply manifest generation begin
 		var/obj/item/paper/manifest/slip
 		if(!SP.contraband)
-			slip = new /obj/item/paper/manifest(A)
+			slip = new /obj/item/paper/manifest(container)
 			slip.is_copy = 0
-			slip.info = "<h3>[command_name()] Shipping Manifest</h3><hr><br>"
-			slip.info +="Order #[SO.ordernum]<br>"
-			slip.info +="Destination: [station_name()]<br>"
-			slip.info +="[orderedamount] PACKAGES IN THIS SHIPMENT<br>"
-			slip.info +="CONTENTS:<br><ul>"
-
-		// Spawn the stuff, finish generating the manifest while you're at it
-		if(SP.access)
-			if(isnum(SP.access))
-				A.req_access = list(SP.access)
-			else if(islist(SP.access) && SP.one_access)
-				var/list/L = SP.access	// Access var is a plain var, we need a list
-				A.req_one_access = L.Copy()
-				A.req_access = null
-			else if(islist(SP.access) && !SP.one_access)
-				var/list/L = SP.access
-				A.req_access = L.Copy()
-			else
-				log_debug("<span class='danger'>Supply pack with invalid access restriction [SP.access] encountered!</span>")
-
-		var/list/contains
-		if(istype(SP,/datum/supply_pack/randomised))
-			var/datum/supply_pack/randomised/SPR = SP
-			contains = list()
-			if(SPR.contains.len)
-				for(var/j=1,j<=SPR.num_contained,j++)
-					contains += pick(SPR.contains)
-		else
-			contains = SP.contains
-
-		for(var/typepath in contains)
-			if(!typepath)
-				continue
-
-			var/number_of_items = max(1, contains[typepath])
-			for(var/j = 1 to number_of_items)
-				var/atom/B2 = new typepath(A)
-				if(slip)
-					slip.info += "<li>[B2.name]</li>"	// Add the item to the manifest
-
-		// Manifest finalisation
-		if(slip)
-			slip.info += "</ul><br>"
-			slip.info += "CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS<hr>"
-
-	return
+			// save the trip to the string tree
+			var/list/info = list()
+			info += "<h3>[command_name()] Shipping Manifest</h3><hr><br>"
+			info +="Order #[SO.ordernum]<br>"
+			info +="Destination: [station_name()]<br>"
+			info +="[orderedamount] PACKAGES IN THIS SHIPMENT<br>"
+			info += "<hr>"
+			info += SP.get_html_manifest(container)
+			info += "<hr>"
+			info += "CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS"
+			info += "<hr>"
+			slip.info += info.Join("")
 
 // Will attempt to purchase the specified order, returning TRUE on success, FALSE on failure
 /datum/controller/subsystem/supply/proc/approve_order(var/datum/supply_order/O, var/mob/user)

code/datums/supplypacks/supplypacks.dm

@@ -1,60 +0,0 @@
-//SUPPLY PACKS
-//NOTE: only secure crate types use the access var (and are lockable)
-//NOTE: hidden packs only show up when the computer has been hacked.
-//ANOTER NOTE: Contraband is obtainable through modified supplycomp circuitboards.
-//BIG NOTE: Don't add living things to crates, that's bad, it will break the shuttle.
-//NEW NOTE: Do NOT set the price of any crates below 7 points. Doing so allows infinite points.
-//NOTE NOTE: Hidden var is now deprecated, whoever removed support for it should've removed the var altogether
-
-//var/list/all_supply_groups = list("Operations","Security","Hospitality","Engineering","Atmospherics","Medical","Reagents","Reagent Cartridges","Science","Hydroponics", "Supply", "Miscellaneous")
-var/list/all_supply_groups = list("Atmospherics",
-								  "Costumes",
-								  "Engineering",
-								  "Hospitality",
-								  "Hydroponics",
-								  "Materials",
-								  "Medical",
-								  "Miscellaneous",
-								  "Munitions",
-								  "Reagents",
-								  "Reagent Cartridges",
-								  "Recreation",
-								  "Robotics",
-								  "Science",
-								  "Security",
-								  "Supplies",
-								  "Voidsuits")
-
-/datum/supply_pack
-	var/name = null
-	var/list/contains = list() // Typepaths, used to actually spawn the contents
-	var/list/manifest = list() // Object names, used to compile manifests
-	var/cost = null
-	var/containertype = null
-	var/containername = null
-	var/access = null
-	var/one_access = FALSE
-	var/contraband = 0
-	var/num_contained = 0		//number of items picked to be contained in a /randomised crate
-	var/group = "Miscellaneous"
-
-/datum/supply_pack/New()
-	for(var/path in contains)
-		if(!path || !ispath(path, /atom))
-			continue
-		var/atom/O = path
-		manifest += "\proper[initial(O.name)]"
-
-/datum/supply_pack/proc/get_html_manifest()
-	var/dat = ""
-	if(num_contained)
-		dat +="Contains any [num_contained] of:"
-	dat += "<ul>"
-	for(var/O in manifest)
-		dat += "<li>[O]</li>"
-	dat += "</ul>"
-	return dat
-
-// Keeping this subtype here for posterity, so it's more apparent that this is the subtype to use if making new randomised packs
-/datum/supply_pack/randomised
-	num_contained = 1

code/game/machinery/computer/supply.dm

@@ -51,9 +51,6 @@
 		req_access = list()
 		return 1
 
-
-
-
 /obj/machinery/computer/supplycomp/nano_ui_interact(mob/user, ui_key = "supply_records", var/datum/nanoui/ui = null, var/force_open = 1, var/key_state = null)
 	var/data[0]
 	var/shuttle_status[0]	// Supply shuttle status
@@ -121,8 +118,8 @@
 					"name" = P.name,
 					"cost" = P.cost,
 					"contraband" = P.contraband,
-					"manifest" = uniqueList(P.manifest),
-					"random" = P.num_contained,
+					"manifest" = P.flattened_nanoui_manifest(),
+					"random" = P.is_random(),
 					"expand" = 0,
 					"ref" = "\ref[P]"
 				)
@@ -266,8 +263,7 @@
 			reqform.info += "REASON: [reason]<br>"
 			reqform.info += "SUPPLY CRATE TYPE: [S.name]<br>"
 			reqform.info += "ACCESS RESTRICTION: [get_access_desc(S.access)]<br>"
-			reqform.info += "CONTENTS:<br>"
-			reqform.info +=  S.get_html_manifest()
+			reqform.info +=  S.get_html_manifest().Join("")
 			reqform.info += "<hr>"
 			reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:<br>"
 

code/game/world.dm

@@ -25,6 +25,8 @@ GLOBAL_LIST(topic_status_cache)
 	var/tempfile = "data/logs/config_error.[GUID()].log"	//temporary file used to record errors with loading config, moved to log directory once logging is set
 	GLOB.config_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_map_error_log = GLOB.world_attack_log = GLOB.world_game_log = tempfile
 
+	world.log = tempfile
+
 	world.Profile(PROFILE_START)
 	make_datum_reference_lists()	//initialises global lists for referencing frequently used datums (so that we only ever do it once)
 	setupgenetics()
@@ -38,12 +40,14 @@ GLOBAL_LIST(topic_status_cache)
 
 	SetupLogs()
 
-#ifndef USE_CUSTOM_ERROR_HANDLER
-	world.log = file("[GLOB.log_directory]/dd.log")
-#else
-	if (TgsAvailable())
-		world.log = file("[GLOB.log_directory]/dd.log") //not all runtimes trigger world/Error, so this is the only way to ensure we can see all of them.
-#endif
+// #ifndef USE_CUSTOM_ERROR_HANDLER
+// 	world.log = file("[GLOB.log_directory]/dd.log")
+// #else
+// 	if (TgsAvailable())
+// 		world.log = file("[GLOB.log_directory]/dd.log") //not all runtimes trigger world/Error, so this is the only way to ensure we can see all of them.
+// #endif
+
+	world.log = file("[GLOB.log_directory]/dd.log")	// screw you, disk space be damned our codebase has 50000 errors, START FIXING THEM.
 
 	config_legacy.post_load()
 

code/modules/cargo/supplypacks/_supplypacks.dm

@@ -0,0 +1,214 @@
+/**
+ * supplypacks
+ * these are the "bundle buys" of cargo
+ * they usually ship in a crate and is used by the main
+ * cargo system, as opposed to trading, but is perfectly usable
+ * by anything using the spawn procs.
+ */
+
+//SUPPLY PACKS
+//NOTE: only secure crate types use the access var (and are lockable)
+//NOTE: hidden packs only show up when the computer has been hacked.
+//ANOTER NOTE: Contraband is obtainable through modified supplycomp circuitboards.
+//BIG NOTE: Don't add living things to crates, that's bad, it will break the shuttle.
+//NEW NOTE: Do NOT set the price of any crates below 7 points. Doing so allows infinite points.
+//NOTE NOTE: Hidden var is now deprecated, whoever removed support for it should've removed the var altogether
+
+var/list/all_supply_groups = list("Atmospherics",
+								  "Costumes",
+								  "Engineering",
+								  "Hospitality",
+								  "Hydroponics",
+								  "Materials",
+								  "Medical",
+								  "Miscellaneous",
+								  "Munitions",
+								  "Reagents",
+								  "Reagent Cartridges",
+								  "Recreation",
+								  "Robotics",
+								  "Science",
+								  "Security",
+								  "Supplies",
+								  "Voidsuits")
+
+/datum/supply_pack
+	var/name
+	var/cost
+
+	// the container
+	/// the type of the containier we spawn at - our contained objects will spawn in this.
+	var/container_type = /obj/structure/closet/crate/plastic
+	/// the name to set on our container, if any
+	var/container_name
+	/// the desc to set on our container, if any
+	var/container_desc
+
+	// the contained
+	/// what we contain - list of typepaths associated to count. if no count is associated, it's assumed to be one.
+	var/list/contains
+
+	var/access
+	var/one_access = FALSE
+	var/contraband = 0
+	var/group = "Miscellaneous"
+
+/**
+ * instance the supply pack at a location. returns the container used.
+ */
+/datum/supply_pack/proc/Instantiate(atom/loc)
+	RETURN_TYPE(/atom/movable)
+	. = InstanceContainer(loc)
+	SetupContainer(.)
+	SpawnContents(.)
+
+/**
+ * creates our container
+ */
+/datum/supply_pack/proc/InstanceContainer(atom/loc)
+	RETURN_TYPE(/atom/movable)
+	return new container_type(loc)
+
+/**
+ * sets up our container, happens before objects are spawned
+ */
+/datum/supply_pack/proc/SetupContainer(atom/movable/container)
+	if(container_name)
+		container.name = container_name
+	if(container_desc)
+		container.desc = container_desc
+	if(isobj(container))
+		var/obj/O = container
+		// only objs have the concept of access
+		if(access)
+			if(isnum(access))
+				O.req_access = list(access)
+			else if(islist(access) && one_access)
+				var/list/L = access	// Access var is a plain var, we need a list
+				O.req_one_access = L.Copy()
+				O.req_access = null
+			else if(islist(access) && !one_access)
+				var/list/L = access
+				O.req_access = L.Copy()
+			else
+				log_debug("<span class='danger'>Supply pack with invalid access restriction [access] encountered!</span>")
+
+/**
+ * spawn an object of a certain type
+ */
+/datum/supply_pack/proc/InstanceObject(path, atom/loc, ...)
+	RETURN_TYPE(/atom/movable)
+	return new path(arglist(args.Copy(2)))
+
+/**
+ * spawwns our contents into a container. if you need special behavior like randomization, besure to modify default manifest too!
+ */
+/datum/supply_pack/proc/SpawnContents(atom/loc)
+	var/list/to_spawn = preprocess_contents_list()
+	if(!LAZYLEN(to_spawn))
+		return
+	var/safety = 500
+	for(var/path in to_spawn)
+		var/amount = to_spawn[path] || 1
+		for(var/i in 1 to amount)
+			if(!--safety)
+				// adminproofing
+				// no, no admin would fuck this up but myself
+				// hence, self-proofing
+				// ~silicons
+				CRASH("Ran out of safety during SpawnContents")
+			InstanceObject(path, loc)
+
+/**
+ * used to preprocess the contained list for spawning
+ */
+/datum/supply_pack/proc/preprocess_contents_list()
+	return contains.Copy()
+
+/**
+ * generates our HTML manifest as a **list**
+ *
+ * argument is provided for container incase you want to modify based on what actually spawned
+ */
+/datum/supply_pack/proc/get_html_manifest(atom/movable/container)
+	RETURN_TYPE(/list)
+	var/list/lines = list()
+	lines += "Contents:<br>"
+	lines += "<ul>"
+	for(var/path in contains)
+		var/amount = contains[path] || 1
+		var/atom/movable/AM = path
+		var/name = initial(AM.name)
+		lines += "<li>[amount > 1? "[amount] [name](s)" : "[name]"]</li>"
+	lines += "</ul>"
+	return lines
+
+	// ^\s+to_chat\(world\s*,\s*"[a-zA-Z0-9 .\[\]_]*"\)\n
+
+/**
+ * returns if we're random. if we are, return number of items.
+ * required for old nanoui
+ * this proc's existence, as well as hardcoded ui data for packs, really makes me hate life
+ * but i'm not doing nanoui/tgui conversion today.
+ */
+/datum/supply_pack/proc/is_random()
+	return FALSE
+
+/**
+ * gets a list of things to show on nanoui
+ * god, i hate nanoui
+ * burn this proc and is_random() with fire at some point, please.
+ */
+/datum/supply_pack/proc/flattened_nanoui_manifest()
+	. = list()
+	for(var/path in contains)
+		var/amount = contains[path] || 1
+		var/atom/movable/AM = path
+		var/name = initial(AM.name)
+		. += "[amount > 1? "[amount] [name](s)" : "[name]"]"
+
+/**
+ * randomized supplypacks
+ * only x items can be ever spawned
+ * weighting is equal - the list of typepaths normally spawned is treated as pick-and-take-one-of.
+ *
+ * maybe we should roll this into default functionality
+ * question for another day, not like we aren't modular enough with this system now to do it easily.
+ */
+/datum/supply_pack/randomised
+	/// how many of our items at random to spawn
+	var/num_contained = 1
+
+/datum/supply_pack/randomised/get_html_manifest(atom/movable/container)
+	var/list/lines = list()
+	lines += "Contains any [num_contained] of the following:<br>"
+	lines += "<ul>"
+	for(var/path in contains)
+		var/amount = contains[path] || 1
+		var/atom/movable/AM = path
+		var/name = initial(AM.name)
+		lines += "<li>[amount > 1? "[amount] [name](s)" : "[name]"]</li>"
+	lines += "</ul>"
+	return lines
+
+/datum/supply_pack/randomised/preprocess_contents_list()
+	var/list/L = list()
+	// first, flatten list
+	for(var/path in contains)
+		L[path] = contains[path] || 1
+	// pick and take
+	. = list()
+	for(var/i in 1 to num_contained)
+		var/path = SAFEPICK(L)
+		if(!path)
+			break
+		L[path]--
+		if(!L[path])
+			L -= path
+		if(.[path])
+			.[path]++
+		else
+			.[path] = 1
+
+/datum/supply_pack/randomised/is_random()
+	return num_contained

code/modules/cargo/supplypacks/atmospherics.dm

@@ -11,58 +11,58 @@
 	name = "Inflatable barriers"
 	contains = list(/obj/item/storage/briefcase/inflatable = 3)
 	cost = 20
-	containertype = /obj/structure/closet/crate/engineering
-	containername = "Inflatable Barrier Crate"
+	container_type = /obj/structure/closet/crate/engineering
+	container_name = "Inflatable Barrier Crate"
 
 /datum/supply_pack/atmos/canister_empty
 	name = "Empty gas canister"
 	cost = 7
-	containername = "Empty gas canister crate"
-	containertype = /obj/structure/largecrate
+	container_name = "Empty gas canister crate"
+	container_type = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister)
 
 /datum/supply_pack/atmos/canister_air
 	name = "Air canister"
 	cost = 10
-	containername = "Air canister crate"
-	containertype = /obj/structure/largecrate
+	container_name = "Air canister crate"
+	container_type = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister/air)
 
 /datum/supply_pack/atmos/canister_oxygen
 	name = "Oxygen canister"
 	cost = 15
-	containername = "Oxygen canister crate"
-	containertype = /obj/structure/largecrate
+	container_name = "Oxygen canister crate"
+	container_type = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister/oxygen)
 
 /datum/supply_pack/atmos/canister_nitrogen
 	name = "Nitrogen canister"
 	cost = 10
-	containername = "Nitrogen canister crate"
-	containertype = /obj/structure/largecrate
+	container_name = "Nitrogen canister crate"
+	container_type = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister/nitrogen)
 
 /datum/supply_pack/atmos/canister_phoron
 	name = "Phoron gas canister"
 	cost = 60
-	containername = "Phoron gas canister crate"
-	containertype = /obj/structure/closet/crate/secure/large
+	container_name = "Phoron gas canister crate"
+	container_type = /obj/structure/closet/crate/secure/large
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/phoron)
 
 /datum/supply_pack/atmos/canister_nitrous_oxide
 	name = "N2O gas canister"
 	cost = 15
-	containername = "N2O gas canister crate"
-	containertype = /obj/structure/closet/crate/secure/large
+	container_name = "N2O gas canister crate"
+	container_type = /obj/structure/closet/crate/secure/large
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/nitrous_oxide)
 
 /datum/supply_pack/atmos/canister_carbon_dioxide
 	name = "Carbon dioxide gas canister"
 	cost = 15
-	containername = "CO2 canister crate"
-	containertype = /obj/structure/closet/crate/secure/large
+	container_name = "CO2 canister crate"
+	container_type = /obj/structure/closet/crate/secure/large
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/carbon_dioxide)
 
@@ -70,16 +70,16 @@
 	contains = list(/obj/machinery/pipedispenser/orderable)
 	name = "Pipe Dispenser"
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/large
-	containername = "Pipe Dispenser Crate"
+	container_type = /obj/structure/closet/crate/secure/large
+	container_name = "Pipe Dispenser Crate"
 	access = access_atmospherics
 
 /datum/supply_pack/atmos/disposals_dispenser
 	contains = list(/obj/machinery/pipedispenser/disposal/orderable)
 	name = "Disposals Pipe Dispenser"
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/large
-	containername = "Disposal Dispenser Crate"
+	container_type = /obj/structure/closet/crate/secure/large
+	container_name = "Disposal Dispenser Crate"
 	access = access_atmospherics
 
 /datum/supply_pack/atmos/internals
@@ -89,8 +89,8 @@
 			/obj/item/tank/air = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/internals
-	containername = "Internals crate"
+	container_type = /obj/structure/closet/crate/internals
+	container_name = "Internals crate"
 
 /datum/supply_pack/atmos/evacuation
 	name = "Emergency equipment"
@@ -104,5 +104,5 @@
 			/obj/item/clothing/mask/gas = 4
 			)
 	cost = 35
-	containertype = /obj/structure/closet/crate/internals
-	containername = "Emergency crate"
+	container_type = /obj/structure/closet/crate/internals
+	container_name = "Emergency crate"

code/modules/cargo/supplypacks/contraband.dm

@@ -16,8 +16,8 @@
 
 	name = "Contraband crate"
 	cost = 25
-	containertype = /obj/structure/closet/crate
-	containername = "Unlabeled crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Unlabeled crate"
 	contraband = 1
 	group = "Supplies"
 
@@ -29,8 +29,8 @@
 			/obj/item/grenade/chem_grenade/incendiary
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate
-	containername = "Special Ops crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Special Ops crate"
 	contraband = 1
 
 /datum/supply_pack/supply/moghes
@@ -40,8 +40,8 @@
 			/obj/item/reagent_containers/food/snacks/unajerky = 4
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate
-	containername = "Moghes imports crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Moghes imports crate"
 	contraband = 1
 
 /datum/supply_pack/munitions/bolt_rifles_militia
@@ -52,8 +52,8 @@
  			)
  	cost = 50
  	contraband = 1
- 	containertype = /obj/structure/closet/crate/secure/weapon
- 	containername = "Ballistic weapons crate"
+ 	container_type = /obj/structure/closet/crate/secure/weapon
+ 	container_name = "Ballistic weapons crate"
 
 /datum/supply_pack/randomised/misc/telecrate //you get something awesome, a couple of decent things, and a few weak/filler things
 	name = "ERR_NULL_ENTRY" //null crate! also dream maker is hell,
@@ -104,15 +104,15 @@
 			)
 	cost = 250 //more than a hat crate!,
 	contraband = 1
-	containertype = /obj/structure/largecrate
-	containername = "Suspicious crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Suspicious crate"
 
 /datum/supply_pack/supply/stolen
 	name = "Stolen Supply Crate"
 	contains = list(/obj/item/stolenpackage = 1)
 	cost = 75
-	containertype = /obj/structure/closet/crate
-	containername = "shady crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "shady crate"
 	contraband = 1
 
 /datum/supply_pack/randomised/stolenplus
@@ -123,16 +123,16 @@
 		/obj/item/stolenpackageplus,
 		) // uh oh
 	cost = 375 //slight discount? still contraband tho glhf
-	containertype = /obj/structure/closet/crate
-	containername = "shadier crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "shadier crate"
 	contraband = 1
 	group = "Supplies"
 
 /datum/supply_pack/supply/wolfgirl
 	name = "Wolfgirl Crate"
 	cost = 200 //I mean, it's a whole wolfgirl
-	containertype = /obj/structure/largecrate/animal/wolfgirl
-	containername = "Wolfgirl crate"
+	container_type = /obj/structure/largecrate/animal/wolfgirl
+	container_name = "Wolfgirl crate"
 	contraband = 1
 
 /datum/supply_pack/supply/medieval
@@ -148,8 +148,8 @@
 			/obj/item/clothing/suit/armor/medieval/orange = 1
 			)
 	cost = 120
-	containertype = /obj/structure/closet/crate
-	containername = "knight set crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "knight set crate"
 	contraband = 1
 
 /datum/supply_pack/supply/deusvult_templar
@@ -160,8 +160,8 @@
 			/obj/item/clothing/accessory/poncho/roles/cloak/custom/crusade/templar
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate
-	containername = "templar armor crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "templar armor crate"
 	contraband = 1
 
 /datum/supply_pack/supply/deusvult_hospitaller
@@ -172,8 +172,8 @@
 			/obj/item/clothing/accessory/poncho/roles/cloak/custom/crusade/hospitaller
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate
-	containername = "hospitaller armor crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "hospitaller armor crate"
 	contraband = 1
 
 /datum/supply_pack/supply/deusvult_teutonic
@@ -187,6 +187,6 @@
 			/obj/item/clothing/accessory/poncho/roles/cloak/custom/crusade/teutonic
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate
-	containername = "teutonic armor crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "teutonic armor crate"
 	contraband = 1

code/modules/cargo/supplypacks/costumes.dm

@@ -19,16 +19,16 @@
 			/obj/item/clothing/head/wizard/fake
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate
-	containername = "Wizard costume crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Wizard costume crate"
 
 /datum/supply_pack/costumes/techpriest
 	name = "Tech Priest robes"
 	contains = list(
 		/obj/item/clothing/suit/storage/hooded/techpriest = 2)
 	cost = 150
-	containertype = /obj/structure/closet/crate
-	containername = "Tech Priest crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Tech Priest crate"
 
 /datum/supply_pack/randomised/costumes/hats
 	num_contained = 4
@@ -56,8 +56,8 @@
 			)
 	name = "Collectable hat crate!"
 	cost = 200
-	containertype = /obj/structure/closet/crate
-	containername = "Collectable hats crate! Brought to you by Bass.inc!"
+	container_type = /obj/structure/closet/crate
+	container_name = "Collectable hats crate! Brought to you by Bass.inc!"
 
 /datum/supply_pack/randomised/costumes/costume
 	num_contained = 3
@@ -93,8 +93,8 @@
 			)
 	name = "Costumes crate"
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Actor Costumes"
+	container_type = /obj/structure/closet/crate
+	container_name = "Actor Costumes"
 
 /datum/supply_pack/costumes/formal_wear
 	contains = list(
@@ -115,13 +115,13 @@
 			)
 	name = "Formalwear closet"
 	cost = 30
-	containertype = /obj/structure/closet
-	containername = "Formalwear for the best occasions."
+	container_type = /obj/structure/closet
+	container_name = "Formalwear for the best occasions."
 
 datum/supply_pack/costumes/witch
 	name = "Witch costume"
-	containername = "Witch costume"
-	containertype = /obj/structure/closet
+	container_name = "Witch costume"
+	container_type = /obj/structure/closet
 	cost = 20
 	contains = list(
 			/obj/item/clothing/suit/wizrobe/marisa/fake,
@@ -132,8 +132,8 @@ datum/supply_pack/costumes/witch
 
 /datum/supply_pack/randomised/costumes/costume_hats
 	name = "Costume hats"
-	containername = "Actor hats crate"
-	containertype = /obj/structure/closet/crate
+	container_name = "Actor hats crate"
+	container_type = /obj/structure/closet/crate
 	cost = 10
 	num_contained = 3
 	contains = list(
@@ -157,8 +157,8 @@ datum/supply_pack/costumes/witch
 
 /datum/supply_pack/randomised/costumes/dresses
 	name = "Womens formal dress locker"
-	containername = "Pretty dress locker"
-	containertype = /obj/structure/closet
+	container_name = "Pretty dress locker"
+	container_type = /obj/structure/closet
 	cost = 15
 	num_contained = 3
 	contains = list(
@@ -193,8 +193,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/gloves/vox
 			)
 	cost = 100
-	containertype = /obj/structure/closet/crate
-	containername = "Xenowear crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Xenowear crate"
 
 /datum/supply_pack/costumes/tesh_smocks
 	name = "Teshari smocks"
@@ -206,8 +206,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/under/teshari/smock/yellow
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate
-	containername = "Teshari smocks crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Teshari smocks crate"
 
 /datum/supply_pack/randomised/costumes/tesh_coats
 	name = "Teshari undercoats"
@@ -227,8 +227,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/under/teshari/undercoat/standard/yellow_grey
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate
-	containername = "Teshari undercoats crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Teshari undercoats crate"
 
 /datum/supply_pack/randomised/costumes/tesh_coats_b
 	name = "Teshari undercoats (black)"
@@ -247,8 +247,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/under/teshari/undercoat/standard/black_yellow
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate
-	containername = "Teshari undercoats crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Teshari undercoats crate"
 
 /datum/supply_pack/randomised/costumes/tesh_cloaks
 	name = "Teshari cloaks"
@@ -267,8 +267,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/suit/storage/teshari/cloak/standard/yellow_grey
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate
-	containername = "Teshari cloaks crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Teshari cloaks crate"
 
 /datum/supply_pack/randomised/costumes/tesh_cloaks_b
 	name = "Teshari cloaks (black)"
@@ -287,8 +287,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/suit/storage/teshari/cloak/standard/black_yellow
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate
-	containername = "Teshari cloaks crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Teshari cloaks crate"
 
 /datum/supply_pack/costumes/utility
 	name = "Utility uniforms"
@@ -298,8 +298,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/under/utility/grey
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate
-	containername = "Utility uniforms crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Utility uniforms crate"
 
 /datum/supply_pack/costumes/skirts
 	name = "Skirts crate"
@@ -317,8 +317,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/under/skirt/outfit/plaid_green
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate
-	containername = "Skirts crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Skirts crate"
 
 /datum/supply_pack/costumes/varsity
 	name = "Varsity jackets"
@@ -331,8 +331,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/suit/varsity/red
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate
-	containername = "Varsity jackets crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Varsity jackets crate"
 
 /datum/supply_pack/randomised/costumes/leathergear
 	name = "Leather gear"
@@ -362,8 +362,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/head/cowboy_hat/black
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "Leather gear crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Leather gear crate"
 
 /datum/supply_pack/costumes/eyewear
 	name = "Eyewear crate"
@@ -381,8 +381,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/glasses/threedglasses
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "Eyewear crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Eyewear crate"
 
 /datum/supply_pack/randomised/costumes/gloves
 	name = "Gloves crate"
@@ -405,8 +405,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/gloves/white
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate
-	containername = "Gloves crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Gloves crate"
 
 /datum/supply_pack/randomised/costumes/boots
 	name = "Boots crate"
@@ -422,8 +422,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/shoes/boots/winter
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate
-	containername = "Boots crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Boots crate"
 
 /datum/supply_pack/costumes/taurbags
 	name = "Saddlebags crate"
@@ -433,8 +433,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/storage/backpack/saddlebag_common/vest
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate
-	containername = "Saddlebags crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Saddlebags crate"
 
 /datum/supply_pack/costumes/larp
 	name = "Knight cosplay crate"
@@ -449,8 +449,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/suit/medievalfake/orange = 1
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate
-	containername = "knight cosplay crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "knight cosplay crate"
 
 /datum/supply_pack/costumes/situlavult_templar
 	name = "Templar cosplay crate"
@@ -460,8 +460,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/accessory/poncho/roles/cloak/custom/crusade/templar
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate
-	containername = "templar cosplay crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "templar cosplay crate"
 
 /datum/supply_pack/costumes/situlavult_hospitaller
 	name = "Hospitaller cosplay crate"
@@ -471,8 +471,8 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/accessory/poncho/roles/cloak/custom/crusade/hospitaller
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate
-	containername = "hospitaller cosplay crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "hospitaller cosplay crate"
 
 /datum/supply_pack/costumes/situlavult_teutonic
 	name = "Teutonic cosplay crate"
@@ -485,5 +485,5 @@ datum/supply_pack/costumes/witch
 			/obj/item/clothing/accessory/poncho/roles/cloak/custom/crusade/teutonic
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate
-	containername = "teutonic cosplay crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "teutonic cosplay crate"

code/modules/cargo/supplypacks/engineering.dm

@@ -11,29 +11,29 @@
 	name = "Replacement lights"
 	contains = list(/obj/item/storage/box/lights/mixed = 3)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Replacement lights"
+	container_type = /obj/structure/closet/crate
+	container_name = "Replacement lights"
 
 /datum/supply_pack/eng/smescoil
 	name = "Superconducting Magnetic Coil"
 	contains = list(/obj/item/smes_coil)
 	cost = 20
-	containertype = /obj/structure/closet/crate/engineering
-	containername = "Superconducting Magnetic Coil crate"
+	container_type = /obj/structure/closet/crate/engineering
+	container_name = "Superconducting Magnetic Coil crate"
 
 /datum/supply_pack/eng/smescoil/super_capacity
 	name = "Superconducting Capacitance Coil"
 	contains = list(/obj/item/smes_coil/super_capacity)
 	cost = 25
-	containertype = /obj/structure/closet/crate/engineering
-	containername = "Superconducting Capacitance Coil crate"
+	container_type = /obj/structure/closet/crate/engineering
+	container_name = "Superconducting Capacitance Coil crate"
 
 /datum/supply_pack/eng/smescoil/super_io
 	name = "Superconducting Transmission Coil"
 	contains = list(/obj/item/smes_coil/super_io)
 	cost = 25
-	containertype = /obj/structure/closet/crate/engineering
-	containername = "Superconducting Transmission Coil crate"
+	container_type = /obj/structure/closet/crate/engineering
+	container_name = "Superconducting Transmission Coil crate"
 
 /datum/supply_pack/eng/electrical
 	name = "Electrical maintenance crate"
@@ -44,8 +44,8 @@
 			/obj/item/cell/high = 2
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/engineering/electrical
-	containername = "Electrical maintenance crate"
+	container_type = /obj/structure/closet/crate/engineering/electrical
+	container_name = "Electrical maintenance crate"
 
 /datum/supply_pack/eng/e_welders
 	name = "Electric welder crate"
@@ -53,8 +53,8 @@
 			/obj/item/weldingtool/electric = 3
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate/engineering/electrical
-	containername = "Electric welder crate"
+	container_type = /obj/structure/closet/crate/engineering/electrical
+	container_name = "Electric welder crate"
 
 /datum/supply_pack/eng/mechanical
 	name = "Mechanical maintenance crate"
@@ -65,15 +65,15 @@
 			/obj/item/clothing/head/hardhat
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/engineering
-	containername = "Mechanical maintenance crate"
+	container_type = /obj/structure/closet/crate/engineering
+	container_name = "Mechanical maintenance crate"
 
 /datum/supply_pack/eng/fueltank
 	name = "Fuel tank crate"
 	contains = list(/obj/structure/reagent_dispensers/fueltank)
 	cost = 10
-	containertype = /obj/structure/largecrate
-	containername = "fuel tank crate"
+	container_type = /obj/structure/largecrate
+	container_name = "fuel tank crate"
 
 /datum/supply_pack/eng/solar
 	name = "Solar Pack crate"
@@ -84,36 +84,36 @@
 			/obj/item/paper/solar
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/engineering
-	containername = "Solar pack crate"
+	container_type = /obj/structure/closet/crate/engineering
+	container_name = "Solar pack crate"
 
 /datum/supply_pack/eng/engine
 	name = "Emitter crate"
 	contains = list(/obj/machinery/power/emitter = 2)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure/engineering
-	containername = "Emitter crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
+	container_name = "Emitter crate"
 	access = access_engine
 
 /datum/supply_pack/eng/engine/field_gen
 	name = "Field Generator crate"
 	contains = list(/obj/machinery/field_generator = 2)
-	containertype = /obj/structure/closet/crate/secure/engineering
-	containername = "Field Generator crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
+	container_name = "Field Generator crate"
 	access = access_ce
 
 /datum/supply_pack/eng/engine/sing_gen
 	name = "Singularity Generator crate"
 	contains = list(/obj/machinery/the_singularitygen)
-	containertype = /obj/structure/closet/crate/secure/engineering
-	containername = "Singularity Generator crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
+	container_name = "Singularity Generator crate"
 	access = access_ce
 
 /datum/supply_pack/eng/engine/collector
 	name = "Collector crate"
 	contains = list(/obj/machinery/power/rad_collector = 3)
-	containertype = /obj/structure/closet/crate/secure/engineering
-	containername = "collector crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
+	container_name = "collector crate"
 	access = access_engine
 
 /datum/supply_pack/eng/engine/PA
@@ -129,8 +129,8 @@
 			/obj/structure/particle_accelerator/end_cap,
 			/obj/item/paper/particle_info
 			)
-	containertype = /obj/structure/closet/crate/secure/engineering
-	containername = "Particle Accelerator crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
+	container_name = "Particle Accelerator crate"
 	access = access_ce
 
 /datum/supply_pack/eng/shield_generator
@@ -144,14 +144,14 @@
 		/obj/item/stock_parts/subspace/amplifier
 		)
 	cost = 80
-	containertype = /obj/structure/closet/crate/engineering
-	containername = "shield generator construction kit crate"
+	container_type = /obj/structure/closet/crate/engineering
+	container_name = "shield generator construction kit crate"
 /datum/supply_pack/eng/smbig
 	name = "Supermatter Core"
 	contains = list(/obj/machinery/power/supermatter)
 	cost = 150
-	containertype = /obj/structure/closet/crate/secure/phoron
-	containername = "Supermatter crate (CAUTION)"
+	container_type = /obj/structure/closet/crate/secure/phoron
+	container_name = "Supermatter crate (CAUTION)"
 	access = access_ce
 
 /datum/supply_pack/eng/teg
@@ -160,16 +160,16 @@
 		/obj/machinery/atmospherics/binary/circulator = 2)
 	name = "Mark I TEG + Circulators"
 	cost = 35
-	containertype = /obj/structure/closet/crate/secure/large
-	containername = "Mk1 TEG crate"
+	container_type = /obj/structure/closet/crate/secure/large
+	container_name = "Mk1 TEG crate"
 	access = access_engine
 /*
 /datum/supply_pack/eng/circulator
 	contains = list(/obj/machinery/atmospherics/binary/circulator = 2)
 	name = "Binary atmospheric circulators"
 	cost = 15
-	containertype = /obj/structure/closet/crate/secure/large
-	containername = "Atmospheric circulators crate"
+	container_type = /obj/structure/closet/crate/secure/large
+	container_name = "Atmospheric circulators crate"
 	access = access_engine
 */
 /datum/supply_pack/eng/radsuit
@@ -179,14 +179,14 @@
 			)
 	name = "Radiation suits package"
 	cost = 20
-	containertype = /obj/structure/closet/radiation
-	containername = "Radiation suit locker"
+	container_type = /obj/structure/closet/radiation
+	container_name = "Radiation suit locker"
 
 /datum/supply_pack/eng/pacman_parts
 	name = "P.A.C.M.A.N. portable generator parts"
 	cost = 25
-	containername = "P.A.C.M.A.N. Portable Generator Construction Kit"
-	containertype = /obj/structure/closet/crate/secure/engineering
+	container_name = "P.A.C.M.A.N. Portable Generator Construction Kit"
+	container_type = /obj/structure/closet/crate/secure/engineering
 	access = access_tech_storage
 	contains = list(
 			/obj/item/stock_parts/micro_laser,
@@ -198,8 +198,8 @@
 /datum/supply_pack/eng/super_pacman_parts
 	name = "Super P.A.C.M.A.N. portable generator parts"
 	cost = 35
-	containername = "Super P.A.C.M.A.N. portable generator construction kit"
-	containertype = /obj/structure/closet/crate/secure/engineering
+	container_name = "Super P.A.C.M.A.N. portable generator construction kit"
+	container_type = /obj/structure/closet/crate/secure/engineering
 	access = access_tech_storage
 	contains = list(
 			/obj/item/stock_parts/micro_laser,
@@ -211,8 +211,8 @@
 /datum/supply_pack/eng/fusion_core
 	name = "R-UST Mk. 8 Tokamak fusion core crate"
 	cost = 50
-	containername = "R-UST Mk. 8 Tokamak Fusion Core crate"
-	containertype = /obj/structure/closet/crate/secure/engineering
+	container_name = "R-UST Mk. 8 Tokamak Fusion Core crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
 	access = access_engine
 	contains = list(
 			/obj/item/book/manual/rust_engine,
@@ -223,8 +223,8 @@
 /datum/supply_pack/eng/fusion_fuel_injector
 	name = "R-UST Mk. 8 fuel injector crate"
 	cost = 30
-	containername = "R-UST Mk. 8 fuel injector crate"
-	containertype = /obj/structure/closet/crate/secure/engineering
+	container_name = "R-UST Mk. 8 fuel injector crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
 	access = access_engine
 	contains = list(
 			/obj/machinery/fusion_fuel_injector,
@@ -235,8 +235,8 @@
 /datum/supply_pack/eng/gyrotron
 	name = "Gyrotron crate"
 	cost = 15
-	containername = "Gyrotron Crate"
-	containertype = /obj/structure/closet/crate/secure/engineering
+	container_name = "Gyrotron Crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
 	access = access_engine
 	contains = list(
 			/obj/machinery/power/emitter/gyrotron,
@@ -246,15 +246,15 @@
 /datum/supply_pack/eng/fusion_fuel_compressor
 	name = "Fusion Fuel Compressor circuitry crate"
 	cost = 10
-	containername = "Fusion Fuel Compressor circuitry crate"
-	containertype = /obj/structure/closet/crate/engineering
+	container_name = "Fusion Fuel Compressor circuitry crate"
+	container_type = /obj/structure/closet/crate/engineering
 	contains = list(/obj/item/circuitboard/fusion_fuel_compressor)
 
 /datum/supply_pack/eng/tritium
 	name = "Tritium crate"
 	cost = 75
-	containername = "Tritium crate"
-	containertype = /obj/structure/closet/crate/engineering
+	container_name = "Tritium crate"
+	container_type = /obj/structure/closet/crate/engineering
 	contains = list(/obj/fiftyspawner/tritium)
 
 /datum/supply_pack/eng/engine/fission
@@ -265,8 +265,8 @@
 			/obj/item/storage/briefcase/fission/reflectormixed,
 			/obj/item/storage/briefcase/fission/controlmixed)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/engineering
-	containername = "fission core crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
+	container_name = "fission core crate"
 	access = access_ce
 
 /datum/supply_pack/eng/engine/fission/expansion
@@ -276,16 +276,16 @@
 			/obj/item/storage/briefcase/fission/tungstencarbide,
 			/obj/item/storage/briefcase/fission/boron)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/engineering
-	containername = "fission expansion crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
+	container_name = "fission expansion crate"
 	access = access_ce
 
 /datum/supply_pack/eng/thermoregulator
 	contains = list(/obj/machinery/power/thermoregulator)
 	name = "Thermal Regulator"
 	cost = 30
-	containertype = /obj/structure/closet/crate/large
-	containername = "thermal regulator crate"
+	container_type = /obj/structure/closet/crate/large
+	container_name = "thermal regulator crate"
 
 /datum/supply_pack/eng/radsuit
 	contains = list(
@@ -297,26 +297,26 @@
 	contains = list(/obj/item/stack/material/algae/ten)
 	name = "Algae Sheets (10)"
 	cost = 20
-	containertype = /obj/structure/closet/crate
-	containername = "algae sheets crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "algae sheets crate"
 
 /datum/supply_pack/eng/engine/tesla_gen
 	name = "Tesla Generator crate"
 	contains = list(/obj/machinery/the_singularitygen/tesla)
-	containertype = /obj/structure/closet/crate/secure/engineering
-	containername = "Tesla Generator crate"
+	container_type = /obj/structure/closet/crate/secure/engineering
+	container_name = "Tesla Generator crate"
 	access = access_ce
 
 /datum/supply_pack/eng/point_defense_cannon_circuit
 	name = "Point Defense Turret Circuit"
 	contains = list(/obj/item/circuitboard/pointdefense = 2)
 	cost = 20
-	containertype = /obj/structure/closet/crate/heph
-	containername = "point defense turret circuit crate"
+	container_type = /obj/structure/closet/crate/heph
+	container_name = "point defense turret circuit crate"
 
 /datum/supply_pack/eng/point_defense_control_circuit
 	name = "Point Defense Controller Circuit"
 	contains = list(/obj/item/circuitboard/pointdefense_control = 1)
 	cost = 30
-	containertype = /obj/structure/closet/crate/heph
-	containername = "point defense mainframe circuit crate"
+	container_type = /obj/structure/closet/crate/heph
+	container_name = "point defense mainframe circuit crate"

code/modules/cargo/supplypacks/hospitality.dm

@@ -23,8 +23,8 @@
 			/obj/item/reagent_containers/food/drinks/bottle/small/beer = 4,
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Party equipment"
+	container_type = /obj/structure/closet/crate
+	container_name = "Party equipment"
 
 /datum/supply_pack/hospitality/barsupplies
 	name = "Bar supplies"
@@ -43,8 +43,8 @@
 			/obj/item/storage/box/glass_extras/sticks
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "crate of bar supplies"
+	container_type = /obj/structure/closet/crate
+	container_name = "crate of bar supplies"
 
 /datum/supply_pack/randomised/hospitality/
 	group = "Hospitality"
@@ -59,8 +59,8 @@
 			)
 	name = "Surprise pack of five pizzas"
 	cost = 15
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Pizza crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Pizza crate"
 
 /datum/supply_pack/hospitality/gifts
 	name = "Gift crate"
@@ -73,8 +73,8 @@
 		/obj/item/paper/card/flower
 		)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "crate of gifts"
+	container_type = /obj/structure/closet/crate
+	container_name = "crate of gifts"
 
 /datum/supply_pack/randomised/hospitality/burgers
 	num_contained = 5
@@ -87,8 +87,8 @@
 			)
 	name = "Burger crate"
 	cost = 25
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Burger crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Burger crate"
 
 /datum/supply_pack/randomised/hospitality/bakery
 	num_contained = 5
@@ -113,8 +113,8 @@
 			)
 	name = "Bakery products crate"
 	cost = 25
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Bakery products crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Bakery products crate"
 
 /datum/supply_pack/randomised/hospitality/cakes
 	num_contained = 2
@@ -131,8 +131,8 @@
 			)
 	name = "Cake crate"
 	cost = 100
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Cake crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Cake crate"
 
 /datum/supply_pack/randomised/hospitality/mexican
 	num_contained = 5
@@ -144,8 +144,8 @@
 			)
 	name = "Mexican takeout crate"
 	cost = 50
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Mexican takeout crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Mexican takeout crate"
 
 /datum/supply_pack/randomised/hospitality/asian
 	num_contained = 5
@@ -155,8 +155,8 @@
 			)
 	name = "Chinese takeout crate"
 	cost = 50
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Chinese takeout crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Chinese takeout crate"
 
 /datum/supply_pack/randomised/hospitality/pizza
 	cost = 50
@@ -165,13 +165,13 @@
 	name = "Tallow tank crate"
 	contains = list(/obj/structure/reagent_dispensers/tallow)
 	cost = 10
-	containertype = /obj/structure/largecrate
-	containername = "Tallow tank crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Tallow tank crate"
 
 /datum/supply_pack/hospitality/vampcarepackage
 	name = "Vampire Care package"
 	contains = list(/obj/item/reagent_containers/blood/prelabeled/ABPlus = 3,
 					/obj/item/clothing/under/suit_jacket)
 	cost = 50
-	containertype = /obj/structure/closet/coffin/comfy
-	containername = "Extra comfortable coffin"
+	container_type = /obj/structure/closet/coffin/comfy
+	container_name = "Extra comfortable coffin"

code/modules/cargo/supplypacks/hydroponics.dm

@@ -11,43 +11,43 @@
 	name = "Monkey crate"
 	contains = list (/obj/item/storage/box/monkeycubes)
 	cost = 20
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Monkey crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Monkey crate"
 
 /datum/supply_pack/hydro/farwa
 	name = "Farwa crate"
 	contains = list (/obj/item/storage/box/monkeycubes/farwacubes)
 	cost = 20
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Farwa crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Farwa crate"
 
 /datum/supply_pack/hydro/neara
 	name = "Neaera crate"
 	contains = list (/obj/item/storage/box/monkeycubes/neaeracubes)
 	cost = 20
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Neaera crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Neaera crate"
 
 /datum/supply_pack/hydro/stok
 	name = "Stok crate"
 	contains = list (/obj/item/storage/box/monkeycubes/stokcubes)
 	cost = 20
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Stok crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Stok crate"
 
 /datum/supply_pack/hydro/lisa
 	name = "Corgi Crate"
 	contains = list()
 	cost = 50
-	containertype = /obj/structure/largecrate/animal/corgi
-	containername = "Corgi Crate"
+	container_type = /obj/structure/largecrate/animal/corgi
+	container_name = "Corgi Crate"
 
 /datum/supply_pack/hydro/cat
 	name = "Cat Crate"
 	contains = list()
 	cost = 45
-	containertype = /obj/structure/largecrate/animal/cat
-	containername = "Cat Crate"
+	container_type = /obj/structure/largecrate/animal/cat
+	container_name = "Cat Crate"
 
 /datum/supply_pack/hydro/hydroponics
 	name = "Hydroponics Supply Crate"
@@ -63,29 +63,29 @@
 			/obj/item/storage/box/botanydisk
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/hydroponics
-	containername = "Hydroponics crate"
+	container_type = /obj/structure/closet/crate/hydroponics
+	container_name = "Hydroponics crate"
 	access = access_hydroponics
 
 /datum/supply_pack/hydro/cow
 	name = "Cow crate"
 	cost = 25
-	containertype = /obj/structure/largecrate/animal/cow
-	containername = "Cow crate"
+	container_type = /obj/structure/largecrate/animal/cow
+	container_name = "Cow crate"
 	access = access_hydroponics
 
 /datum/supply_pack/hydro/goat
 	name = "Goat crate"
 	cost = 25
-	containertype = /obj/structure/largecrate/animal/goat
-	containername = "Goat crate"
+	container_type = /obj/structure/largecrate/animal/goat
+	container_name = "Goat crate"
 	access = access_hydroponics
 
 /datum/supply_pack/hydro/chicken
 	name = "Chicken crate"
 	cost = 25
-	containertype = /obj/structure/largecrate/animal/chick
-	containername = "Chicken crate"
+	container_type = /obj/structure/largecrate/animal/chick
+	container_name = "Chicken crate"
 	access = access_hydroponics
 
 /datum/supply_pack/hydro/seeds
@@ -110,8 +110,8 @@
 			/obj/item/seeds/sugarcaneseed
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/hydroponics
-	containername = "Seeds crate"
+	container_type = /obj/structure/closet/crate/hydroponics
+	container_name = "Seeds crate"
 	access = access_hydroponics
 
 /datum/supply_pack/hydro/weedcontrol
@@ -124,16 +124,16 @@
 			/obj/item/material/twohanded/fireaxe/scythe
 			)
 	cost = 45
-	containertype = /obj/structure/closet/crate/hydroponics
-	containername = "Weed control crate"
+	container_type = /obj/structure/closet/crate/hydroponics
+	container_name = "Weed control crate"
 	access = access_hydroponics
 
 /datum/supply_pack/hydro/watertank
 	name = "Water tank crate"
 	contains = list(/obj/structure/reagent_dispensers/watertank)
 	cost = 10
-	containertype = /obj/structure/largecrate
-	containername = "water tank crate"
+	container_type = /obj/structure/largecrate
+	container_name = "water tank crate"
 
 /datum/supply_pack/hydro/bee_keeper
 	name = "Beekeeping crate"
@@ -146,15 +146,15 @@
 			/obj/item/bee_pack
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/hydroponics
-	containername = "Beekeeping crate"
+	container_type = /obj/structure/closet/crate/hydroponics
+	container_name = "Beekeeping crate"
 	access = access_hydroponics
 
 /datum/supply_pack/hydro/tray
 	name = "Empty hydroponics trays"
 	cost = 50
-	containertype = /obj/structure/closet/crate/hydroponics
-	containername = "Hydroponics tray crate"
+	container_type = /obj/structure/closet/crate/hydroponics
+	container_name = "Hydroponics tray crate"
 	contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = 0} = 3)
 	access = access_hydroponics
 
@@ -162,55 +162,55 @@
 /datum/supply_pack/hydro/diycarpotox
 	name = "Gather-It-Yourself Carpotoxin"
 	cost = 30
-	containertype = /obj/structure/largecrate/animal/carp
-	containername = "DIY carpotoxin crate"
+	container_type = /obj/structure/largecrate/animal/carp
+	container_name = "DIY carpotoxin crate"
 
 /datum/supply_pack/hydro/diyspidertox
 	name = "Gather-It-Yourself Spider Toxin"
 	cost = 30
-	containertype = /obj/structure/largecrate/animal/spiders
-	containername = "DIY spider toxin crate"
+	container_type = /obj/structure/largecrate/animal/spiders
+	container_name = "DIY spider toxin crate"
 
 /datum/supply_pack/hydro/birds
 	name = "Birds Crate"
 	cost = 200 //You're getting 22 birds. Of course it's going to be a lot!
-	containertype = /obj/structure/largecrate/birds
-	containername = "Bird crate"
+	container_type = /obj/structure/largecrate/birds
+	container_name = "Bird crate"
 	access = access_hydroponics
 
 /datum/supply_pack/hydro/sobaka
 	name = "Sobaka crate"
 	contains = list (/obj/item/storage/box/monkeycubes/sobakacubes)
 	cost = 20
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Sobaka crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Sobaka crate"
 
 /datum/supply_pack/hydro/saru
 	name = "Saru crate"
 	contains = list (/obj/item/storage/box/monkeycubes/sarucubes)
 	cost = 20
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Saru crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Saru crate"
 
 /datum/supply_pack/hydro/sparra
 	name = "Sparra crate"
 	contains = list (/obj/item/storage/box/monkeycubes/sparracubes)
 	cost = 20
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Sparra crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Sparra crate"
 
 /datum/supply_pack/hydro/wolpin
 	name = "Wolpin crate"
 	contains = list (/obj/item/storage/box/monkeycubes/wolpincubes)
 	cost = 20
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Wolpin crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Wolpin crate"
 
 /datum/supply_pack/hydro/fennec
 	name = "Fennec crate"
 	cost = 60 //considering a corgi crate is 50, and you get two fennecs
-	containertype = /obj/structure/largecrate/animal/fennec
-	containername = "Fennec crate"
+	container_type = /obj/structure/largecrate/animal/fennec
+	container_name = "Fennec crate"
 
 /datum/supply_pack/hydro/fish
 	name = "Fish supply crate"
@@ -220,5 +220,5 @@
 			/obj/item/reagent_containers/food/snacks/sliceable/monkfish = 1
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Fish crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Fish crate"

code/modules/cargo/supplypacks/materials.dm

@@ -11,62 +11,62 @@
 	name = "50 metal sheets"
 	contains = list(/obj/fiftyspawner/steel)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Metal sheets crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Metal sheets crate"
 
 /datum/supply_pack/materials/glass50
 	name = "50 glass sheets"
 	contains = list(/obj/fiftyspawner/glass)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Glass sheets crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Glass sheets crate"
 
 /datum/supply_pack/materials/wood50
 	name = "50 wooden planks"
 	contains = list(/obj/fiftyspawner/wood)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Wooden planks crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Wooden planks crate"
 
 /datum/supply_pack/materials/wood50
 	name = "50 hardwood planks"
 	contains = list(/obj/fiftyspawner/hardwood)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "Hardwood planks crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Hardwood planks crate"
 
 /datum/supply_pack/materials/plastic50
 	name = "50 plastic sheets"
 	contains = list(/obj/fiftyspawner/plastic)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Plastic sheets crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Plastic sheets crate"
 
 /datum/supply_pack/materials/leather50
 	name = "50 leather sheets"
 	contains = list(/obj/fiftyspawner/leather)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Leather sheets crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Leather sheets crate"
 
 /datum/supply_pack/materials/cloth50
 	name = "50 cloth sheets"
 	contains = list(/obj/fiftyspawner/cloth)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Cloth sheets crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Cloth sheets crate"
 
 /datum/supply_pack/materials/cardboard_sheets
 	contains = list(/obj/fiftyspawner/cardboard)
 	name = "50 cardboard sheets"
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Cardboard sheets crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Cardboard sheets crate"
 
 /datum/supply_pack/materials/carpet
 	name = "Imported carpet"
-	containertype = /obj/structure/closet/crate
-	containername = "Imported carpet crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Imported carpet crate"
 	cost = 15
 	contains = list(
 					/obj/fiftyspawner/carpet,
@@ -76,7 +76,7 @@
 
 /datum/supply_pack/misc/linoleum
 	name = "Linoleum"
-	containertype = /obj/structure/closet/crate
-	containername = "Linoleum crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Linoleum crate"
 	cost = 15
 	contains = list(/obj/fiftyspawner/linoleum)

code/modules/cargo/supplypacks/medical.dm

@@ -22,29 +22,29 @@
 			/obj/item/storage/box/autoinjectors
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/medical
-	containername = "Medical crate"
+	container_type = /obj/structure/closet/crate/medical
+	container_name = "Medical crate"
 
 /datum/supply_pack/med/bloodpack
 	name = "BloodPack crate"
 	contains = list(/obj/item/storage/box/bloodpacks = 3)
 	cost = 10
-	containertype = /obj/structure/closet/crate/medical
-	containername = "BloodPack crate"
+	container_type = /obj/structure/closet/crate/medical
+	container_name = "BloodPack crate"
 
 /datum/supply_pack/med/bodybag
 	name = "Body bag crate"
 	contains = list(/obj/item/storage/box/bodybags = 3)
 	cost = 10
-	containertype = /obj/structure/closet/crate/medical
-	containername = "Body bag crate"
+	container_type = /obj/structure/closet/crate/medical
+	container_name = "Body bag crate"
 
 /datum/supply_pack/med/cryobag
 	name = "Stasis bag crate"
 	contains = list(/obj/item/bodybag/cryobag = 3)
 	cost = 40
-	containertype = /obj/structure/closet/crate/medical
-	containername = "Stasis bag crate"
+	container_type = /obj/structure/closet/crate/medical
+	container_name = "Stasis bag crate"
 
 /datum/supply_pack/med/surgery
 	name = "Surgery crate"
@@ -62,8 +62,8 @@
 			/obj/item/surgical/circular_saw
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Surgery crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Surgery crate"
 	access = access_medical
 
 /datum/supply_pack/med/deathalarm
@@ -73,8 +73,8 @@
 			/obj/item/storage/box/cdeathalarm_kit
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Death Alarm crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Death Alarm crate"
 	access = access_medical
 
 /datum/supply_pack/med/clotting
@@ -83,8 +83,8 @@
 			/obj/item/storage/firstaid/clotting
 			)
 	cost = 100
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Clotting Medicine crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Clotting Medicine crate"
 	access = access_medical
 
 /datum/supply_pack/med/sterile
@@ -97,8 +97,8 @@
 			/obj/item/storage/belt/medical = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Sterile equipment crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Sterile equipment crate"
 
 /datum/supply_pack/med/extragear
 	name = "Medical surplus equipment"
@@ -109,8 +109,8 @@
 			/obj/item/clothing/suit/storage/hooded/wintercoat/medical = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Medical surplus equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Medical surplus equipment"
 	access = access_medical
 
 /datum/supply_pack/med/cmogear
@@ -133,8 +133,8 @@
 			/obj/item/reagent_containers/syringe
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Chief medical officer equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Chief medical officer equipment"
 	access = access_cmo
 
 /datum/supply_pack/med/doctorgear
@@ -156,8 +156,8 @@
 			/obj/item/reagent_containers/syringe
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Medical Doctor equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Medical Doctor equipment"
 	access = access_medical_equip
 
 /datum/supply_pack/med/chemistgear
@@ -179,8 +179,8 @@
 			/obj/item/reagent_containers/syringe
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Chemist equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Chemist equipment"
 	access = access_chemistry
 
 /datum/supply_pack/med/paramedicgear
@@ -207,8 +207,8 @@
 			/obj/item/clothing/accessory/storage/white_vest
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Paramedic equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Paramedic equipment"
 	access = access_medical_equip
 
 /datum/supply_pack/med/psychiatristgear
@@ -226,8 +226,8 @@
 			/obj/item/cartridge/medical
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Psychiatrist equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Psychiatrist equipment"
 	access = access_psychiatrist
 
 /datum/supply_pack/med/medicalscrubs
@@ -247,8 +247,8 @@
 			/obj/item/storage/box/gloves
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Medical scrubs crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Medical scrubs crate"
 	access = access_medical_equip
 
 /datum/supply_pack/med/autopsy
@@ -264,8 +264,8 @@
 			/obj/item/pen
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Autopsy equipment crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Autopsy equipment crate"
 	access = access_morgue
 
 /datum/supply_pack/med/medicaluniforms
@@ -291,8 +291,8 @@
 			/obj/item/storage/box/gloves
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Medical uniform crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Medical uniform crate"
 	access = access_medical_equip
 
 /datum/supply_pack/med/medicalbiosuits
@@ -309,67 +309,67 @@
 			/obj/item/storage/box/gloves
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Medical biohazard equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Medical biohazard equipment"
 	access = access_medical_equip
 
 /datum/supply_pack/med/portablefreezers
 	name = "Portable freezers crate"
 	contains = list(/obj/item/storage/box/freezer = 7)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Portable freezers"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Portable freezers"
 	access = access_medical_equip
 
 /datum/supply_pack/med/virus
 	name = "Virus sample crate"
 	contains = list(/obj/item/virusdish/random = 4)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Virus sample crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Virus sample crate"
 	access = access_cmo
 
 /datum/supply_pack/med/defib
 	name = "Defibrillator crate"
 	contains = list(/obj/item/defib_kit = 2)
 	cost = 30
-	containertype = /obj/structure/closet/crate/medical
-	containername = "Defibrillator crate"
+	container_type = /obj/structure/closet/crate/medical
+	container_name = "Defibrillator crate"
 
 /datum/supply_pack/med/distillery
 	name = "Chemical distiller crate"
 	contains = list(/obj/machinery/portable_atmospherics/powered/reagent_distillery = 1)
 	cost = 175
-	containertype = /obj/structure/largecrate
-	containername = "Chemical distiller crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Chemical distiller crate"
 
 /datum/supply_pack/med/advdistillery
 	name = "Industrial Chemical distiller crate"
 	contains = list(/obj/machinery/portable_atmospherics/powered/reagent_distillery/industrial = 1)
 	cost = 250
-	containertype = /obj/structure/largecrate
-	containername = "Industrial Chemical distiller crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Industrial Chemical distiller crate"
 
 /datum/supply_pack/med/oxypump
 	name = "Oxygen pump crate"
 	contains = list(/obj/machinery/oxygen_pump/mobile = 1)
 	cost = 125
-	containertype = /obj/structure/largecrate
-	containername = "Oxygen pump crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Oxygen pump crate"
 
 /datum/supply_pack/med/anestheticpump
 	name = "Anesthetic pump crate"
 	contains = list(/obj/machinery/oxygen_pump/mobile/anesthetic = 1)
 	cost = 130
-	containertype = /obj/structure/largecrate
-	containername = "Anesthetic pump crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Anesthetic pump crate"
 
 /datum/supply_pack/med/stablepump
 	name = "Portable stabilizer crate"
 	contains = list(/obj/machinery/oxygen_pump/mobile/stabilizer = 1)
 	cost = 175
-	containertype = /obj/structure/largecrate
-	containername = "Portable stabilizer crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Portable stabilizer crate"
 
 /datum/supply_pack/med/medicalbiosuits
 	contains = list(
@@ -398,28 +398,28 @@
 			/obj/item/storage/box/gloves
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Virology biohazard equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Virology biohazard equipment"
 	access = access_medical_equip
 
 /datum/supply_pack/med/virus
 	name = "Virus sample crate"
 	contains = list(/obj/item/virusdish/random = 4)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Virus sample crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Virus sample crate"
 	access = access_medical_equip
 
 
 /datum/supply_pack/med/bloodpack
-	containertype = /obj/structure/closet/crate/medical/blood
+	container_type = /obj/structure/closet/crate/medical/blood
 
 /datum/supply_pack/med/compactdefib
 	name = "Compact Defibrillator crate"
 	contains = list(/obj/item/defib_kit/compact = 1)
 	cost = 90
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Compact Defibrillator crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Compact Defibrillator crate"
 	access = access_medical_equip
 
 /datum/supply_pack/med/ml3m
@@ -429,8 +429,8 @@
 			/obj/item/ammo_magazine/cell_mag/medical = 1
 			)
 	cost = 250
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Cell-Loaded Medigun crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Cell-Loaded Medigun crate"
 	access = access_cmo
 
 /datum/supply_pack/med/ml3m_cells
@@ -441,6 +441,6 @@
 			/obj/item/ammo_casing/microbattery/medical/stabilize = 3
 			)
 	cost = 100
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Cell-Loaded Medigun Cell Pack crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Cell-Loaded Medigun Cell Pack crate"
 	access = access_cmo

code/modules/cargo/supplypacks/misc.dm

@@ -18,8 +18,8 @@
 			)
 	name = "Trading Card Crate"
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "cards crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "cards crate"
 
 /datum/supply_pack/randomised/misc/dnd
 	num_contained = 4
@@ -34,8 +34,8 @@
 			)
 	name = "Miniatures Crate"
 	cost = 200
-	containertype = /obj/structure/closet/crate
-	containername = "Miniature Crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Miniature Crate"
 
 /datum/supply_pack/randomised/misc/plushies
 	num_contained = 5
@@ -76,15 +76,15 @@
 			)
 	name = "Plushies Crate"
 	cost = 15
-	containertype = /obj/structure/closet/crate
-	containername = "Plushies Crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Plushies Crate"
 
 /datum/supply_pack/misc/eftpos
 	contains = list(/obj/item/eftpos)
 	name = "EFTPOS scanner"
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "EFTPOS crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "EFTPOS crate"
 
 /datum/supply_pack/misc/chaplaingear
 	name = "Chaplain equipment"
@@ -101,15 +101,15 @@
 			/obj/item/storage/fancy/candle_box = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Chaplain equipment crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Chaplain equipment crate"
 
 /datum/supply_pack/misc/hoverpod
 	name = "Hoverpod Shipment"
 	contains = list()
 	cost = 80
-	containertype = /obj/structure/largecrate/hoverpod
-	containername = "Hoverpod Crate"
+	container_type = /obj/structure/largecrate/hoverpod
+	container_name = "Hoverpod Crate"
 
 /datum/supply_pack/randomised/misc/webbing
 	name = "Webbing crate"
@@ -124,15 +124,15 @@
 			/obj/item/clothing/accessory/storage/webbing
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Webbing crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Webbing crate"
 
 /datum/supply_pack/misc/holoplant
 	name = "Holoplant Pot"
 	contains = list(/obj/machinery/holoplant/shipped)
 	cost = 15
-	containertype = /obj/structure/closet/crate
-	containername = "Holoplant crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Holoplant crate"
 
 /datum/supply_pack/misc/glucose_hypos
 	name = "Glucose Hypoinjectors"
@@ -140,11 +140,12 @@
 			/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate
-	containername = "Glucose Hypo Crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Glucose Hypo Crate"
 
 /datum/supply_pack/misc/mre_rations
-	num_contained = 6
+	// num_contained = 6		i'm just commenting this out because whoever made this should have looked and seen that this doesn't work for non randomized crates
+	// screw you for causing me a compile error
 	name = "Emergency - MREs"
 	contains = list(/obj/item/storage/mre,
 					/obj/item/storage/mre/menu2,
@@ -157,8 +158,8 @@
 					/obj/item/storage/mre/menu9,
 					/obj/item/storage/mre/menu10)
 	cost = 50
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "ready to eat rations"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "ready to eat rations"
 
 /datum/supply_pack/misc/paste_rations
 	name = "Emergency - Paste"
@@ -166,8 +167,8 @@
 			/obj/item/storage/mre/menu11 = 2
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "emergency rations"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "emergency rations"
 
 /datum/supply_pack/misc/medical_rations
 	name = "Emergency - VitaPaste"
@@ -175,8 +176,8 @@
 			/obj/item/storage/mre/menu13 = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "emergency rations"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "emergency rations"
 
 /datum/supply_pack/misc/beltminer
 	name = "Belt-miner gear crate"
@@ -188,8 +189,8 @@
 			/obj/item/storage/box/traumainjectors = 1
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Belt-miner gear crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Belt-miner gear crate"
 	access = access_mining
 
 /datum/supply_pack/misc/eva_rig
@@ -198,8 +199,8 @@
 			/obj/item/rig/eva = 1
 			)
 	cost = 150
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "eva hardsuit crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "eva hardsuit crate"
 	access = list(access_mining,
 				  access_eva,
 				  access_explorer,
@@ -212,8 +213,8 @@
 			/obj/item/rig/industrial = 1
 			)
 	cost = 150
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "industrial hardsuit crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "industrial hardsuit crate"
 	access = list(access_mining,
 				  access_eva)
 	one_access = TRUE
@@ -224,8 +225,8 @@
 			/obj/item/rig/medical = 1
 			)
 	cost = 150
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "medical hardsuit crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "medical hardsuit crate"
 	access = access_medical
 
 /datum/supply_pack/misc/phoronoid
@@ -237,7 +238,7 @@
 	/obj/item/tank/vox = 3,
 	)
 	cost = 40
-	containername = "spare phoronoid suits"
+	container_name = "spare phoronoid suits"
 
 /datum/supply_pack/misc/security_rig
 	name = "hazard hardsuit (empty)"
@@ -245,8 +246,8 @@
 			/obj/item/rig/hazard = 1
 			)
 	cost = 150
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "hazard hardsuit crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "hazard hardsuit crate"
 	access = access_armory
 
 /datum/supply_pack/misc/science_rig
@@ -255,8 +256,8 @@
 			/obj/item/rig/hazmat = 1
 			)
 	cost = 150
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "ami hardsuit crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "ami hardsuit crate"
 	access = access_rd
 
 /datum/supply_pack/misc/ce_rig
@@ -265,8 +266,8 @@
 			/obj/item/rig/ce = 1
 			)
 	cost = 150
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "advanced voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "advanced voidsuit crate"
 	access = access_ce
 
 /datum/supply_pack/misc/skatepack1
@@ -276,8 +277,8 @@
 			/obj/item/clothing/head/helmet/bike_helmet/random = 3
 			)
 	cost = 100
-	containertype = /obj/structure/closet/crate
-	containername = "Skateboard Crate - Beginner"
+	container_type = /obj/structure/closet/crate
+	container_name = "Skateboard Crate - Beginner"
 
 /datum/supply_pack/misc/skatepack2
 	name = "Professional Skateboard Pack"
@@ -286,8 +287,8 @@
 			/obj/item/clothing/head/helmet/bike_helmet/random = 2
 			)
 	cost = 200
-	containertype = /obj/structure/closet/crate
-	containername = "Skateboard Crate - Professional"
+	container_type = /obj/structure/closet/crate
+	container_name = "Skateboard Crate - Professional"
 
 /datum/supply_pack/misc/skatepack3
 	name = "Hoverboard Pack"
@@ -296,8 +297,8 @@
 			/obj/item/clothing/head/helmet/bike_helmet/random = 2
 			)
 	cost = 300
-	containertype = /obj/structure/closet/crate
-	containername = "Hoverboard Crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Hoverboard Crate"
 
 /datum/supply_pack/misc/colored_lights
 	name = "Colored Lights Bundle"
@@ -307,8 +308,8 @@
 			/obj/item/storage/box/lights/mixed_colored = 1
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "Colored Lights crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Colored Lights crate"
 
 /datum/supply_pack/misc/neon_lights
 	name = "Neon Lights Bundle"
@@ -318,8 +319,8 @@
 			/obj/item/storage/box/lights/mixed_neon = 1
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "Neon Lights crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Neon Lights crate"
 
 //Culture Crates
 /datum/supply_pack/misc/culture_apidean
@@ -334,8 +335,8 @@
 			/obj/item/reagent_containers/food/drinks/bottle/royaljelly = 1
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "Apidean Culture crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Apidean Culture crate"
 
 /datum/supply_pack/misc/culture_tyrmalin
 	name = "Tyrmalin Culture Crate"
@@ -351,8 +352,8 @@
 			/obj/item/reagent_containers/food/drinks/bottle/greenstuff = 1
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "Tyrmalin Culture crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Tyrmalin Culture crate"
 
 /datum/supply_pack/misc/culture_alraune
 	name = "Alraune Culture Crate"
@@ -362,5 +363,5 @@
 			/obj/item/reagent_containers/food/drinks/cans/alraune = 3
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "Alraune Culture crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Alraune Culture crate"

code/modules/cargo/supplypacks/munitions.dm

@@ -20,16 +20,16 @@
 			/obj/item/storage/box/flashbangs = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Security equipment crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Security equipment crate"
 	access = access_security
 
 /datum/supply_pack/munitions/egunpistol
 	name = "Weapons - Energy sidearms"
 	contains = list(/obj/item/gun/energy/gun = 2)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Energy sidearms crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Energy sidearms crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/flareguns
@@ -39,8 +39,8 @@
 			/obj/item/storage/box/flashshells = 2
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Flare gun crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Flare gun crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/eweapons
@@ -49,16 +49,16 @@
 			/obj/item/gun/energy/xray = 2,
 			/obj/item/shield/energy = 2)
 	cost = 100
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Experimental weapons crate"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Experimental weapons crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/energyweapons
 	name = "Weapons - Laser rifle crate"
 	contains = list(/obj/item/gun/energy/laser = 2)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Energy weapons crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Energy weapons crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/shotgun
@@ -69,24 +69,24 @@
 			/obj/item/gun/projectile/shotgun/pump/combat = 2
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Shotgun crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Shotgun crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/erifle
 	name = "Weapons - Energy marksman"
 	contains = list(/obj/item/gun/energy/sniperrifle = 2)
 	cost = 100
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Energy marksman crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Energy marksman crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/burstlaser
 	name = "Weapons - Burst laser"
 	contains = list(/obj/item/gun/energy/gun/burst = 2)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Burst laser crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Burst laser crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/ionweapons
@@ -96,8 +96,8 @@
 			/obj/item/storage/box/empslite
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Electromagnetic weapons crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Electromagnetic weapons crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/ionpistols
@@ -107,24 +107,24 @@
 			/obj/item/storage/box/empslite
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Electromagnetic weapons crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Electromagnetic weapons crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/bsmg
 	name = "Weapons - Ballistic SMGs"
 	contains = list(/obj/item/gun/projectile/automatic/wt550 = 2)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Ballistic weapon crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Ballistic weapon crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/brifle
 	name = "Weapons - Ballistic Rifles"
 	contains = list(/obj/item/gun/projectile/automatic/z8 = 2)
 	cost = 80
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Ballistic weapon crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Ballistic weapon crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/bolt_rifles_competitive
@@ -138,32 +138,32 @@
  			/obj/item/target/syndicate = 2
  			)
  	cost = 40
- 	containertype = /obj/structure/closet/crate/secure/weapon
- 	containername = "Ballistic Weapons crate"
+ 	container_type = /obj/structure/closet/crate/secure/weapon
+ 	container_name = "Ballistic Weapons crate"
  	access = access_armory
 
 /datum/supply_pack/munitions/mrifle
 	name = "Weapons - Magnetic Rifles"
 	contains = list(/obj/item/gun/magnetic/railgun/heater = 2)
 	cost = 120
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Magnetic weapon crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Magnetic weapon crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/mpistol
 	name = "Weapons - Magnetic Pistols"
 	contains = list(/obj/item/gun/magnetic/railgun/heater/pistol = 2)
 	cost = 200
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Magnetic weapon crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Magnetic weapon crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/mcarbine
 	name = "Weapons - Magnetic Carbines"
 	contains = list(/obj/item/gun/magnetic/railgun/flechette/sif = 2)
 	cost = 130
-	containertype = /obj/structure/closet/crate/secure/weapon
-	containername = "Magnetic weapon crate"
+	container_type = /obj/structure/closet/crate/secure/weapon
+	container_name = "Magnetic weapon crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/shotgunammo
@@ -173,56 +173,56 @@
 			/obj/item/storage/box/shotgunshells = 2
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Ballistic ammunition crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Ballistic ammunition crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/beanbagammo
 	name = "Ammunition - Beanbag shells"
 	contains = list(/obj/item/storage/box/beanbags = 3)
 	cost = 25
-	containertype = /obj/structure/closet/crate
-	containername = "Ballistic ammunition crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Ballistic ammunition crate"
 	access = access_armory //VOREStation Edit - Guns are for the armory.
 
 /datum/supply_pack/munitions/bsmgammo
 	name = "Ammunition - 9mm top mounted lethal"
 	contains = list(/obj/item/ammo_magazine/m9mmt = 6)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Ballistic ammunition crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Ballistic ammunition crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/bsmgammorubber
 	name = "Ammunition - 9mm top mounted rubber"
 	contains = list(/obj/item/ammo_magazine/m9mmt/rubber = 6)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Ballistic ammunition crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Ballistic ammunition crate"
 	access = access_security
 
 /datum/supply_pack/munitions/brifleammo
 	name = "Ammunition - 7.62mm lethal"
 	contains = list(/obj/item/ammo_magazine/m762 = 6)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Ballistic ammunition crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Ballistic ammunition crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/pcellammo
 	name = "Ammunition - Power cell"
 	contains = list(/obj/item/cell/device/weapon = 3)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Energy ammunition crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Energy ammunition crate"
 	access = access_security
 
 /datum/supply_pack/munitions/firingpins
 	name = "Weapons - Standard firing pins"
 	contains = list(/obj/item/storage/box/firingpins = 3)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Firing pin crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Firing pin crate"
 	access = access_armory
 
 /datum/supply_pack/munitions/expeditionguns
@@ -232,8 +232,8 @@
 			/obj/item/gun/energy/frontier/locked/holdout = 1,
 			)
 	cost = 35
-	containertype = /obj/structure/closet/crate/secure
-	containername = "frontier phaser crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "frontier phaser crate"
 	access = access_explorer
 
 //Culture Update
@@ -245,8 +245,8 @@
 			/obj/item/grenade/spawnergrenade/manhacks/apidean = 3
 			)
 	cost = 150
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Apidean Weaponry crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Apidean Weaponry crate"
 	access = access_security
 
 /datum/supply_pack/misc/weaponry_tyrmalin
@@ -259,6 +259,6 @@
 			/obj/item/gun/energy/ionrifle/pistol/tyrmalin = 1
 			)
 	cost = 175
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Tyrmalin Weaponry crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Tyrmalin Weaponry crate"
 	access = access_security

code/modules/cargo/supplypacks/recreation.dm

@@ -20,8 +20,8 @@
 			/obj/item/material/twohanded/fireaxe/foam = 2
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "foam weapon crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "foam weapon crate"
 
 /datum/supply_pack/recreation/lasertag
 	name = "Lasertag equipment"
@@ -31,8 +31,8 @@
 			/obj/item/gun/energy/lasertag/blue,
 			/obj/item/clothing/suit/bluetag
 			)
-	containertype = /obj/structure/closet
-	containername = "Lasertag Closet"
+	container_type = /obj/structure/closet
+	container_name = "Lasertag Closet"
 	cost = 10
 
 /datum/supply_pack/recreation/artscrafts
@@ -55,14 +55,14 @@
 			/obj/item/wrapping_paper = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Arts and Crafts crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Arts and Crafts crate"
 
 /datum/supply_pack/recreation/painters
 	name = "Station Painting Supplies"
 	cost = 10
-	containername = "station painting supplies crate"
-	containertype = /obj/structure/closet/crate
+	container_name = "station painting supplies crate"
+	container_type = /obj/structure/closet/crate
 	contains = list(
 			/obj/item/pipe_painter = 2,
 			/obj/item/floor_painter = 2,
@@ -72,8 +72,8 @@
 /datum/supply_pack/recreation/cheapbait
 	name = "Cheap Fishing Bait"
 	cost = 10
-	containername = "cheap bait crate"
-	containertype = /obj/structure/closet/crate/freezer
+	container_name = "cheap bait crate"
+	container_type = /obj/structure/closet/crate/freezer
 	contains = list(
 			/obj/item/storage/box/wormcan/sickly = 5
 			)
@@ -81,8 +81,8 @@
 /datum/supply_pack/randomised/recreation/cheapbait
 	name = "Deluxe Fishing Bait"
 	cost = 40
-	containername = "deluxe bait crate"
-	containertype = /obj/structure/closet/crate/freezer
+	container_name = "deluxe bait crate"
+	container_type = /obj/structure/closet/crate/freezer
 	num_contained = 8
 	contains = list(
 			/obj/item/storage/box/wormcan,
@@ -92,8 +92,8 @@
 /datum/supply_pack/recreation/ltagturrets
 	name = "Laser Tag Turrets"
 	cost = 40
-	containername = "laser tag turret crate"
-	containertype = /obj/structure/closet/crate
+	container_name = "laser tag turret crate"
+	container_type = /obj/structure/closet/crate
 	contains = list(
 			/obj/machinery/porta_turret/lasertag/blue,
 			/obj/machinery/porta_turret/lasertag/red
@@ -102,8 +102,8 @@
 /datum/supply_pack/recreation/jukebox
 	name = "Jukebox crate"
 	cost = 50
-	containername = "Jukebox crate"
-	containertype = /obj/structure/closet/crate
+	container_name = "Jukebox crate"
+	container_type = /obj/structure/closet/crate
 	contains = list (/obj/machinery/media/jukebox = 1)
 
 /datum/supply_pack/recreation/rover
@@ -111,8 +111,8 @@
 	contains = list(
 			/obj/vehicle/train/rover/engine
 			)
-	containertype = /obj/structure/largecrate
-	containername = "NT Humvee Crate"
+	container_type = /obj/structure/largecrate
+	container_name = "NT Humvee Crate"
 	cost = 500
 
 /datum/supply_pack/recreation/restraints
@@ -130,8 +130,8 @@
 			/obj/item/material/twohanded/fluff/riding_crop,
 			/obj/item/clothing/under/fluff/latexmaid
 			)
-	containertype = /obj/structure/closet/crate
-	containername = "Restraints crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Restraints crate"
 	cost = 30
 
 /datum/supply_pack/recreation/wolfgirl_cosplay_crate
@@ -144,8 +144,8 @@
 			/obj/item/shield/fluff/wolfgirlshield = 1
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "wolfgirl cosplay crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "wolfgirl cosplay crate"
 
 /datum/supply_pack/randomised/recreation/figures
 	name = "Action figures crate"
@@ -154,16 +154,16 @@
 			/obj/random/action_figure/supplypack
 			)
 	cost = 200
-	containertype = /obj/structure/closet/crate
-	containername = "Action figures crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Action figures crate"
 
 /datum/supply_pack/recreation/characters
 	name = "Tabletop miniatures"
 	contains = list(
 			/obj/item/storage/box/characters
 			)
-	containertype = /obj/structure/closet/crate
-	containername = "Tabletop miniatures crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Tabletop miniatures crate"
 	cost = 50
 
 /datum/supply_pack/randomised/recreation/plushies
@@ -173,8 +173,8 @@
 			/obj/random/plushie
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate
-	containername = "Plushies crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Plushies crate"
 
 /datum/supply_pack/recreation/collars
 	name = "Collar bundle"
@@ -188,8 +188,8 @@
 			/obj/item/clothing/accessory/collar/holo = 1
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate
-	containername = "collar crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "collar crate"
 
 //DONKsoft
 /datum/supply_pack/recreation/donksoft
@@ -202,8 +202,8 @@
 			/obj/item/shield/riot/foam = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate
-	containername = "DONKsoft Skirmish crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "DONKsoft Skirmish crate"
 
 /datum/supply_pack/recreation/donksoft_exotic
 	name = "DONKsoft Exotic Weaponry Bundle"
@@ -216,8 +216,8 @@
 			/obj/item/material/twohanded/fireaxe/foam = 1
 			)
 	cost = 80
-	containertype = /obj/structure/closet/crate
-	containername = "DONKsoft Exotic Weaponry crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "DONKsoft Exotic Weaponry crate"
 
 /datum/supply_pack/recreation/donksoft_ammo
 	name = "DONKsoft Resupply Bundle"
@@ -225,5 +225,5 @@
 			/obj/item/storage/box/foamdart= 4
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate
-	containername = "DONKsoft Resupply crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "DONKsoft Resupply crate"

code/modules/cargo/supplypacks/robotics.dm

@@ -21,8 +21,8 @@
 			/obj/item/cell/high = 2
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robotics assembly"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robotics assembly"
 	access = access_robotics
 
 /*/datum/supply_pack/robotics/robolimbs_basic
@@ -32,8 +32,8 @@
 			/obj/item/disk/limb/xion
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Robolimb blueprints (basic)"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Robolimb blueprints (basic)"
 	access = access_robotics
 
 /datum/supply_pack/robotics/robolimbs_adv
@@ -48,8 +48,8 @@
 	/obj/item/disk/limb/zenghu,
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Robolimb blueprints (adv)"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Robolimb blueprints (adv)"
 	access = access_robotics
 */
 
@@ -57,80 +57,80 @@
 	name = "Morpheus robolimb blueprints"
 	contains = list(/obj/item/disk/limb/morpheus)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robolimb blueprints (Morpheus)"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robolimb blueprints (Morpheus)"
 	access = access_robotics
 
 /datum/supply_pack/robotics/robolimbs/antares
 	name = "Antares robolimb blueprints"
 	contains = list(/obj/item/disk/limb/antares)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robolimb blueprints (Antares)"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robolimb blueprints (Antares)"
 	access = access_robotics
 
 /datum/supply_pack/robotics/robolimbs/cybersolutions
 	name = "Cyber Solutions robolimb blueprints"
 	contains = list(/obj/item/disk/limb/cybersolutions)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robolimb blueprints (Cyber Solutions)"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robolimb blueprints (Cyber Solutions)"
 	access = access_robotics
 
 /datum/supply_pack/robotics/robolimbs/xion
 	name = "Xion robolimb blueprints"
 	contains = list(/obj/item/disk/limb/xion)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robolimb blueprints (Xion)"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robolimb blueprints (Xion)"
 	access = access_robotics
 
 /datum/supply_pack/robotics/robolimbs/grayson
 	name = "Grayson robolimb blueprints"
 	contains = list(/obj/item/disk/limb/grayson)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robolimb blueprints (Grayson)"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robolimb blueprints (Grayson)"
 	access = access_robotics
 
 /datum/supply_pack/robotics/robolimbs/hephaestus
 	name = "Hephaestus robolimb blueprints"
 	contains = list(/obj/item/disk/limb/hephaestus)
 	cost = 35
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robolimb blueprints (Hephaestus)"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robolimb blueprints (Hephaestus)"
 	access = access_robotics
 
 /datum/supply_pack/robotics/robolimbs/wardtakahashi
 	name = "Ward-Takahashi robolimb blueprints"
 	contains = list(/obj/item/disk/limb/wardtakahashi)
 	cost = 35
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robolimb blueprints (Ward-Takahashi)"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robolimb blueprints (Ward-Takahashi)"
 	access = access_robotics
 
 /datum/supply_pack/robotics/robolimbs/zenghu
 	name = "Zeng Hu robolimb blueprints"
 	contains = list(/obj/item/disk/limb/zenghu)
 	cost = 35
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robolimb blueprints (Zeng Hu)"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robolimb blueprints (Zeng Hu)"
 	access = access_robotics
 
 /datum/supply_pack/robotics/robolimbs/bishop
 	name = "Bishop robolimb blueprints"
 	contains = list(/obj/item/disk/limb/bishop)
 	cost = 70
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robolimb blueprints (Bishop)"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robolimb blueprints (Bishop)"
 	access = access_robotics
 
 /datum/supply_pack/robotics/robolimbs/cenilimicybernetics
 	name = "Cenilimi Cybernetics robolimb blueprints"
 	contains = list(/obj/item/disk/limb/cenilimicybernetics)
 	cost = 45
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Robolimb blueprints (Cenilimi Cybernetics)"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Robolimb blueprints (Cenilimi Cybernetics)"
 	access = access_robotics
 
 //MECHS
@@ -143,8 +143,8 @@
 			/obj/item/circuitboard/mecha/ripley/peripherals
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "APLU \"Ripley\" Circuit Crate"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "APLU \"Ripley\" Circuit Crate"
 	access = access_robotics
 
 /datum/supply_pack/robotics/mecha_odysseus
@@ -154,8 +154,8 @@
 			/obj/item/circuitboard/mecha/odysseus/main
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "\"Odysseus\" Circuit Crate"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "\"Odysseus\" Circuit Crate"
 	access = access_robotics
 
 /datum/supply_pack/randomised/robotics/exosuit_mod
@@ -168,8 +168,8 @@
 			)
 	name = "Random APLU modkit"
 	cost = 200
-	containertype = /obj/structure/closet/crate/science
-	containername = "heavy crate"
+	container_type = /obj/structure/closet/crate/science
+	container_name = "heavy crate"
 
 /datum/supply_pack/randomised/robotics/exosuit_mod/durand
 	contains = list(
@@ -193,30 +193,30 @@
 			/obj/item/defib_kit/jumper_kit = 2
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Jumper kit crate"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Jumper kit crate"
 	access = access_robotics
 
 /datum/supply_pack/robotics/bike
 	name = "Spacebike Crate"
 	contains = list()
 	cost = 200
-	containertype = /obj/structure/largecrate/vehicle/bike
-	containername = "Spacebike Crate"
+	container_type = /obj/structure/largecrate/vehicle/bike
+	container_name = "Spacebike Crate"
 
 /datum/supply_pack/robotics/quadbike
 	name = "ATV Crate"
 	contains = list()
 	cost = 300
-	containertype = /obj/structure/largecrate/vehicle/quadbike
-	containername = "ATV Crate"
+	container_type = /obj/structure/largecrate/vehicle/quadbike
+	container_name = "ATV Crate"
 
 /datum/supply_pack/robotics/quadtrailer
 	name = "ATV Trailer Crate"
 	contains = list()
 	cost = 50
-	containertype = /obj/structure/largecrate/vehicle/quadtrailer
-	containername = "ATV Trailer Crate"
+	container_type = /obj/structure/largecrate/vehicle/quadtrailer
+	container_name = "ATV Trailer Crate"
 
 /datum/supply_pack/robotics/mecha_gopher
 	name = "Circuit Crate (\"Gopher\" APLU)"
@@ -225,8 +225,8 @@
 			/obj/item/circuitboard/mecha/gopher/peripherals
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "APLU \"Gopher\" Circuit Crate"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "APLU \"Gopher\" Circuit Crate"
 	access = access_robotics
 
 /datum/supply_pack/robotics/mecha_polecat
@@ -237,8 +237,8 @@
 			/obj/item/circuitboard/mecha/polecat/targeting
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "APLU \"Polecat\" Circuit Crate"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "APLU \"Polecat\" Circuit Crate"
 	access = access_robotics
 
 /datum/supply_pack/robotics/mecha_weasel
@@ -249,8 +249,8 @@
 			/obj/item/circuitboard/mecha/weasel/targeting
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "APLU \"Weasel\" Circuit Crate"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "APLU \"Weasel\" Circuit Crate"
 	access = access_robotics
 
 /datum/supply_pack/robotics/some_robolimbs
@@ -261,8 +261,8 @@
 			/obj/item/disk/limb/talon
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Basic Robolimb Blueprint Crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Basic Robolimb Blueprint Crate"
 	access = access_robotics
 
 /datum/supply_pack/robotics/all_robolimbs
@@ -289,6 +289,6 @@
 			/obj/item/disk/limb/antares
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Advanced Robolimb Blueprint Crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Advanced Robolimb Blueprint Crate"
 	access = access_robotics

code/modules/cargo/supplypacks/science.dm

@@ -9,16 +9,16 @@
 	name = "Virus sample crate"
 	contains = list(/obj/item/virusdish/random = 4)
 	cost = 25
-	containertype = "/obj/structure/closet/crate/secure"
-	containername = "Virus sample crate"
+	container_type = "/obj/structure/closet/crate/secure"
+	container_name = "Virus sample crate"
 	access = access_cmo
 
 /datum/supply_pack/sci/coolanttank
 	name = "Coolant tank crate"
 	contains = list(/obj/structure/reagent_dispensers/coolanttank)
 	cost = 15
-	containertype = /obj/structure/largecrate
-	containername = "coolant tank crate"
+	container_type = /obj/structure/largecrate
+	container_name = "coolant tank crate"
 
 /datum/supply_pack/sci/phoron
 	name = "Phoron research crate"
@@ -32,8 +32,8 @@
 			/obj/item/transfer_valve = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure/phoron
-	containername = "Phoron assembly crate"
+	container_type = /obj/structure/closet/crate/secure/phoron
+	container_name = "Phoron assembly crate"
 	access = access_tox_storage
 
 /datum/supply_pack/sci/exoticseeds
@@ -47,23 +47,23 @@
 			/obj/item/seeds/kudzuseed
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate/hydroponics
-	containername = "Exotic Seeds crate"
+	container_type = /obj/structure/closet/crate/hydroponics
+	container_name = "Exotic Seeds crate"
 	access = access_hydroponics
 
 /datum/supply_pack/sci/integrated_circuit_printer
 	name = "Integrated circuit printer"
 	contains = list(/obj/item/integrated_circuit_printer = 2)
 	cost = 15
-	containertype = /obj/structure/closet/crate
-	containername = "Integrated circuit crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Integrated circuit crate"
 
 /datum/supply_pack/sci/integrated_circuit_printer_upgrade
 	name = "Integrated circuit printer upgrade - advanced designs"
 	contains = list(/obj/item/disk/integrated_circuit/upgrade/advanced)
 	cost = 30
-	containertype = /obj/structure/closet/crate
-	containername = "Integrated circuit crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Integrated circuit crate"
 
 /datum/supply_pack/sci/xenoarch
 	name = "Xenoarchaeology Tech crate"
@@ -83,16 +83,16 @@
 				/obj/item/storage/bag/fossils,
 				/obj/item/hand_labeler)
 	cost = 100
-	containertype = /obj/structure/closet/crate/secure/science
-	containername = "Xenoarchaeology Tech crate"
+	container_type = /obj/structure/closet/crate/secure/science
+	container_name = "Xenoarchaeology Tech crate"
 	access = access_research
 
 /datum/supply_pack/sci/jukebox_circuitboard
 	name = "Jukebox Circuit Board crate"
 	contains = list(/obj/item/circuitboard/jukebox = 2)
 	cost = 25
-	containertype = /obj/structure/closet/crate
-	containername = "Jukebox Circuit Board crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Jukebox Circuit Board crate"
 
 /datum/supply_pack/sci/dune_buggy
 	name = "Exploration Dune Buggy"
@@ -100,20 +100,20 @@
 			/obj/vehicle/train/rover/engine/dunebuggy
 			)
 	cost = 100
-	containertype = /obj/structure/largecrate
-	containername = "Exploration Dune Buggy Crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Exploration Dune Buggy Crate"
 
 /datum/supply_pack/sci/pred
 	name = "Dangerous Predator crate"
 	cost = 40
-	containertype = /obj/structure/largecrate/animal/pred
-	containername = "Dangerous Predator crate"
+	container_type = /obj/structure/largecrate/animal/pred
+	container_name = "Dangerous Predator crate"
 	access = access_xenobiology
 
 /datum/supply_pack/sci/pred_doom
 	name = "EXTREMELY Dangerous Predator crate"
 	cost = 200
-	containertype = /obj/structure/largecrate/animal/dangerous
-	containername = "EXTREMELY Dangerous Predator crate"
+	container_type = /obj/structure/largecrate/animal/dangerous
+	container_name = "EXTREMELY Dangerous Predator crate"
 	access = access_xenobiology
 	contraband = 1

code/modules/cargo/supplypacks/security.dm

@@ -27,8 +27,8 @@
 			/obj/item/clothing/suit/storage/vest/heavy/hos
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Armor crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Armor crate"
 
 /datum/supply_pack/randomised/security/carriers
 	name = "Armor - Plate carriers"
@@ -42,8 +42,8 @@
 			/obj/item/clothing/suit/armor/pcarrier/press
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Plate Carrier crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Plate Carrier crate"
 	access = access_armory
 
 /datum/supply_pack/security/carriertags
@@ -61,8 +61,8 @@
 			/obj/item/clothing/accessory/armor/tag/abneg
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Plate Carrier crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Plate Carrier crate"
 
 /datum/supply_pack/security/helmcovers
 	name = "Armor - Helmet covers"
@@ -77,8 +77,8 @@
 			/obj/item/clothing/accessory/armor/helmcover/tan
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Helmet Covers crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Helmet Covers crate"
 
 /datum/supply_pack/randomised/security/armorplates
 	name = "Armor - Security armor plates"
@@ -96,8 +96,8 @@
 			/obj/item/clothing/accessory/armor/armorplate/bulletproof
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Armor plate crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Armor plate crate"
 	access = access_armory
 
 /datum/supply_pack/randomised/security/carrierarms
@@ -114,8 +114,8 @@
 			/obj/item/clothing/accessory/armor/armguards/bulletproof
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Armor plate crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Armor plate crate"
 	access = access_armory
 
 /datum/supply_pack/randomised/security/carrierlegs
@@ -132,8 +132,8 @@
 			/obj/item/clothing/accessory/armor/legguards/bulletproof
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Armor plate crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Armor plate crate"
 	access = access_armory
 
 /datum/supply_pack/randomised/security/carrierbags
@@ -152,8 +152,8 @@
 			/obj/item/clothing/accessory/storage/pouches/large/tan
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Armor plate crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Armor plate crate"
 	access = access_armory
 
 /datum/supply_pack/security/riot_gear
@@ -167,8 +167,8 @@
 			/obj/item/storage/box/handcuffs
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Riot gear crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Riot gear crate"
 	access = access_armory
 
 /datum/supply_pack/security/riot_armor
@@ -180,8 +180,8 @@
 			/obj/item/clothing/shoes/leg_guard/riot
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Riot armor crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Riot armor crate"
 	access = access_armory
 
 /datum/supply_pack/security/riot_plates
@@ -194,8 +194,8 @@
 			/obj/item/clothing/accessory/armor/legguards/riot
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Riot armor crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Riot armor crate"
 	access = access_armory
 
 /datum/supply_pack/security/ablative_armor
@@ -207,8 +207,8 @@
 			/obj/item/clothing/shoes/leg_guard/laserproof
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Ablative armor crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Ablative armor crate"
 	access = access_armory
 
 /datum/supply_pack/security/ablative_plates
@@ -221,8 +221,8 @@
 			/obj/item/clothing/accessory/armor/legguards/laserproof
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Ablative armor crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Ablative armor crate"
 	access = access_armory
 
 /datum/supply_pack/security/bullet_resistant_armor
@@ -234,8 +234,8 @@
 			/obj/item/clothing/shoes/leg_guard/bulletproof
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Ballistic armor crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Ballistic armor crate"
 	access = access_armory
 //CITADEL EDIT - YEET EM AND SKEET EM BOYS WE'RE FREEING ARMOR /* VOREStation Removal - Howabout no ERT armor being orderable?
 
@@ -249,8 +249,8 @@
 			/obj/item/clothing/accessory/armor/legguards/bulletproof
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Ballistic armor crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Ballistic armor crate"
 	access = access_armory
 
 /datum/supply_pack/security/combat_armor
@@ -262,14 +262,14 @@
 			/obj/item/clothing/shoes/leg_guard/combat
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Combat armor crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Combat armor crate"
 	access = access_armory
 
 /datum/supply_pack/security/tactical
 	name = "Armor - Tactical"
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Tactical armor crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Tactical armor crate"
 	cost = 40
 	access = access_armory
 	contains = list(
@@ -293,8 +293,8 @@
 
 /datum/supply_pack/security/flexitac
 	name = "Armor - Tactical Light"
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Tactical Light armor crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Tactical Light armor crate"
 	cost = 75
 	access = access_armory
 	contains = list(
@@ -318,16 +318,16 @@
 	name = "Misc - Security Barriers"
 	contains = list(/obj/machinery/deployable/barrier = 4)
 	cost = 20
-	containertype = /obj/structure/largecrate
-	containername = "Security barrier crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Security barrier crate"
 	access = null
 
 /datum/supply_pack/security/securityshieldgen
 	name = "Misc - Wall shield generators"
 	contains = list(/obj/machinery/shieldwallgen = 4)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Wall shield generators crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Wall shield generators crate"
 	access = access_teleporter
 
 /datum/supply_pack/randomised/security/holster
@@ -340,8 +340,8 @@
 			/obj/item/clothing/accessory/holster/hip
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate
-	containername = "Holster crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Holster crate"
 
 /datum/supply_pack/security/extragear
 	name = "Gear - Security surplus equipment"
@@ -353,8 +353,8 @@
 			/obj/item/storage/belt/dualholster = 3
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate
-	containername = "Security surplus equipment"
+	container_type = /obj/structure/closet/crate
+	container_name = "Security surplus equipment"
 
 /datum/supply_pack/security/detectivegear
 	name = "Forensic - Investigation equipment"
@@ -380,8 +380,8 @@
 			/obj/item/storage/bag/detective
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Forensic equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Forensic equipment"
 	access = access_forensics_lockers
 
 /datum/supply_pack/security/detectivescan
@@ -393,8 +393,8 @@
 			/obj/item/detective_scanner
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Forensic equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Forensic equipment"
 	access = access_forensics_lockers
 
 /datum/supply_pack/security/detectiveclothes
@@ -415,8 +415,8 @@
 			/obj/item/clothing/gloves/black = 2
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Investigation clothing"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Investigation clothing"
 	access = access_forensics_lockers
 
 /datum/supply_pack/security/officergear
@@ -445,8 +445,8 @@
 			/obj/item/flashlight/maglight
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Officer equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Officer equipment"
 	access = access_brig
 
 /datum/supply_pack/security/wardengear
@@ -473,8 +473,8 @@
 			/obj/item/flashlight/maglight
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Warden equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Warden equipment"
 	access = access_armory
 
 /datum/supply_pack/security/headofsecgear
@@ -499,8 +499,8 @@
 			/obj/item/flashlight/maglight
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Head of security equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Head of security equipment"
 	access = access_hos
 
 /datum/supply_pack/security/securityclothing
@@ -518,8 +518,8 @@
 			/obj/item/storage/box/holobadge
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Security uniform crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Security uniform crate"
 
 /datum/supply_pack/security/navybluesecurityclothing
 	name = "Misc - Security uniform navy blue"
@@ -539,8 +539,8 @@
 			/obj/item/storage/box/holobadge
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Navy blue security uniform crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Navy blue security uniform crate"
 
 /datum/supply_pack/security/corporatesecurityclothing
 	name = "Misc - Security uniform corporate"
@@ -559,8 +559,8 @@
 			/obj/item/storage/box/holobadge
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Corporate security uniform crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Corporate security uniform crate"
 
 /datum/supply_pack/security/biosuit
 	name = "Gear - Security biohazard gear"
@@ -575,8 +575,8 @@
 			/obj/item/storage/box/gloves
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Security biohazard gear"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Security biohazard gear"
 	access = access_security
 
 /datum/supply_pack/security/posters
@@ -585,8 +585,8 @@
 			/obj/item/contraband/poster/nanotrasen = 6
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Morale Posters"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Morale Posters"
 	access = access_maint_tunnels
 
 /datum/supply_pack/security/biosuit
@@ -619,8 +619,8 @@
 			/obj/item/kevlarupgrade = 5,
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Kevlar Upgrade Kits"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Kevlar Upgrade Kits"
 	access = access_security
 
 /datum/supply_pack/security/pcarriers/merc
@@ -632,8 +632,8 @@
 			/obj/item/clothing/head/helmet/merc = 3,
 			)
 	cost = 65
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Plate carrier heavy crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Plate carrier heavy crate"
 	access = access_security
 	contraband = 1
 
@@ -645,7 +645,7 @@
 			/obj/item/clothing/head/helmet/HoS = 1,
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	container_type = /obj/structure/closet/crate/secure
 	access = access_security
 
 /datum/supply_pack/security/wardengear
@@ -654,7 +654,7 @@
 			/obj/item/storage/box/trackimp = 1
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure
+	container_type = /obj/structure/closet/crate/secure
 	access = access_armory
 
 /datum/supply_pack/security/battlerifle
@@ -664,7 +664,7 @@
 			/obj/item/ammo_magazine/m95 = 4
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate/secure
+	container_type = /obj/structure/closet/crate/secure
 	access = access_armory
 
 /datum/supply_pack/security/quadshot
@@ -675,5 +675,5 @@
 			/obj/item/storage/belt/security/tactical/bandolier = 2,
 			)
 	cost = 70
-	containertype = /obj/structure/closet/crate/secure
+	container_type = /obj/structure/closet/crate/secure
 	access = access_armory

code/modules/cargo/supplypacks/supply.dm

@@ -17,15 +17,15 @@
 			/obj/item/reagent_containers/food/snacks/meat = 4
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "Food crate"
+	container_type = /obj/structure/closet/crate/freezer
+	container_name = "Food crate"
 
 /datum/supply_pack/supply/toner
 	name = "Toner cartridges"
 	contains = list(/obj/item/toner = 6)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Toner cartridges"
+	container_type = /obj/structure/closet/crate
+	container_name = "Toner cartridges"
 
 /datum/supply_pack/supply/janitor
 	name = "Janitorial supplies"
@@ -48,8 +48,8 @@
 			/obj/structure/mopbucket
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Janitorial supplies"
+	container_type = /obj/structure/closet/crate
+	container_name = "Janitorial supplies"
 
 /datum/supply_pack/supply/shipping
 	name = "Shipping supplies"
@@ -62,8 +62,8 @@
 				/obj/item/tool/wirecutters,
 				/obj/item/duct_tape_roll = 2)
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Shipping supplies crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Shipping supplies crate"
 
 /datum/supply_pack/supply/bureaucracy
 	contains = list(
@@ -82,14 +82,14 @@
 			)
 	name = "Office supplies"
 	cost = 15
-	containertype = /obj/structure/closet/crate
-	containername = "Office supplies crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Office supplies crate"
 
 /datum/supply_pack/supply/spare_pda
 	name = "Spare PDAs"
 	cost = 10
-	containertype = /obj/structure/closet/crate
-	containername = "Spare PDA crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Spare PDA crate"
 	contains = list(/obj/item/pda = 3)
 
 /datum/supply_pack/supply/minergear
@@ -112,8 +112,8 @@
 			/obj/item/clothing/glasses/meson
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Shaft miner equipment"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Shaft miner equipment"
 	access = access_mining
 
 /* //MULE Bots can't traverse the Tether.
@@ -121,23 +121,23 @@
 	name = "Mulebot Crate"
 	contains = list()
 	cost = 20
-	containertype = /obj/structure/largecrate/animal/mulebot
-	containername = "Mulebot Crate"
+	container_type = /obj/structure/largecrate/animal/mulebot
+	container_name = "Mulebot Crate"
 */
 
 /datum/supply_pack/supply/cargotrain
 	name = "Cargo Train Tug"
 	contains = list(/obj/vehicle/train/engine)
 	cost = 35
-	containertype = /obj/structure/largecrate
-	containername = "Cargo Train Tug Crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Cargo Train Tug Crate"
 
 /datum/supply_pack/supply/cargotrailer
 	name = "Cargo Train Trolley"
 	contains = list(/obj/vehicle/train/trolley)
 	cost = 15
-	containertype = /obj/structure/largecrate
-	containername = "Cargo Train Trolley Crate"
+	container_type = /obj/structure/largecrate
+	container_name = "Cargo Train Trolley Crate"
 
 //Culture Update
 /datum/supply_pack/misc/mining_tyrmalin
@@ -149,6 +149,6 @@
 			/obj/item/grenade/explosive/ied/tyrmalin = 2
 			)
 	cost = 120
-	containertype = /obj/structure/closet/crate/secure/gear
-	containername = "Tyrmalin Mining crate"
+	container_type = /obj/structure/closet/crate/secure/gear
+	container_name = "Tyrmalin Mining crate"
 	access = access_mining

code/modules/cargo/supplypacks/voidsuits.dm

@@ -17,8 +17,8 @@
 			/obj/item/tank/oxygen = 2,
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Atmospheric voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Atmospheric voidsuit crate"
 	access = access_atmospherics
 
 /datum/supply_pack/voidsuits/atmos/alt
@@ -31,8 +31,8 @@
 			/obj/item/tank/oxygen = 2,
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Heavy Duty Atmospheric voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Heavy Duty Atmospheric voidsuit crate"
 	access = access_atmospherics
 
 /datum/supply_pack/voidsuits/engineering
@@ -45,8 +45,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Engineering voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Engineering voidsuit crate"
 	access = access_engine_equip
 
 /datum/supply_pack/voidsuits/engineering/construction
@@ -59,8 +59,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Engineering Construction voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Engineering Construction voidsuit crate"
 	access = access_engine_equip
 
 /datum/supply_pack/voidsuits/engineering/hazmat
@@ -73,8 +73,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 45
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Engineering Hazmat voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Engineering Hazmat voidsuit crate"
 	access = access_engine_equip
 
 /datum/supply_pack/voidsuits/engineering/alt
@@ -87,8 +87,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Reinforced Engineering voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Reinforced Engineering voidsuit crate"
 	access = access_engine_equip
 
 /datum/supply_pack/voidsuits/medical
@@ -101,8 +101,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Medical voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Medical voidsuit crate"
 	access = access_medical_equip
 
 /datum/supply_pack/voidsuits/medical/emt
@@ -115,8 +115,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Medical EMT voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Medical EMT voidsuit crate"
 	access = access_medical_equip
 
 /datum/supply_pack/voidsuits/medical/bio
@@ -129,8 +129,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 45
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Medical Biohazard voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Medical Biohazard voidsuit crate"
 	access = access_medical_equip
 
 /datum/supply_pack/voidsuits/medical/alt
@@ -143,8 +143,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Vey-Med Medical voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Vey-Med Medical voidsuit crate"
 	access = access_medical_equip
 
 /datum/supply_pack/voidsuits/medical/alt2
@@ -157,8 +157,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Vey-Med Medical voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Vey-Med Medical voidsuit crate"
 	access = access_medical_equip
 
 /datum/supply_pack/voidsuits/security
@@ -171,8 +171,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Security voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Security voidsuit crate"
 
 /datum/supply_pack/voidsuits/security/crowd
 	name = "Security Crowd Control voidsuits"
@@ -184,8 +184,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Security Crowd Control voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Security Crowd Control voidsuit crate"
 	access = access_armory
 
 /datum/supply_pack/voidsuits/security/alt
@@ -198,8 +198,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Security EVA Riot voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Security EVA Riot voidsuit crate"
 	access = access_armory
 
 /datum/supply_pack/voidsuits/supply
@@ -211,8 +211,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Mining voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Mining voidsuit crate"
 	access = access_mining
 
 /datum/supply_pack/voidsuits/supply/alt
@@ -224,8 +224,8 @@
 			/obj/item/tank/oxygen = 2
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Frontier Mining voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Frontier Mining voidsuit crate"
 	access = access_mining
 
 /datum/supply_pack/voidsuits/zaddat
@@ -235,8 +235,8 @@
 		/obj/item/clothing/mask/gas/zaddat = 1
 		)
 	cost = 30
-	containertype = /obj/structure/closet/crate
-	containername = "Zaddat Shroud crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "Zaddat Shroud crate"
 	access = null
 
 /datum/supply_pack/voidsuits/atmos
@@ -321,8 +321,8 @@
 			/obj/item/tank/oxygen = 3
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Exploration voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Exploration voidsuit crate"
 	access = access_explorer
 
 /datum/supply_pack/voidsuits/pilot
@@ -335,6 +335,6 @@
 			/obj/item/tank/oxygen = 1
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Pilot voidsuit crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "Pilot voidsuit crate"
 	access = access_pilot

code/modules/hydroponics/spreading/spreading.dm

@@ -88,13 +88,6 @@
 	else
 		parent = newparent
 
-	if(!SSplants)
-		sleep(250) // ugly hack, should mean roundstart plants are fine. TODO initialize perhaps?
-	if(!SSplants)
-		to_chat(world, "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>")
-		qdel(src)
-		return
-
 	if(!istype(newseed))
 		newseed = SSplants.seeds[DEFAULT_SEED]
 	seed = newseed

code/modules/mob/mob_planes.dm

@@ -222,8 +222,8 @@
 	apply()
 
 /atom/movable/screen/plane_master/augmented/proc/apply()
-	if(!my_mob.client)
-		return
+	// if(!my_mob.client)
+	// 	return
 
 	/**
 	 * preserving this for when we get generic augmented hud

code/modules/reagents/machinery/dispenser/supply.dm

@@ -4,8 +4,8 @@
 			/obj/machinery/chemical_dispenser{anchored = 0}
 		)
 	cost = 25
-	containertype = /obj/structure/largecrate
-	containername = "reagent dispenser crate"
+	container_type = /obj/structure/largecrate
+	container_name = "reagent dispenser crate"
 	group = "Reagents"
 
 /datum/supply_pack/beer_dispenser
@@ -14,8 +14,8 @@
 			/obj/machinery/chemical_dispenser/bar_alc{anchored = 0}
 		)
 	cost = 25
-	containertype = /obj/structure/largecrate
-	containername = "booze dispenser crate"
+	container_type = /obj/structure/largecrate
+	container_name = "booze dispenser crate"
 	group = "Reagents"
 
 /datum/supply_pack/soda_dispenser
@@ -24,8 +24,8 @@
 			/obj/machinery/chemical_dispenser/bar_soft{anchored = 0}
 		)
 	cost = 25
-	containertype = /obj/structure/largecrate
-	containername = "soda dispenser crate"
+	container_type = /obj/structure/largecrate
+	container_name = "soda dispenser crate"
 	group = "Reagents"
 
 /datum/supply_pack/reagents
@@ -55,8 +55,8 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/tungsten
 		)
 	cost = 150
-	containertype = /obj/structure/closet/crate/secure
-	containername = "chemical crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "chemical crate"
 	access = list(access_chemistry)
 	group = "Reagents"
 
@@ -79,8 +79,8 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/bitters
 		)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "alcoholic drinks crate"
+	container_type = /obj/structure/closet/crate/secure
+	container_name = "alcoholic drinks crate"
 	access = list(access_bar)
 	group = "Reagents"
 
@@ -107,8 +107,8 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/lemon
 		)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "soft drinks crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "soft drinks crate"
 	group = "Reagents"
 
 /datum/supply_pack/coffee_reagents
@@ -124,8 +124,8 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/ice
 		)
 	cost = 50
-	containertype = /obj/structure/closet/crate
-	containername = "coffee drinks crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "coffee drinks crate"
 	group = "Reagents"
 
 /datum/supply_pack/dispenser_cartridges
@@ -143,16 +143,16 @@
 			/obj/item/reagent_containers/chem_disp_cartridge
 		)
 	cost = 15
-	containertype = /obj/structure/closet/crate
-	containername = "dispenser cartridge crate"
+	container_type = /obj/structure/closet/crate
+	container_name = "dispenser cartridge crate"
 	group = "Reagents"
 
 #define SEC_PACK(_tname, _type, _name, _cname, _cost, _access)\
 	datum/supply_pack/dispenser_cartridges{\
 		_tname {\
 			name = _name ;\
-			containername = _cname ;\
-			containertype = /obj/structure/closet/crate/secure;\
+			container_name = _cname ;\
+			container_type = /obj/structure/closet/crate/secure;\
 			access = list( _access );\
 			cost = _cost ;\
 			contains = list( _type , _type );\
@@ -163,8 +163,8 @@
 	datum/supply_pack/dispenser_cartridges{\
 		_tname {\
 			name = _name ;\
-			containername = _cname ;\
-			containertype = /obj/structure/closet/crate;\
+			container_name = _cname ;\
+			container_type = /obj/structure/closet/crate;\
 			cost = _cost ;\
 			contains = list( _type , _type );\
 			group = "Reagent Cartridges"\

vorestation.dme

@@ -75,7 +75,6 @@
 #include "code\__DEFINES\stat_tracking.dm"
 #include "code\__DEFINES\status_effects.dm"
 #include "code\__DEFINES\storage.dm"
-#include "code\__DEFINES\supply.dm"
 #include "code\__DEFINES\targeting.dm"
 #include "code\__DEFINES\tgs.config.dm"
 #include "code\__DEFINES\tgs.dm"
@@ -110,6 +109,7 @@
 #include "code\__DEFINES\carbon\languages.dm"
 #include "code\__DEFINES\carbon\organs.dm"
 #include "code\__DEFINES\carbon\species.dm"
+#include "code\__DEFINES\cargo\supply.dm"
 #include "code\__DEFINES\color\color.dm"
 #include "code\__DEFINES\color\colour_priority.dm"
 #include "code\__DEFINES\color\lum.dm"
@@ -452,23 +452,6 @@
 #include "code\datums\status_effects\status_effect.dm"
 #include "code\datums\status_effects\debuffs\crusher_mark.dm"
 #include "code\datums\status_effects\neutral\crusher_track.dm"
-#include "code\datums\supplypacks\atmospherics.dm"
-#include "code\datums\supplypacks\contraband.dm"
-#include "code\datums\supplypacks\costumes.dm"
-#include "code\datums\supplypacks\engineering.dm"
-#include "code\datums\supplypacks\hospitality.dm"
-#include "code\datums\supplypacks\hydroponics.dm"
-#include "code\datums\supplypacks\materials.dm"
-#include "code\datums\supplypacks\medical.dm"
-#include "code\datums\supplypacks\misc.dm"
-#include "code\datums\supplypacks\munitions.dm"
-#include "code\datums\supplypacks\recreation.dm"
-#include "code\datums\supplypacks\robotics.dm"
-#include "code\datums\supplypacks\science.dm"
-#include "code\datums\supplypacks\security.dm"
-#include "code\datums\supplypacks\supply.dm"
-#include "code\datums\supplypacks\supplypacks.dm"
-#include "code\datums\supplypacks\voidsuits.dm"
 #include "code\datums\underwear\bottom.dm"
 #include "code\datums\underwear\socks.dm"
 #include "code\datums\underwear\top.dm"
@@ -1746,6 +1729,23 @@
 #include "code\modules\busy_space\air_traffic.dm"
 #include "code\modules\busy_space\loremaster.dm"
 #include "code\modules\busy_space\organizations.dm"
+#include "code\modules\cargo\supplypacks\_supplypacks.dm"
+#include "code\modules\cargo\supplypacks\atmospherics.dm"
+#include "code\modules\cargo\supplypacks\contraband.dm"
+#include "code\modules\cargo\supplypacks\costumes.dm"
+#include "code\modules\cargo\supplypacks\engineering.dm"
+#include "code\modules\cargo\supplypacks\hospitality.dm"
+#include "code\modules\cargo\supplypacks\hydroponics.dm"
+#include "code\modules\cargo\supplypacks\materials.dm"
+#include "code\modules\cargo\supplypacks\medical.dm"
+#include "code\modules\cargo\supplypacks\misc.dm"
+#include "code\modules\cargo\supplypacks\munitions.dm"
+#include "code\modules\cargo\supplypacks\recreation.dm"
+#include "code\modules\cargo\supplypacks\robotics.dm"
+#include "code\modules\cargo\supplypacks\science.dm"
+#include "code\modules\cargo\supplypacks\security.dm"
+#include "code\modules\cargo\supplypacks\supply.dm"
+#include "code\modules\cargo\supplypacks\voidsuits.dm"
 #include "code\modules\catalogue\atoms.dm"
 #include "code\modules\catalogue\catalogue_data.dm"
 #include "code\modules\catalogue\cataloguer.dm"