From 9467621800b01faead8d7315d94b18a938788955 Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Sat, 31 Aug 2019 00:35:19 -0400
Subject: [PATCH] Fixes some errors

---
 code/game/objects/random/misc.dm    |  3 ++-
 code/modules/food/food/snacks.dm    |  6 +++---
 code/modules/food/food/snacks_vr.dm | 16 ----------------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 1e1fed268b5..f9180c99f1d 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -548,6 +548,7 @@
 	desc = "This is a random single MRE."
 	icon = 'icons/obj/food.dmi'
 	icon_state = "mre"
+	drop_get_turf = FALSE
 
 /obj/random/mre/item_to_spawn()
 	return pick(/obj/item/weapon/storage/mre,
@@ -584,7 +585,7 @@
 	icon_state = "pouch"
 	drop_get_turf = FALSE
 
-/obj/random/mre/main/item_to_spawn()
+/obj/random/mre/side/item_to_spawn()
 	return pick(/obj/item/weapon/reagent_containers/food/snacks/tossedsalad,
 				/obj/item/weapon/reagent_containers/food/snacks/boiledrice,
 				/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 848ecc2742c..0906bf0c50c 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -3754,12 +3754,12 @@
 	desc = "Fried, salted lean meat compressed into a cube. Not very appetizing."
 	icon_state = "meatcube"
 	filling_color = "#7a3d11"
-	center_of_mass = "x=16;y=16"
-	bitesize = 3
+	center_of_mass = list("x"=16, "y"=16)
 
 /obj/item/weapon/reagent_containers/food/snacks/meatcube/Initialize()
 	. = ..()
-	reagents.add_reagent(/datum/reagent/nutriment/protein, 15)
+	reagents.add_reagent("protein", 15)
+	bitesize = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/tastybread
 	name = "bread tube"
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index 8106c52dfd3..a283a6bafe5 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -607,19 +607,3 @@
 
 /obj/item/pizzabox/meat/Initialize()
 	pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatcargo(src)
-
-/obj/item/weapon/reagent_containers/food/snacks/liquidprotein
-	name = "\improper LiquidProtein Ration"
-	desc = "A variant of the liquidfood ration, designed for obligate carnivore species. Only barely more appealing than regular liquidfood. Should this be crunchy?"
-	icon = 'icons/obj/food_vr.dmi'
-	icon_state = "liquidprotein"
-	trash = /obj/item/trash/liquidprotein
-	filling_color = "#A8A8A8"
-	survivalfood = TRUE
-	center_of_mass = list("x"=16, "y"=15)
-
-/obj/item/weapon/reagent_containers/food/snacks/liquidprotein/Initialize()
-	..()
-	reagents.add_reagent("protein", 20)
-	reagents.add_reagent("iron", 3)
-	bitesize = 4