From f97a4b3a785951213e714939b5b22bc36287dba5 Mon Sep 17 00:00:00 2001
From: Ghommie <Ghombeat@Gmail.com>
Date: Sat, 22 Jun 2019 19:50:56 +0200
Subject: [PATCH] changes.

---
 .../game/objects/effects/spawners/lootdrop.dm | 15 ++++++++++
 code/game/objects/items/storage/boxes.dm      | 28 -------------------
 code/modules/food_and_drinks/drinks/drinks.dm |  8 ++++++
 .../food_and_drinks/food/snacks_pizza.dm      |  9 ++++++
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 4a77274d23..8cfe84f644 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -214,6 +214,21 @@
 				/obj/item/aiModule/core/full/damaged
 				)
 
+/obj/effect/spawner/lootdrop/mre
+	name = "random MRE"
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "mre"
+
+/obj/effect/spawner/lootdrop/mre/Initialize()
+	for(var/A in subtypesof(/obj/item/storage/box/mre))
+		var/obj/item/storage/box/mre/M = A
+		var/our_chance = initial(M.spawner_chance)
+		if(our_chance)
+			loot += M
+			loot[M] = our_chance
+	return ..()
+
+
 // Tech storage circuit board spawners
 // For these, make sure that lootcount equals the number of list items
 
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 988e6792ff..4ff63ceeac 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -1196,31 +1196,3 @@
 	new /obj/item/reagent_containers/food/snacks/grown/chili(src)
 	new /obj/item/reagent_containers/food/drinks/coffee/type2(src)
 	new /obj/item/tank/internals/emergency_oxygen(src)
-
-/obj/item/reagent_containers/food/drinks/coffee/type2
-	name = "\improper Coffee, instant (type 2)"
-	desc = "Coffee that's been blow dried into a granulated powder. This packet includes self heating water for your nutritional pleasure."
-	icon = 'icons/obj/food/containers.dmi'
-	icon_state = "condi_cornoil"
-
-/obj/item/reagent_containers/food/snacks/pizzaslice/pepperoni
-	name = "\improper MRE pepperoni pizza slice"
-	desc = "A freeze dried, dehydrated slice of bread with tomato sauce, pepperoni and cheese."
-	icon_state = "meatpizzaslice"
-	filling_color = "#A52A2A"
-	tastes = list("cardboard" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2)
-	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT
-
-/obj/effect/spawner/lootdrop/mre
-	name = "random MRE"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "mre"
-
-/obj/effect/spawner/lootdrop/mre/Initialize()
-	for(var/A in subtypesof(/obj/item/storage/box/mre))
-		var/obj/item/storage/box/mre/M = A
-		var/our_chance = initial(M.spawner_chance)
-		if(our_chance)
-			loot += M
-			loot[M] = our_chance
-	return ..()
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index a6b7de0330..64edd69e17 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -204,6 +204,14 @@
 	resistance_flags = FREEZE_PROOF
 	isGlass = FALSE
 
+//Used by MREs
+/obj/item/reagent_containers/food/drinks/coffee/type2
+	name = "\improper Coffee, instant (type 2)"
+	desc = "Coffee that's been blow dried into a granulated powder. This packet includes self heating water for your nutritional pleasure."
+	icon = 'icons/obj/food/containers.dmi'
+	icon_state = "condi_cornoil"
+
+
 /obj/item/reagent_containers/food/drinks/ice
 	name = "ice cup"
 	desc = "Careful, cold ice, do not chew."
diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm
index 403636db08..74fd7dda65 100644
--- a/code/modules/food_and_drinks/food/snacks_pizza.dm
+++ b/code/modules/food_and_drinks/food/snacks_pizza.dm
@@ -225,3 +225,12 @@
 	filling_color = "#FFFFFF"
 	foodtype = GRAIN | VEGETABLES
 
+
+// Used by MREs
+/obj/item/reagent_containers/food/snacks/pizzaslice/pepperoni
+	name = "\improper MRE pepperoni pizza slice"
+	desc = "A freeze dried, dehydrated slice of bread with tomato sauce, pepperoni and cheese."
+	icon_state = "meatpizzaslice"
+	filling_color = "#A52A2A"
+	tastes = list("cardboard" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2)
+	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT
\ No newline at end of file