Newfood Atomization: Canned (Beans included) (BeeStation#10263)

* packaged

* oops

* updatepaths

beestation.dme

@@ -1413,6 +1413,7 @@
 #include "code\game\objects\items\food\donuts.dm"
 #include "code\game\objects\items\food\dough.dm"
 #include "code\game\objects\items\food\mexican.dm"
+#include "code\game\objects\items\food\packaged.dm"
 #include "code\game\objects\items\food\pancakes.dm"
 #include "code\game\objects\items\food\pastries.dm"
 #include "code\game\objects\items\food\pie.dm"

code/_globalvars/lists/maintenance_loot.dm

@@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/radio/headset = 1,
 	/obj/item/radio/off = 2,
 	/obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1,
-	/obj/item/reagent_containers/food/snacks/canned/peaches/maint = 1,
+	/obj/item/food/canned/peaches/maint = 1,
 	/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
 	/obj/item/reagent_containers/food/snacks/grown/flower/poppy = 10,
 	/obj/item/reagent_containers/glass/rag = 3,

code/game/objects/items/food/packaged.dm

@@ -0,0 +1,74 @@
+// Pre-packaged meals, canned, wrapped, and vended
+
+// Cans
+/obj/item/food/canned
+	name = "Canned Air"
+	desc = "If you ever wondered where air came from..."
+	food_reagents = list(
+		/datum/reagent/oxygen = 6,
+		/datum/reagent/nitrogen = 24,
+	)
+	icon = 'icons/obj/food/canned.dmi'
+	icon_state = "peachcan"
+	food_flags = FOOD_IN_CONTAINER
+	w_class = WEIGHT_CLASS_NORMAL
+	max_volume = 30
+
+/obj/item/food/canned/proc/open_can(mob/user)
+	to_chat(user, "You pull back the tab of \the [src].")
+	playsound(user.loc, 'sound/items/foodcanopen.ogg', 50)
+	ENABLE_BITFIELD(reagents.flags, OPENCONTAINER)
+
+/obj/item/food/canned/attack_self(mob/user)
+	if(!is_drainable())
+		open_can(user)
+		icon_state = "[icon_state]_open"
+	return ..()
+
+/obj/item/food/canned/attack(mob/living/M, mob/user, def_zone)
+	if (!is_drainable())
+		to_chat(user, "<span class='warning'>[src]'s lid hasn't been opened!</span>")
+		return 0
+	return ..()
+
+/obj/item/food/canned/beans
+	name = "tin of beans"
+	desc = "Musical fruit in a slightly less musical container."
+	icon_state = "beans"
+	trash_type = /obj/item/trash/can/food/beans
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment/protein = 9,
+		/datum/reagent/consumable/ketchup = 4
+	)
+	tastes = list("beans" = 1)
+	foodtypes = VEGETABLES
+
+/obj/item/food/canned/peaches
+	name = "canned peaches"
+	desc = "Just a nice can of ripe peaches swimming in their own juices."
+	icon_state = "peachcan"
+	trash_type = /obj/item/trash/can/food/peaches
+	food_reagents = list(
+		/datum/reagent/consumable/peachjuice = 20,
+		/datum/reagent/consumable/sugar = 8,
+		/datum/reagent/consumable/nutriment = 2,
+	)
+	tastes = list("peaches" = 7, "tin" = 1)
+	foodtypes = FRUIT | SUGAR
+
+/obj/item/food/canned/peaches/maint
+	name = "Maintenance Peaches"
+	desc = "I have a mouth and I must eat."
+	icon_state = "peachcanmaint"
+	trash_type = /obj/item/trash/can/food/peaches/maint
+	tastes = list("peaches" = 1, "tin" = 7)
+
+/obj/item/food/canned/beefbroth
+	name = "canned beef broth"
+	desc = "Why does this exist?"
+	icon_state = "beefcan"
+	trash_type = /obj/item/trash/can/food/beefbroth
+	food_reagents = list(/datum/reagent/consumable/beefbroth = 50)
+	tastes = list("disgust" = 7, "tin" = 1)
+	foodtypes = MEAT | GROSS | JUNKFOOD

code/modules/cargo/packs.dm

@@ -2523,16 +2523,16 @@
 	max_supply = 3
 	contraband = TRUE
 	crate_type = /obj/structure/closet/crate
