From af7fb6428eb0714e59e8937c811ea1f6c017ebca Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 13 Oct 2020 23:05:12 +0200 Subject: [PATCH] [MIRROR] Fixes slices on pizza and resizes some foods (#1291) * Fixes slices on pizza and resizes some foods (#54353) fix: you can no longer cut pizza into bugged slices fix: some small foods are actually small again * Fixes slices on pizza and resizes some foods Co-authored-by: Qustinnus --- code/game/objects/items/food/egg.dm | 2 ++ code/game/objects/items/food/frozen.dm | 6 +++++ code/game/objects/items/food/pizza.dm | 37 ++++++++------------------ code/game/objects/items/food/snacks.dm | 11 ++++++++ 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/code/game/objects/items/food/egg.dm b/code/game/objects/items/food/egg.dm index ba14a53705e..27b88f7da93 100644 --- a/code/game/objects/items/food/egg.dm +++ b/code/game/objects/items/food/egg.dm @@ -8,6 +8,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("chocolate" = 4, "sweetness" = 1) foodtypes = JUNKFOOD | SUGAR + w_class = WEIGHT_CLASS_TINY /obj/item/food/egg name = "egg" @@ -16,6 +17,7 @@ food_reagents = list(/datum/reagent/consumable/eggyolk = 4) microwaved_type = /obj/item/food/boiledegg foodtypes = MEAT + w_class = WEIGHT_CLASS_TINY var/static/chick_count = 0 //I copied this from the chicken_count (note the "en" in there) variable from chicken code. /obj/item/food/egg/gland diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm index 54c5c7abfb4..ca7405cb177 100644 --- a/code/game/objects/items/food/frozen.dm +++ b/code/game/objects/items/food/frozen.dm @@ -3,6 +3,7 @@ desc = "Portable Ice-cream in its own packaging." icon = 'icons/obj/food/frozen_treats.dmi' icon_state = "icecreamsandwich" + w_class = WEIGHT_CLASS_TINY food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/ice = 4) tastes = list("ice cream" = 1) foodtypes = GRAIN | DAIRY | SUGAR @@ -12,6 +13,7 @@ desc = "Portable ice-cream in its own packaging of the strawberry variety." icon = 'icons/obj/food/frozen_treats.dmi' icon_state = "strawberryicecreamsandwich" + w_class = WEIGHT_CLASS_TINY food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/ice = 4) tastes = list("ice cream" = 2, "berry" = 2) foodtypes = FRUIT | DAIRY | SUGAR @@ -22,6 +24,7 @@ desc = "The best icecream in space." icon = 'icons/obj/food/frozen_treats.dmi' icon_state = "spacefreezy" + w_class = WEIGHT_CLASS_TINY food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/bluecherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 5) tastes = list("blue cherries" = 2, "ice cream" = 2) foodtypes = FRUIT | DAIRY | SUGAR @@ -31,6 +34,7 @@ desc = "A classic dessert." icon = 'icons/obj/food/frozen_treats.dmi' icon_state = "sundae" + w_class = WEIGHT_CLASS_SMALL food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("ice cream" = 1, "banana" = 1) foodtypes = FRUIT | DAIRY | SUGAR @@ -40,6 +44,7 @@ desc = "The clown's favorite dessert." icon = 'icons/obj/food/frozen_treats.dmi' icon_state = "honkdae" + w_class = WEIGHT_CLASS_SMALL food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 10, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) foodtypes = FRUIT | DAIRY | SUGAR @@ -53,6 +58,7 @@ desc = "It's just shaved ice. Still fun to chew on." icon = 'icons/obj/food/frozen_treats.dmi' icon_state = "flavorless_sc" + w_class = WEIGHT_CLASS_SMALL trash_type = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups food_reagents = list(/datum/reagent/water = 11) // We dont get food for water/juices tastes = list("ice" = 1, "water" = 1) diff --git a/code/game/objects/items/food/pizza.dm b/code/game/objects/items/food/pizza.dm index 4557baef8db..a30f2f4679f 100644 --- a/code/game/objects/items/food/pizza.dm +++ b/code/game/objects/items/food/pizza.dm @@ -9,18 +9,13 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) foodtypes = GRAIN | DAIRY | VEGETABLES -/obj/item/food/pizza/Initialize() - . = ..() - AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pizzaslice, 6, 30) - /obj/item/food/pizzaslice icon = 'icons/obj/food/pizzaspaghetti.dmi' food_reagents = list(/datum/reagent/consumable/nutriment = 5) foodtypes = GRAIN | DAIRY | VEGETABLES w_class = WEIGHT_CLASS_SMALL -/obj/item/food/pizzaslice/Initialize() - . = ..() +/obj/item/food/pizzaslice/MakeProcessable() AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/stack/sheet/pizza, 1, 10) /obj/item/food/pizza/margherita @@ -32,8 +27,7 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) foodtypes = GRAIN | VEGETABLES | DAIRY -/obj/item/food/pizza/margherita/Initialize() - . = ..() +/obj/item/food/pizza/margherita/MakeProcessable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pizzaslice/margherita, 6, 30) /obj/item/food/pizza/margherita/robo @@ -53,8 +47,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 8) foodtypes = GRAIN | VEGETABLES| DAIRY | MEAT -/obj/item/food/pizza/meat/Initialize() - . = ..() +/obj/item/food/pizza/meat/MakeProcessable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pizzaslice/meat, 6, 30) /obj/item/food/pizzaslice/meat @@ -72,8 +65,7 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1) foodtypes = GRAIN | VEGETABLES | DAIRY -/obj/item/food/pizza/mushroom/Initialize() - . = ..() +/obj/item/food/pizza/mushroom/MakeProcessable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pizzaslice/mushroom, 6, 30) /obj/item/food/pizzaslice/mushroom @@ -91,8 +83,7 @@ tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1) foodtypes = GRAIN | VEGETABLES | DAIRY -/obj/item/food/pizza/vegetable/Initialize() - . = ..() +/obj/item/food/pizza/vegetable/MakeProcessable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pizzaslice/vegetable, 6, 30) /obj/item/food/pizzaslice/vegetable @@ -110,8 +101,7 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD -/obj/item/food/pizza/donkpocket/Initialize() - . = ..() +/obj/item/food/pizza/donkpocket/MakeProcessable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pizzaslice/donkpocket, 6, 30) /obj/item/food/pizzaslice/donkpocket @@ -129,8 +119,7 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) foodtypes = GRAIN | VEGETABLES | DAIRY -/obj/item/food/pizza/dank/Initialize() - . = ..() +/obj/item/food/pizza/dank/MakeProcessable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pizzaslice/dank, 6, 30) /obj/item/food/pizzaslice/dank @@ -148,8 +137,7 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) foodtypes = GRAIN | VEGETABLES | DAIRY -/obj/item/food/pizza/sassysage/Initialize() - . = ..() +/obj/item/food/pizza/sassysage/MakeProcessable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pizzaslice/sassysage, 6, 30) /obj/item/food/pizzaslice/sassysage @@ -167,8 +155,7 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2) foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE -/obj/item/food/pizza/pineapple/Initialize() - . = ..() +/obj/item/food/pizza/pineapple/MakeProcessable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pizzaslice/pineapple, 6, 30) /obj/item/food/pizzaslice/pineapple @@ -185,8 +172,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/nutriment/protein = 9, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2) -/obj/item/food/pizza/arnold/Initialize() - . = ..() +/obj/item/food/pizza/arnold/MakeProcessable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pizzaslice/arnold, 6, 30) //fuck it, i will leave this at the food level for now. @@ -242,6 +228,5 @@ tastes = list("stale crust" = 1, "rancid cheese" = 2, "mushroom" = 1) foodtypes = GRAIN | VEGETABLES | DAIRY | GROSS -/obj/item/food/pizzaslice/moldy/Initialize() - . = ..() +/obj/item/food/pizzaslice/moldy/MakeProcessable() AddElement(/datum/element/swabable, CELL_LINE_TABLE_MOLD, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 25) diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm index 4ad5f6482ed..237430fbc3e 100644 --- a/code/game/objects/items/food/snacks.dm +++ b/code/game/objects/items/food/snacks.dm @@ -11,6 +11,7 @@ junkiness = 25 tastes = list("candy" = 1) foodtypes = JUNKFOOD | SUGAR + w_class = WEIGHT_CLASS_TINY /obj/item/food/candy/bronx name = "South Bronx Paradise bar" @@ -24,6 +25,7 @@ tastes = list("candy" = 5, "weight loss" = 4, "insect larva" = 1) foodtypes = JUNKFOOD | RAW | GROSS custom_price = 800 + w_class = WEIGHT_CLASS_TINY var/revelation = FALSE /obj/item/food/candy/bronx/MakeEdible() @@ -62,6 +64,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/salt = 2) junkiness = 25 tastes = list("dried meat" = 1) + w_class = WEIGHT_CLASS_SMALL foodtypes = JUNKFOOD | MEAT | SUGAR /obj/item/food/sosjerky/healthy @@ -80,6 +83,7 @@ junkiness = 20 tastes = list("salt" = 1, "crisps" = 1) foodtypes = JUNKFOOD | FRIED + w_class = WEIGHT_CLASS_SMALL /obj/item/food/no_raisin name = "4no raisins" @@ -91,6 +95,7 @@ tastes = list("dried raisins" = 1) foodtypes = JUNKFOOD | FRUIT | SUGAR custom_price = 90 + w_class = WEIGHT_CLASS_SMALL /obj/item/food/no_raisin/healthy name = "homemade raisins" @@ -98,6 +103,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) junkiness = 0 foodtypes = FRUIT + w_class = WEIGHT_CLASS_SMALL /obj/item/food/spacetwinkie name = "space twinkie" @@ -107,6 +113,7 @@ junkiness = 25 foodtypes = JUNKFOOD | GRAIN | SUGAR custom_price = 30 + w_class = WEIGHT_CLASS_SMALL /obj/item/food/candy_trash name = "candy cigarette butt" @@ -116,6 +123,7 @@ food_reagents = list(/datum/reagent/consumable/sugar = 4, /datum/reagent/ash = 3) junkiness = 10 //powergame trash food by buying candy cigs in bulk and eating them when they extinguish foodtypes = JUNKFOOD | SUGAR + w_class = WEIGHT_CLASS_TINY /obj/item/food/candy_trash/nicotine desc = "The leftover from a smoked-out candy cigarette. Smells like nicotine..?" @@ -131,6 +139,7 @@ tastes = list("cheese" = 5, "crisps" = 2) foodtypes = JUNKFOOD | DAIRY | SUGAR custom_price = 45 + w_class = WEIGHT_CLASS_SMALL /obj/item/food/syndicake name = "syndi-cakes" @@ -140,6 +149,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/doctor_delight = 5) tastes = list("sweetness" = 3, "cake" = 1) foodtypes = GRAIN | FRUIT | VEGETABLES + w_class = WEIGHT_CLASS_SMALL /obj/item/food/energybar name = "High-power energy bars" @@ -149,3 +159,4 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 3) tastes = list("pure electricity" = 3, "fitness" = 2) foodtypes = TOXIC + w_class = WEIGHT_CLASS_SMALL