additional suggesteds

Author: jwhitak

__DEFINES/reagents.dm

@@ -621,6 +621,8 @@ var/list/cheartstopper = list(/*"potassium_chloride",*/ CHEESYGLOOP) //this stop
 #define COLDDRINKS list(ICECOFFEE, ICETEA, ICED_BEER, ARNOLDPALMER, TONIC, SODAWATER, ICE, COLA, NUKA_COLA, GEOMETER, SPACEMOUNTAINWIND, DR_GIBB, SPACE_UP, LEMON_LIME, LEMONADE, KIRASPECIAL, MILKSHAKE, BROWNSTAR, REWRITER, DIY_SODA)
 #define HOTDRINKS list(COFFEE, SOY_LATTE, TEA, GATORMIX, HOT_COCO, HOT_COCO_SUBHUMAN, CREAMY_HOT_COCO) //Blisterol not included as that's medicine, not a warm drink
 //HOT and COLD drinks defines used for the mint toxin/mint essence checks for tooth pain and shit, maybe you can find another use for it
+//Useful reagents for looting
+#define LOOT_REAGENTS list(BEER, WHISKEY, TEQUILA,VODKA, VERMOUTH, RUM, COGNAC, WINE, SAKE, TRIPLESEC, BITTERS, CINNAMONWHISKY, SCHNAPPS, BLUECURACAO, KAHLUA, ALE,	CHAMPAGNE, PWINE, WATER, GIN, SODAWATER, COLA, CREAM, TOMATOJUICE, ORANGEJUICE, LIMEJUICE, TONIC, SPACEMOUNTAINWIND, LEMON_LIME, DR_GIBB, TEA, GREENTEA, REDTEA, COFFEE, MILK, HOT_COCO, SOYMILK, SPORTDRINK, REFRIEDBEANS, BEFF, HORSEMEAT, CORNSYRUP, OFFCOLORCHEESE, BONEMARROW,	GREENRAMEN, DEEPFRIEDRAMEN, DISCOUNT, NUTRIMENT, SUGAR, CORNOIL, LIPOZINE, INAPROVALINE, ANTI_TOXIN, BLISTEROL, KELOTANE, DEXALIN, LEPORAZINE, COCAINE, HYPERZINE, OPIUM, SPACE_DRUGS, ZAMMILD, ZAMSPICES, BLOOD, PANCAKE, FLOUR, MANNITOL, TRICORDRAZINE, HONKSERUM, AMINOMICIN, AMINOBLATELLA, MUTAGEN, KARMOTRINE, OXYCODONE)
 
 #define INCENSE_HAREBELLS	"harebells"
 #define INCENSE_POPPIES		"poppies"

code/game/objects/items/weapons/storage/fancy.dm

@@ -888,7 +888,7 @@
 
 	foldable = /obj/item/stack/sheet/cardboard
 	starting_materials = list(MAT_CARDBOARD = 3750)
-	w_type = RECYK_PAPER
+	w_type = RECYK_CARDBOARD
 
 /obj/item/weapon/storage/fancy/battery_box/empty
 	empty = 1

code/modules/mining/abandonedcrates.dm

@@ -28,15 +28,15 @@ var/global/list/valid_abandoned_crate_types = typesof(/obj/structure/closet/crat
 
 /obj/structure/closet/crate/secure/loot/attack_hand(mob/user as mob)
 	if(locked)
-		if (src.allowed(usr))
+		if (src.allowed(user))
 			return ..()
-		if (usr.stat || usr.incapacitated())
+		if (user.stat || user.incapacitated())
 			return
 		to_chat(user, "<span class='notice'>The crate is locked with a Deca-code lock.</span>")
-		if (!usr.dexterity_check())
-			to_chat(usr, "<span class='warning'>You don't have the dexterity to enter a keycode!</span>")
+		if (!user.dexterity_check())
+			to_chat(user, "<span class='warning'>You don't have the dexterity to enter a keycode!</span>")
 			return
-		var/input = input(usr, "Enter digit from [min] to [max].", "Deca-Code Lock", "") as null|num
+		var/input = input(user, "Enter digit from [min] to [max].", "Deca-Code Lock", "") as null|num
 		if(in_range(src, user))
 			input = clamp(input, 0, 10)
 			if (input == code)

code/modules/reagents/machinery/chem_dispenser.dm

@@ -836,85 +836,7 @@ USE THIS CHEMISTRY DISPENSER FOR MAPS SO THEY START AT 100 ENERGY
 /obj/item/weapon/circuitboard/chem_dispenser/single/loot/New()
 	..()
 	if(!single_reagent)
-		single_reagent = determine_random_loot_reagent()
+		single_reagent = pick(LOOT_REAGENTS)
 	var/datum/reagent/temp = chemical_reagents_list[single_reagent]
 	desc = "A circuit board used to run a strange dispensing machine. A faded label says [temp ? temp.name : single_reagent]."
 
-//Helper proc to generate looty reagents.
-/proc/determine_random_loot_reagent()
-	return pick(list(
-	BEER,
-	WHISKEY,
-	TEQUILA,
-	VODKA,
-	VERMOUTH,
-	RUM,
-	COGNAC,
-	WINE,
-	SAKE,
-	TRIPLESEC,
-	BITTERS,
-	CINNAMONWHISKY,
-	SCHNAPPS,
-	BLUECURACAO,
-	KAHLUA,
-	ALE,
-	CHAMPAGNE,
-	PWINE,
-	WATER,
-	GIN,
-	SODAWATER,
-	COLA,
-	CREAM,
-	TOMATOJUICE,
-	ORANGEJUICE,
-	LIMEJUICE,
-	TONIC,
-	SPACEMOUNTAINWIND,
-	LEMON_LIME,
-	DR_GIBB,
-	TEA,
-	GREENTEA,
-	REDTEA,
-	COFFEE,
-	MILK,
-	HOT_COCO,
-	SOYMILK,
-	SPORTDRINK,
-	REFRIEDBEANS,
-	BEFF,
-	HORSEMEAT,
-	CORNSYRUP,
-	OFFCOLORCHEESE,
-	BONEMARROW,
-	GREENRAMEN,
-	DEEPFRIEDRAMEN,
-	DISCOUNT,
-	NUTRIMENT,
-	SUGAR,
-	CORNOIL,
-	LIPOZINE,
-	INAPROVALINE,
-	ANTI_TOXIN,
-	BLISTEROL,
-	KELOTANE,
-	DEXALIN,
-	LEPORAZINE,
-	COCAINE,
-	HYPERZINE,
-	OPIUM,
-	SPACE_DRUGS,
-	ZAMMILD,
-	ZAMSPICES,
-	BLOOD,
-	PANCAKE,
-	FLOUR,
-	MANNITOL,
-	TRICORDRAZINE,
-	HONKSERUM,
-	AMINOMICIN,
-	AMINOBLATELLA,
-	MUTAGEN,
-	KARMOTRINE,
-	OXYCODONE,
-	))