-	contains = list(/obj/item/reagent_containers/food/snacks/canned/beefbroth,
-					/obj/item/reagent_containers/food/snacks/canned/beefbroth,
-					/obj/item/reagent_containers/food/snacks/canned/beefbroth,
-					/obj/item/reagent_containers/food/snacks/canned/beefbroth,
-					/obj/item/reagent_containers/food/snacks/canned/beefbroth,
-					/obj/item/reagent_containers/food/snacks/canned/beefbroth,
-					/obj/item/reagent_containers/food/snacks/canned/beefbroth,
-					/obj/item/reagent_containers/food/snacks/canned/beefbroth,
-					/obj/item/reagent_containers/food/snacks/canned/beefbroth,
-					/obj/item/reagent_containers/food/snacks/canned/beefbroth
+	contains = list(/obj/item/food/canned/beefbroth,
+					/obj/item/food/canned/beefbroth,
+					/obj/item/food/canned/beefbroth,
+					/obj/item/food/canned/beefbroth,
+					/obj/item/food/canned/beefbroth,
+					/obj/item/food/canned/beefbroth,
+					/obj/item/food/canned/beefbroth,
+					/obj/item/food/canned/beefbroth,
+					/obj/item/food/canned/beefbroth,
+					/obj/item/food/canned/beefbroth
 					)
 	crate_name = "Beef Broth Care"
 //////////////////////////////////////////////////////////////////////////////

code/modules/food_and_drinks/food/snacks_other.dm

@@ -575,63 +575,6 @@
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
 
-/obj/item/reagent_containers/food/snacks/canned
-	name = "Canned Air"
-	desc = "If you ever wondered where air came from..."
-	list_reagents = list(/datum/reagent/oxygen = 6, /datum/reagent/nitrogen = 24)
-	icon_state = "peachcan"
-	in_container = TRUE
-	reagent_flags = NONE
-	spillable = FALSE
-	w_class = WEIGHT_CLASS_NORMAL
-	volume = 30
-
-/obj/item/reagent_containers/food/snacks/canned/proc/open_can(mob/user)
-	to_chat(user, "You pull back the tab of \the [src].")
-	playsound(user.loc, 'sound/items/foodcanopen.ogg', 50)
-	ENABLE_BITFIELD(reagents.flags, OPENCONTAINER)
-	spillable = TRUE
-
-/obj/item/reagent_containers/food/snacks/canned/attack_self(mob/user)
-	if(!is_drainable())
-		open_can(user)
-		icon_state = "[icon_state]_open"
-	return ..()
-
-/obj/item/reagent_containers/food/snacks/canned/attack(mob/living/M, mob/user, def_zone)
-	if (!is_drainable())
-		to_chat(user, "<span class='warning'>[src]'s lid hasn't been opened!</span>")
-		return 0
-	return ..()
-
-/obj/item/reagent_containers/food/snacks/canned/beans
-	name = "tin of beans"
-	desc = "Musical fruit in a slightly less musical container."
-	icon_state = "beans"
-	trash = /obj/item/trash/can/food/beans
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 10)
-	filling_color = "#B22222"
-	tastes = list("beans" = 1)
-	foodtype = VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/canned/peaches
-	name = "canned peaches"
-	desc = "Just a nice can of ripe peaches swimming in their own juices."
-	icon_state = "peachcan"
-	trash = /obj/item/trash/can/food/peaches
-	list_reagents = list(/datum/reagent/consumable/peachjuice = 20, /datum/reagent/consumable/sugar = 8, /datum/reagent/consumable/nutriment = 2)
-	filling_color = "#ffdf26"
-	tastes = list("peaches" = 7, "tin" = 1)
-	foodtype = FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/canned/peaches/maint
-	name = "Maintenance Peaches"
-	desc = "I have a mouth and I must eat."
-	icon_state = "peachcanmaint"
-	trash = /obj/item/trash/can/food/peaches/maint
-	tastes = list("peaches" = 1, "tin" = 7)
-
 /obj/item/reagent_containers/food/snacks/crab_rangoon
 	name = "Crab Rangoon"
 	desc = "Has many names, like crab puffs, cheese wontons, crab dumplings? Whatever you call them, they're a fabulous blast of cream cheesy crab."
@@ -654,16 +597,6 @@
 	tastes = list("fried corn" = 1)
 	foodtype = JUNKFOOD | FRIED
 
-/obj/item/reagent_containers/food/snacks/canned/beefbroth
-	name = "canned beef broth"
-	desc = "Why does this exist?"
-	icon_state = "beefcan"
-	trash = /obj/item/trash/can/food/beefbroth
-	list_reagents = list(/datum/reagent/consumable/beefbroth = 50)
-	filling_color = "#100800"
-	tastes = list("disgust" = 7, "tin" = 1)
-	foodtype = MEAT | GROSS | JUNKFOOD
-
 /obj/item/reagent_containers/food/snacks/pingles
 	name = "pingles"
 	desc = "A perfect blend of sour cream and onion on a potato chip. May cause space lag."

code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

@@ -74,7 +74,7 @@
 	reqs = list(/datum/reagent/consumable/ketchup = 5,
 		/obj/item/reagent_containers/food/snacks/grown/soybeans = 2
 	)
-	result = /obj/item/reagent_containers/food/snacks/canned/beans
+	result = /obj/item/food/canned/beans
 	subcategory = CAT_MISCFOOD
 
 /datum/crafting_recipe/food/eggplantparm

code/modules/vending/mining.dm

@@ -7,7 +7,7 @@
 	light_color = LIGHT_COLOR_BLUEGREEN
 	products = list(/obj/item/food/donkpocket/warm = 8,
 					/obj/item/food/salad/herbsalad = 6,
-					/obj/item/reagent_containers/food/snacks/canned/beans = 4,
+					/obj/item/food/canned/beans = 4,
 					/obj/item/reagent_containers/glass/waterbottle/large = 10)
 	contraband = list(/obj/item/reagent_containers/food/drinks/coffee = 10,
 					  /obj/item/reagent_containers/food/snacks/chips = 6,

tools/UpdatePaths/Scripts/10263_NEWFOODpackaged.txt

@@ -0,0 +1 @@
+/obj/item/food/canned : /obj/item/reagent_containers/food/snacks/canned{@OLD}