diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 446a99dd31..b0396b566a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -928,9 +928,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/seeds/cabbage = 3, /obj/item/seeds/carrot = 3, /obj/item/seeds/cherry = 3, /obj/item/seeds/chanter = 3, /obj/item/seeds/chili = 3, /obj/item/seeds/cocoapod = 3, /obj/item/seeds/coffee = 3, /obj/item/seeds/corn = 3, /obj/item/seeds/eggplant = 3, /obj/item/seeds/grape = 3, /obj/item/seeds/grass = 3, /obj/item/seeds/lemon = 3, - /obj/item/seeds/lime = 3, /obj/item/seeds/onion = 3, /obj/item/seeds/orange = 3, /obj/item/seeds/potato = 3, /obj/item/seeds/poppy = 3, - /obj/item/seeds/pumpkin = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/wheat/rice = 3, /obj/item/seeds/soya = 3, /obj/item/seeds/sunflower = 3, - /obj/item/seeds/tea = 3, /obj/item/seeds/tobacco = 3, /obj/item/seeds/tomato = 3, + /obj/item/seeds/lime = 3, /obj/item/seeds/onion = 3, /obj/item/seeds/orange = 3, /obj/item/seeds/pineapple = 3, /obj/item/seeds/potato = 3, + /obj/item/seeds/poppy = 3,/obj/item/seeds/pumpkin = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/wheat/rice = 3, /obj/item/seeds/soya = 3, + /obj/item/seeds/sunflower = 3, /obj/item/seeds/tea = 3, /obj/item/seeds/tobacco = 3, /obj/item/seeds/tomato = 3, /obj/item/seeds/tower = 3, /obj/item/seeds/watermelon = 3, /obj/item/seeds/wheat = 3, /obj/item/seeds/whitebeet = 3) contraband = list(/obj/item/seeds/amanita = 2, /obj/item/seeds/glowshroom = 2, /obj/item/seeds/liberty = 2, /obj/item/seeds/nettle = 2, /obj/item/seeds/plump = 2, /obj/item/seeds/reishi = 2, /obj/item/seeds/cannabis = 3, /obj/item/seeds/starthistle = 2, diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 0d4471fd43..2cc619d284 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -864,7 +864,7 @@ /datum/supply_pack/science group = "Science" crate_type = /obj/structure/closet/crate/science - + /datum/supply_pack/science/bz name = "BZ canister" cost = 4000 @@ -988,9 +988,10 @@ contains = list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, - /obj/item/pizzabox/vegetable) + /obj/item/pizzabox/vegetable, + /obj/item/pizzabox/pineapple) crate_name = "pizza crate" - + /datum/supply_pack/organic/cream_piee name = "High-yield Clown-grade Cream Pie Crate" cost = 6000 diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 9398ec2bfe..a674a20c96 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -552,3 +552,11 @@ gender = PLURAL tastes = list("batter" = 3, "onion" = 1) foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/pineappleslice + name = "pineapple slice" + desc = "A sliced piece of juicy pineapple." + icon_state = "pineapple_slice" + filling_color = "#F6CB0B" + tastes = list("pineapple" = 1) + foodtype = FRUIT diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index f12e6a8869..058dfe2086 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -139,6 +139,23 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1) foodtype = GRAIN | VEGETABLES | DAIRY +/obj/item/reagent_containers/food/snacks/pizza/pineapple + name = "\improper Hawaiian pizza" + desc = "The pizza equivalent of Einstein's riddle." + icon_state = "pineapplepizza" + slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple + bonus_reagents = list("nutriment" = 6, "vitamin" = 6) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapples" = 2, "ham" = 2) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT + +/obj/item/reagent_containers/food/snacks/pizzaslice/pineapple + name = "\improper Hawaiian pizza slice" + desc = "A slice of delicious controversy." + icon_state = "pineapplepizzaslice" + filling_color = "#FF4500" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapples" = 2, "ham" = 2) + foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT + /obj/item/reagent_containers/food/snacks/pizzaslice/custom name = "pizza slice" icon_state = "pizzamargheritaslice" diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index b1c1a8495c..0ae07a6d3b 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -31,7 +31,7 @@ /obj/item/pizzabox/Initialize() . = ..() update_icon() - + /obj/item/pizzabox/Destroy() unprocess() @@ -276,7 +276,6 @@ pizza = new /obj/item/reagent_containers/food/snacks/pizza/vegetable(src) boxtag = "Gourmet Vegatable" - /obj/item/pizzabox/mushroom/Initialize() . = ..() pizza = new /obj/item/reagent_containers/food/snacks/pizza/mushroom(src) @@ -286,3 +285,8 @@ . = ..() pizza = new /obj/item/reagent_containers/food/snacks/pizza/meat(src) boxtag = "Meatlover's Supreme" + +/obj/item/pizzabox/pineapple/Initialize() + . = ..() + pizza = new /obj/item/reagent_containers/food/snacks/pizza/pineapple(src) + boxtag = "Honolulu Chew" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm index 08df285374..27654a0702 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm @@ -77,3 +77,15 @@ ) result = /obj/item/reagent_containers/food/snacks/pizza/sassysage subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/pineapplepizza + name = "Hawaiian pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /obj/item/reagent_containers/food/snacks/pineappleslice = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/pineapple + subcategory = CAT_PIZZA diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm new file mode 100644 index 0000000000..443190942a --- /dev/null +++ b/code/modules/hydroponics/grown/pineapple.dm @@ -0,0 +1,33 @@ +// Pineapple! +/obj/item/seeds/pineapple + name = "pack of pineapple seeds" + desc = "Oooooooooooooh!" + icon_state = "seed-pineapple" + species = "pineapple" + plantname = "Pineapple Plant" + product = /obj/item/reagent_containers/food/snacks/grown/pineapple + lifespan = 40 + endurance = 30 + growthstages = 3 + growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' + genes = list(/datum/plant_gene/trait/repeated_harvest) + mutatelist = list(/obj/item/seeds/apple) + reagents_add = list("vitamin" = 0.02, "nutriment" = 0.2, "water" = 0.04) + +/obj/item/reagent_containers/food/snacks/grown/pineapple + seed = /obj/item/seeds/pineapple + name = "pineapples" + desc = "Blorble." + icon_state = "pineapple" + force = 4 + throwforce = 8 + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("stung", "pined") + throw_speed = 1 + throw_range = 5 + slice_path = /obj/item/reagent_containers/food/snacks/pineappleslice + slices_num = 3 + filling_color = "#F6CB0B" + w_class = WEIGHT_CLASS_NORMAL + foodtype = FRUIT + tastes = list("pineapple" = 1) diff --git a/icons/obj/food/pizzaspaghetti.dmi b/icons/obj/food/pizzaspaghetti.dmi index 245c737865..fe20d75248 100644 Binary files a/icons/obj/food/pizzaspaghetti.dmi and b/icons/obj/food/pizzaspaghetti.dmi differ diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi index 7207733b14..d309884be0 100644 Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 0426b2f1f0..742c02985d 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index 8ce90d87d4..4c898aecd3 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 37c0c1f6a3..be4a0fb9eb 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1594,6 +1594,7 @@ #include "code\modules\hydroponics\grown\mushrooms.dm" #include "code\modules\hydroponics\grown\nettle.dm" #include "code\modules\hydroponics\grown\onion.dm" +#include "code\modules\hydroponics\grown\pineapple.dm" #include "code\modules\hydroponics\grown\potato.dm" #include "code\modules\hydroponics\grown\pumpkin.dm" #include "code\modules\hydroponics\grown\random.dm"