Merge remote-tracking branch 'origin/master' into rustsql

code/modules/cargo/bounties/reagent.dm

@@ -35,7 +35,7 @@
 	name = "Simple Drink"
 	reward = 1500
 
-datum/bounty/reagent/simple_drink/New()
+/datum/bounty/reagent/simple_drink/New()
 	// Don't worry about making this comprehensive. It doesn't matter if some drinks are skipped.
 	var/static/list/possible_reagents = list(\
 		/datum/reagent/consumable/ethanol/antifreeze,\
@@ -91,7 +91,7 @@ datum/bounty/reagent/simple_drink/New()
 	name = "Complex Drink"
 	reward = 4000
 
-datum/bounty/reagent/complex_drink/New()
+/datum/bounty/reagent/complex_drink/New()
 	// Don't worry about making this comprehensive. It doesn't matter if some drinks are skipped.
 	var/static/list/possible_reagents = list(\
 		/datum/reagent/consumable/ethanol/atomicbomb,\
@@ -124,7 +124,7 @@ datum/bounty/reagent/complex_drink/New()
 	reward = 2750
 	required_volume = 30
 
-datum/bounty/reagent/chemical/New()
+/datum/bounty/reagent/chemical/New()
 	// Don't worry about making this comprehensive. It doesn't matter if some chems are skipped.
 	var/static/list/possible_reagents = list(\
 		/datum/reagent/medicine/leporazine,\

code/modules/cargo/exports/gear.dm

@@ -473,7 +473,7 @@
 //Soft Suits
 
 //Blanket
-datum/export/gear/space/helmet
+/datum/export/gear/space/helmet
 	cost = 55
 	unit_name = "space helmet"
 	export_types = list(/obj/item/clothing/head/helmet/space)
@@ -485,7 +485,7 @@ datum/export/gear/space/helmet
 	export_types = list(/obj/item/clothing/suit/space)
 	include_subtypes = TRUE
 
-datum/export/gear/space/helmet/plasma
+/datum/export/gear/space/helmet/plasma
 	cost = 100
 	unit_name = "plasmaman space helmet"
 	export_types = list(/obj/item/clothing/suit/space/eva/plasmaman)
@@ -495,7 +495,7 @@ datum/export/gear/space/helmet/plasma
 	unit_name = "plasmaman space suit"
 	export_types = list(/obj/item/clothing/suit/space/eva/plasmaman)
 
-datum/export/gear/space/helmet/synda
+/datum/export/gear/space/helmet/synda
 	cost = 150 //Flash proof
 	unit_name = "syndicate space helmet"
 	export_types = list(/obj/item/clothing/head/helmet/space/syndicate)
@@ -510,7 +510,7 @@ datum/export/gear/space/helmet/synda
 //Glasses
 
 //Blanket
-datum/export/gear/glasses //glasses are not worth selling
+/datum/export/gear/glasses //glasses are not worth selling
 	cost = 3
 	unit_name = "glasses"
 	export_types = list(/obj/item/clothing/glasses)

code/modules/cargo/packs/costumes_toys.dm

@@ -334,3 +334,22 @@
 					/obj/item/storage/fancy/ringbox/silver) //diamond rings cost the same price as this crate via cargo so we're not giving you two for free. Wedding rings are traditionally less valuable anyway.
 	crate_name = "wedding crate"
 
+/datum/supply_pack/costumes_toys/randomised/tcg
+	name = "Big-Ass Booster Pack Pack"
+	desc = "A bumper load of NT TCG Booster Packs of varying series. Collect them all!"
+	cost = 3000
+	contains = list()
+	crate_name = "booster pack pack"
+
+/datum/supply_pack/costumes_toys/randomised/tcg/generate()
+	. = ..()
+	var/cardpacktype
+	var/list/cardtypes = subtypesof(/obj/item/cardpack)
+	for(var/cardtype in cardtypes)
+		var/obj/item/cardpack/pack = new cardtype(.)
+		if(pack.illegal)
+			cardtypes.Remove(cardtype)
+		qdel(pack)
+	for(var/i in 1 to 10)
+		cardpacktype = pick(cardtypes)
+		new cardpacktype(.)