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
+2 -1
View File
@@ -949,7 +949,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
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/hawaiian)
cost = 60
containername = "Pizza crate"
+1 -1
View File
@@ -977,7 +977,7 @@
/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/comfrey =3, /obj/item/seeds/corn = 3,
/obj/item/seeds/nymph =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/peanuts = 3, /obj/item/seeds/potato = 3, /obj/item/seeds/poppy = 3,
/obj/item/seeds/lime = 3, /obj/item/seeds/onion = 3, /obj/item/seeds/orange = 3, /obj/item/seeds/peanuts = 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)
@@ -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)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 KiB

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

+1
View File
@@ -1402,6 +1402,7 @@
#include "code\modules\hydroponics\grown\nymph.dm"
#include "code\modules\hydroponics\grown\onion.dm"
#include "code\modules\hydroponics\grown\peanut.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"