adds pineapple and derivatives

This commit is contained in:
Birdtalon
2017-08-26 22:07:51 +01:00
parent bd8cc72ad8
commit 0daed1cfe2
12 changed files with 52 additions and 2 deletions
@@ -1914,6 +1914,12 @@
icon_state = "watermelonslice"
filling_color = "#FF3867"
/obj/item/weapon/reagent_containers/food/snacks/pineappleslice
name = "Pineapple Slices"
desc = "Rings of pineapple."
icon_state = "pineappleslice"
filling_color = "#e5b437"
/obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake
name = "Apple Cake"
desc = "A cake centered with Apple."
@@ -2037,6 +2043,20 @@
icon_state = "vegetablepizzaslice"
filling_color = "#BAA14C"
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
name = "Hawaiian Pizza"
desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple."
icon_state = "hawaiianpizza" //NEEDED
slice_path = /obj/item/weapon/reagent_containers/food/snacks/hawaiianpizzaslice
slices_num = 6
list_reagents = list("plantmatter" = 25, "pineapplejuice" = 6, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/hawaiianpizzaslice
name = "Hawaiian pizza slice"
desc = "A slice of polarising pizza."
icon_state = "hawaiianpizzaslice"
filling_color = "#e5b437"
/obj/item/pizzabox
name = "pizza box"
desc = "A box suited for pizzas."
@@ -2210,6 +2230,10 @@
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src)
boxtag = "Meatlover's Supreme"
/obj/item/pizzabox/hawaiian/New()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza(src)
boxtag = "Hawaiian Feast"
////////////////////////////////FOOD ADDITIONS////////////////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/wrap
@@ -27,6 +27,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/berries = "berryjuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = "pumpkinjuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin = "blumpkinjuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/pineapple = "pineapplejuice"
)
/obj/machinery/juicer/New()
@@ -182,3 +183,4 @@
new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/grapes(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/pineapple(src)
@@ -253,6 +253,17 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
/datum/recipe/oven/hawaiianpizza
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/grown/pineapple,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
/datum/recipe/oven/amanita_pie
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
@@ -75,6 +75,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple = list("applejuice" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes = list("grapejuice" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green = list("grapejuice" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/pineapple = list("pineapplejuice" = 0)
)
var/list/dried_items = list(
@@ -23,6 +23,16 @@
drink_desc = "Are you sure this is tomato juice?"
taste_message = "tomato juice"
/datum/reagent/consumable/drink/pineapplejuice
name = "Pineapple Juice"
id = "pineapplejuice"
description = "Pineapples juiced into a liquid. Sweet and sugary."
color = "#e5b437"
drink_icon = "glass_orange"
drink_name = "Glass of pineapple juice"
drink_desc = "A bright drink, sweet and sugary."
taste_message = "pineapple juice"
/datum/reagent/consumable/drink/tomatojuice/on_mob_life(mob/living/M)
if(M.getFireLoss() && prob(20))
M.adjustFireLoss(-1)