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

2021-02-21 09:55:36 +08:00
parent 6abad913ff bcffa931b9
commit 0bb5ec3316
27 changed files with 277 additions and 104 deletions
@@ -343,7 +343,6 @@

 /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(.)
@@ -351,5 +350,5 @@
 			cardtypes.Remove(cardtype)
 		qdel(pack)
 	for(var/i in 1 to 10)
-		cardpacktype = pick(cardtypes)
+		var/cardpacktype = pick(cardtypes)
 		new cardpacktype(.)