Adds more tajaran cuisine (#4845)

This pr adds some dishes, plants and drinks based on the tajaran lore. The meat and clams can't really be found anywhere right now, as they are supossed to be ordered from cargo.

Also fixes some foods having proteins for no reason and adds a new frappe sprite.

Sprites made by dronz, brainos, and some others were found in the vgstation and tgstation codebases.
This commit is contained in:
Alberyk
2018-06-14 16:41:05 -03:00
committed by Werner
parent 153d11f1a4
commit 0238893f18
17 changed files with 255 additions and 30 deletions

View File

@@ -561,6 +561,13 @@
. = ..()
reagents.add_reagent("sbiten", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/messa_mead
name = "messa's mead"
desc = "A bottle of Messa's mead. Bottled somewhere in the icy world of Adhomai."
icon_state = "messa_mead"
Initialize()
. = ..()
reagents.add_reagent("messa_mead", 100)
// Butanol-based alcoholic drinks
//=====================================

View File

@@ -13,7 +13,8 @@ var/list/lunchables_lunches_ = list(
/obj/item/weapon/reagent_containers/food/snacks/tossedsalad,
/obj/item/weapon/reagent_containers/food/snacks/koiswaffles,
/obj/item/weapon/reagent_containers/food/snacks/funnelcake,
/obj/item/weapon/reagent_containers/food/snacks/hotdog
/obj/item/weapon/reagent_containers/food/snacks/hotdog,
/obj/item/weapon/reagent_containers/food/snacks/tajaran_bread
)
var/list/lunchables_snacks_ = list(
@@ -47,7 +48,8 @@ var/list/lunchables_snacks_ = list(
/obj/item/weapon/reagent_containers/food/snacks/friedkois,
/obj/item/weapon/reagent_containers/food/snacks/meatsnack,
/obj/item/weapon/reagent_containers/food/snacks/maps,
/obj/item/weapon/reagent_containers/food/snacks/nathisnack
/obj/item/weapon/reagent_containers/food/snacks/nathisnack,
/obj/item/weapon/reagent_containers/food/snacks/adhomian_can
)
var/list/lunchables_drinks_ = list(

View File

@@ -3975,10 +3975,6 @@
nutriment_desc = list("uncooked dough" = 3)
nutriment_amt = 3
/obj/item/weapon/reagent_containers/food/snacks/dough/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
// Dough + rolling pin = flat dough
/obj/item/weapon/reagent_containers/food/snacks/dough/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/material/kitchen/rollingpin))
@@ -3998,10 +3994,6 @@
nutriment_desc = list("uncooked dough" = 3)
nutriment_amt = 3
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
/obj/item/weapon/reagent_containers/food/snacks/doughslice
name = "dough slice"
desc = "A building block of an impressive dish."
@@ -4462,7 +4454,7 @@
/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
name = "ice cream sandwich"
desc = "Portable ice cream in its own packaging."
icon_state = "4no_raisins"
icon_state = "icecreamsandwich"
filling_color = "#343834"
center_of_mass = list("x"=15, "y"=4)
nutriment_desc = list("ice cream" = 4)
@@ -5087,6 +5079,7 @@
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/baconburger/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
/obj/item/weapon/reagent_containers/food/snacks/blt
@@ -5100,8 +5093,72 @@
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/blt/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
/obj/item/weapon/reagent_containers/food/snacks/clam
name = "Ras'val clam"
desc = "An adhomian clam, native from the sea of Ras'val."
icon_state = "clam"
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/clam/Initialize()
. = ..()
reagents.add_reagent("seafood", 2)
/obj/item/weapon/reagent_containers/food/snacks/spicy_clams
name = "spicy Ras'val clams"
desc = "A famous adhomian clam dish, named after the Ras'val sea."
icon_state = "spicy_clams"
bitesize = 2
trash = /obj/item/trash/snack_bowl
/obj/item/weapon/reagent_containers/food/snacks/spicy_clams/Initialize()
. = ..()
reagents.add_reagent("seafood", 4)
reagents.add_reagent("pepper", 1)
/obj/item/weapon/reagent_containers/food/snacks/tajaran_bread
name = "adhomian bread"
desc = "A traditional tajaran bread, usually baked with blizzard ears' flour."
icon_state = "tajaran_bread"
bitesize = 2
nutriment_desc = list("bread" = 2)
nutriment_amt = 5
/obj/item/weapon/reagent_containers/food/snacks/earthenroot_soup
name = "earthen-root soup"
desc = "A soup made with earthen-root, a traditional dish from Northern Harr'masir."
icon_state = "tajaran_soup"
bitesize = 2
nutriment_desc = list("soup" = 5)
nutriment_amt = 4
trash = /obj/item/trash/snack_bowl
/obj/item/weapon/reagent_containers/food/snacks/tajaran_stew
name = "nav'twir stew"
desc = "An adhomian stew, made with nav'twir meat and native plants."
icon_state = "tajaran_stew"
bitesize = 2
nutriment_desc = list("sweetness" = 2)
nutriment_amt = 4
/obj/item/weapon/reagent_containers/food/snacks/tajaran_stew/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("water", 4)
/obj/item/weapon/reagent_containers/food/snacks/adhomian_can
name = "canned fastshouters meat"
desc = "A piece of salted N<>hanzafu's meat stored inside a metal can."
icon_state = "canned"
bitesize = 2
trash = /obj/item/trash/can
/obj/item/weapon/reagent_containers/food/snacks/adhomian_can/Initialize()
. = ..()
reagents.add_reagent("protein", 5)
reagents.add_reagent("sodiumchloride", 2)
#undef NUTRIMENT_GOOD
#undef NUTRIMENT_BAD

View File

@@ -56,7 +56,7 @@
desc = "Tastes like... well, you know."
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken
name = "chicken"
name = "chicken meat"
icon_state = "chickenbreast"
cooked_icon = "chickenbreast_cooked"
filling_color = "#BBBBAA"
@@ -81,12 +81,13 @@
name = "rotten meat"
desc = "A slab of rotten meat."
icon_state = "shadowmeat"
health = 180
filling_color = "#FF1C1C"
/obj/item/weapon/reagent_containers/food/snacks/meat/undead/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("undead_ichor", 5)
/obj/item/weapon/reagent_containers/food/snacks/meat/adhomai
name = "snow strider meat"
desc = "A slab of nav'twir's meat, an animal native from Adhomai."
icon_state = "adhomai_meat"