From 362f0e57a4c743e4c7c75f7226b134ed2a53a4ec Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Tue, 28 Jan 2020 03:24:39 +0100
Subject: [PATCH] Giving a hand.

---
 code/modules/cargo/packs/organic.dm | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm
index cbab3c0537..4aa991fc3f 100644
--- a/code/modules/cargo/packs/organic.dm
+++ b/code/modules/cargo/packs/organic.dm
@@ -10,6 +10,14 @@
 	group = "Food & Hydroponics"
 	crate_type = /obj/structure/closet/crate/freezer
 
+/datum/supply_pack/organic/randomized
+	var/num_contained = 15
+
+/datum/supply_pack/organic/randomized/fill(obj/structure/closet/crate/C)
+	for(var/i in 1 to num_contained)
+		var/item = pick(contains)
+		new item(C)
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////// Meals ///////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -31,11 +39,11 @@
 	crate_name = "combo meal w/toy"
 	crate_type = /obj/structure/closet/crate/wooden
 
-/datum/supply_pack/organic/candy/randomised
+/datum/supply_pack/organic/randomized/candy
 	name = "Candy Crate"
 	desc = "For people that have an insatiable sweet tooth! Has ten candies to be eaten up.."
 	cost = 2500
-	var/num_contained = 10 //number of items picked to be contained in a randomised crate
+	num_contained = 10
 	contains = list(/obj/item/reagent_containers/food/snacks/candy,
 					/obj/item/reagent_containers/food/snacks/lollipop,
 					/obj/item/reagent_containers/food/snacks/gumball,
@@ -64,12 +72,6 @@
 					/obj/item/storage/fancy/donut_box)
 	crate_name = "candy crate"
 
-/datum/supply_pack/organic/candy/randomised/fill(obj/structure/closet/crate/C)
-	var/list/L = contains.Copy()
-	for(var/i in 1 to num_contained)
-		var/item = pick_n_take(L)
-		new item(C)
-
 /datum/supply_pack/organic/fiestatortilla
 	name = "Fiesta Crate"
 	desc = "Spice up the kitchen with this fiesta themed food order! Contains 8 tortilla based food items, as well as a sombrero, moustache, and cloak!"
@@ -152,7 +154,7 @@
 					/obj/item/reagent_containers/food/snacks/grown/banana)
 	crate_name = "food crate"
 
-/datum/supply_pack/organic/randomized/chef/fruits
+/datum/supply_pack/organic/randomized/fruits
 	name = "Fruit Crate"
 	desc = "Rich in vitamins and possibly sugar. Contains 15 assorted fruits."
 	cost = 1500
@@ -182,7 +184,7 @@
 	access = ACCESS_THEATRE
 	crate_type = /obj/structure/closet/crate/secure
 
-/datum/supply_pack/organic/randomized/chef/
+/datum/supply_pack/organic/randomized
 	name = "Meat Crate (Exotic)"
 	desc = "The best cuts in the whole galaxy. Contains 15 assorted exotic meats."
 	cost = 2000
@@ -243,7 +245,7 @@
 	crate_name = "wildcard food crate"
 	crate_type = /obj/structure/closet/crate/freezer
 
-/datum/supply_pack/organic/randomized/chef/vegetables
+/datum/supply_pack/organic/randomized/vegetables
 	name = "Vegetable Crate"
 	desc = "Grown in vats. Contains 15 assorted vegetables."
 	cost = 1300
@@ -257,11 +259,6 @@
 					/obj/item/reagent_containers/food/snacks/grown/pumpkin)
 	crate_name = "veggie crate"
 
-/datum/supply_pack/organic/randomized/chef/fill(obj/structure/closet/crate/C)
-	for(var/i in 1 to 15)
-		var/item = pick(contains)
-		new item(C)
-
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Hydroponics /////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////