cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds more food recipes (#3544)

Browse Source
This commit is contained in:
Alberyk
2017-10-07 02:41:29 -03:00
committed by Lohikar
parent f202bb673a
commit 25c805de1c
12 changed files with 298 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
code/modules/food/recipes_microwave.dm
View File

@@ -122,7 +122,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/mouseburger
/datum/recipe/hotdog
items = list(
/obj/item/weapon/reagent_containers/food/snacks/bun,
@@ -130,6 +129,14 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/hotdog
/datum/recipe/classichotdog
items = list(
/obj/item/weapon/reagent_containers/food/snacks/bun,
/obj/item/weapon/holder/corgi
)
result = /obj/item/weapon/reagent_containers/food/snacks/classichotdog
/datum/recipe/waffles
reagents = list("sugar" = 10)
items = list(
@@ -201,8 +208,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen
/datum/recipe/berryclafoutis
fruit = list("berries" = 1)
items = list(
@@ -218,7 +223,6 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
/datum/recipe/humankabob
items = list(
/obj/item/stack/rods,
@@ -355,14 +359,6 @@ I said no!
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger
/datum/recipe/fishandchips
items = list(
/obj/item/weapon/reagent_containers/food/snacks/fries,
@@ -370,8 +366,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
/datum/recipe/sandwich
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
@@ -473,8 +467,6 @@ I said no!
items = list(/obj/item/weapon/reagent_containers/food/snacks/spagetti)
result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato
/datum/recipe/meatballspagetti
reagents = list("water" = 5)
items = list(
@@ -883,4 +875,31 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/breadslice
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/weapon/reagent_containers/food/snacks/honeytoast
result = /obj/item/weapon/reagent_containers/food/snacks/honeytoast
/datum/recipe/donerkebab
fruit = list("tomato" = 1, "cabbage" = 1)
reagents = list("sodiumchloride" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/donerkebab
/datum/recipe/sashimi
reagents = list("soysauce" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sashimi
/datum/recipe/nugget
reagents = list("flour" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken
)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/nugget

30
code/modules/food/recipes_oven.dm
View File

@@ -471,4 +471,32 @@
/datum/recipe/cake/brain
appliance = OVEN
items = list(/obj/item/organ/brain)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
/datum/recipe/pancakes
appliance = OVEN
fruit = list("blueberries" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/pancakes
/datum/recipe/lasagna
appliance = OVEN
fruit = list("tomato" = 2, "eggplant" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/lasagna
/datum/recipe/honeybun
appliance = OVEN
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough
)
reagents = list("honey" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/honeybun

19
code/modules/hydroponics/seed_datums.dm
View File

@@ -39,7 +39,7 @@
name = "berries"
seed_name = "berry"
display_name = "berry bush"
mutants = list("glowberries","poisonberries")
mutants = list("glowberries","poisonberries","blueberries")
chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10))
kitchen_tag = "berries"
@@ -57,6 +57,23 @@
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/berry/blue
name = "blueberries"
seed_name = "blueberry"
display_name = "blueberry bush"
mutants = list("berries","poisonberries","glowberries")
chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10))
/datum/seed/berry/blue/setup_traits()
..()
set_trait(TRAIT_MATURATION,5)
set_trait(TRAIT_PRODUCTION,5)
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_PRODUCT_COLOUR,"#1C225C")
set_trait(TRAIT_WATER_CONSUMPTION, 5)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.2)
/datum/seed/berry/glow
name = "glowberries"
seed_name = "glowberry"

3
code/modules/hydroponics/seed_packets.dm
View File

@@ -108,6 +108,9 @@ var/global/list/plant_seed_sprites = list()
/obj/item/seeds/berryseed
seed_type = "berries"
/obj/item/seeds/blueberryseed
seed_type = "blueberries"
/obj/item/seeds/glowberryseed
seed_type = "glowberries"

152
code/modules/hydroponics/seed_storage.dm
View File

@@ -40,40 +40,41 @@
name = "Garden seed storage"
scanner = list("stats")
starting_seeds = list(
/obj/item/seeds/appleseed = 3,
/obj/item/seeds/bananaseed = 3,
/obj/item/seeds/berryseed = 3,
/obj/item/seeds/cabbageseed = 3,
/obj/item/seeds/carrotseed = 3,
/obj/item/seeds/chantermycelium = 3,
/obj/item/seeds/cherryseed = 3,
/obj/item/seeds/chiliseed = 3,
/obj/item/seeds/cocoapodseed = 3,
/obj/item/seeds/cornseed = 3,
/obj/item/seeds/eggplantseed = 3,
/obj/item/seeds/grapeseed = 3,
/obj/item/seeds/grassseed = 3,
/obj/item/seeds/replicapod = 3,
/obj/item/seeds/lemonseed = 3,
/obj/item/seeds/limeseed = 3,
/obj/item/seeds/mtearseed = 2,
/obj/item/seeds/orangeseed = 3,
/obj/item/seeds/peanutseed = 3,
/obj/item/seeds/plumpmycelium = 3,
/obj/item/seeds/poppyseed = 3,
/obj/item/seeds/potatoseed = 3,
/obj/item/seeds/pumpkinseed = 3,
/obj/item/seeds/riceseed = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/shandseed = 2,
/obj/item/seeds/tobaccoseed = 3,
/obj/item/seeds/tomatoseed = 3,
/obj/item/seeds/towermycelium = 3,
/obj/item/seeds/watermelonseed = 3,
/obj/item/seeds/wheatseed = 3,
/obj/item/seeds/whitebeetseed = 3,
/obj/item/seeds/appleseed = 3,
/obj/item/seeds/bananaseed = 3,
/obj/item/seeds/berryseed = 3,
/obj/item/seeds/blueberryseed = 3,
/obj/item/seeds/cabbageseed = 3,
/obj/item/seeds/carrotseed = 3,
/obj/item/seeds/chantermycelium = 3,
/obj/item/seeds/cherryseed = 3,
/obj/item/seeds/chiliseed = 3,
/obj/item/seeds/cocoapodseed = 3,
/obj/item/seeds/cornseed = 3,
/obj/item/seeds/eggplantseed = 3,
/obj/item/seeds/grapeseed = 3,
/obj/item/seeds/grassseed = 3,
/obj/item/seeds/replicapod = 3,
/obj/item/seeds/lemonseed = 3,
/obj/item/seeds/limeseed = 3,
/obj/item/seeds/mtearseed = 2,
/obj/item/seeds/orangeseed = 3,
/obj/item/seeds/peanutseed = 3,
/obj/item/seeds/plumpmycelium = 3,
/obj/item/seeds/poppyseed = 3,
/obj/item/seeds/potatoseed = 3,
/obj/item/seeds/pumpkinseed = 3,
/obj/item/seeds/riceseed = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/shandseed = 2,
/obj/item/seeds/tobaccoseed = 3,
/obj/item/seeds/tomatoseed = 3,
/obj/item/seeds/towermycelium = 3,
/obj/item/seeds/watermelonseed = 3,
/obj/item/seeds/wheatseed = 3,
/obj/item/seeds/whitebeetseed = 3,
/obj/item/seeds/koisspore = 3
)
@@ -81,47 +82,48 @@
name = "Xenobotany seed storage"
scanner = list("stats", "produce", "soil", "temperature", "light")
starting_seeds = list(
/obj/item/seeds/ambrosiavulgarisseed = 3,
/obj/item/seeds/appleseed = 3,
/obj/item/seeds/amanitamycelium = 2,
/obj/item/seeds/bananaseed = 3,
/obj/item/seeds/berryseed = 3,
/obj/item/seeds/cabbageseed = 3,
/obj/item/seeds/carrotseed = 3,
/obj/item/seeds/chantermycelium = 3,
/obj/item/seeds/cherryseed = 3,
/obj/item/seeds/chiliseed = 3,
/obj/item/seeds/cocoapodseed = 3,
/obj/item/seeds/cornseed = 3,
/obj/item/seeds/replicapod = 3,
/obj/item/seeds/eggplantseed = 3,
/obj/item/seeds/glowshroom = 2,
/obj/item/seeds/grapeseed = 3,
/obj/item/seeds/grassseed = 3,
/obj/item/seeds/lemonseed = 3,
/obj/item/seeds/libertymycelium = 2,
/obj/item/seeds/limeseed = 3,
/obj/item/seeds/mtearseed = 2,
/obj/item/seeds/nettleseed = 2,
/obj/item/seeds/orangeseed = 3,
/obj/item/seeds/peanutseed = 3,
/obj/item/seeds/plastiseed = 3,
/obj/item/seeds/plumpmycelium = 3,
/obj/item/seeds/poppyseed = 3,
/obj/item/seeds/potatoseed = 3,
/obj/item/seeds/pumpkinseed = 3,
/obj/item/seeds/reishimycelium = 2,
/obj/item/seeds/riceseed = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/shandseed = 2,
/obj/item/seeds/tobaccoseed = 3,
/obj/item/seeds/tomatoseed = 3,
/obj/item/seeds/towermycelium = 3,
/obj/item/seeds/watermelonseed = 3,
/obj/item/seeds/wheatseed = 3,
/obj/item/seeds/whitebeetseed = 3,
/obj/item/seeds/ambrosiavulgarisseed = 3,
/obj/item/seeds/appleseed = 3,
/obj/item/seeds/amanitamycelium = 2,
/obj/item/seeds/bananaseed = 3,
/obj/item/seeds/berryseed = 3,
/obj/item/seeds/blueberryseed = 3,
/obj/item/seeds/cabbageseed = 3,
/obj/item/seeds/carrotseed = 3,
/obj/item/seeds/chantermycelium = 3,
/obj/item/seeds/cherryseed = 3,
/obj/item/seeds/chiliseed = 3,
/obj/item/seeds/cocoapodseed = 3,
/obj/item/seeds/cornseed = 3,
/obj/item/seeds/replicapod = 3,
/obj/item/seeds/eggplantseed = 3,
/obj/item/seeds/glowshroom = 2,
/obj/item/seeds/grapeseed = 3,
/obj/item/seeds/grassseed = 3,
/obj/item/seeds/lemonseed = 3,
/obj/item/seeds/libertymycelium = 2,
/obj/item/seeds/limeseed = 3,
/obj/item/seeds/mtearseed = 2,
/obj/item/seeds/nettleseed = 2,
/obj/item/seeds/orangeseed = 3,
/obj/item/seeds/peanutseed = 3,
/obj/item/seeds/plastiseed = 3,
/obj/item/seeds/plumpmycelium = 3,
/obj/item/seeds/poppyseed = 3,
/obj/item/seeds/potatoseed = 3,
/obj/item/seeds/pumpkinseed = 3,
/obj/item/seeds/reishimycelium = 2,
/obj/item/seeds/riceseed = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/shandseed = 2,
/obj/item/seeds/tobaccoseed = 3,
/obj/item/seeds/tomatoseed = 3,
/obj/item/seeds/towermycelium = 3,
/obj/item/seeds/watermelonseed = 3,
/obj/item/seeds/wheatseed = 3,
/obj/item/seeds/whitebeetseed = 3,
/obj/item/seeds/koisspore = 3
)

9
code/modules/mob/holder.dm
View File

@@ -579,3 +579,12 @@ var/list/holder_mob_icon_cache = list()
/obj/item/weapon/holder/pai/rabbit
icon_state = "rabbit_rest"
item_state = "rabbit"
//corgi
/obj/item/weapon/holder/corgi
name = "corgi"
icon_state = "corgi"
item_state = "corgi"
contained_sprite = 1
w_class = 3

2
code/modules/mob/living/simple_animal/friendly/corgi.dm
View File

@@ -24,6 +24,8 @@
seek_speed = 6
possession_candidate = 1
holder_type = /obj/item/weapon/holder/corgi
var/obj/item/inventory_head
var/obj/item/inventory_back

97
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -4424,7 +4424,6 @@
qdel(src)
qdel(W)
/obj/item/weapon/reagent_containers/food/snacks/koiskebab2
name = "k'ois on a stick"
desc = "It's K'ois. On a stick. It looks like you could fit more."
@@ -4538,3 +4537,99 @@
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/pancakes
name = "pancakes"
desc = "Pancakes with blueberries, delicious."
icon_state = "pancakes"
trash = /obj/item/trash/plate
center_of_mass = "x=15;y=11"
nutriment_desc = list("pancake" = 8)
nutriment_amt = 8
/obj/item/weapon/reagent_containers/food/snacks/pancakes/Initialize()
. = ..()
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/classichotdog
name = "classic hotdog"
desc = "Going literal."
icon_state = "hotcorgi"
center_of_mass = "x=16;y=17"
/obj/item/weapon/reagent_containers/food/snacks/classichotdog/Initialize()
. = ..()
reagents.add_reagent("protein", 16)
bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/lasagna
name = "lasagna"
desc = "Favorite of cats."
icon_state = "lasagna"
trash = /obj/item/trash/plate
center_of_mass = "x=16;y=17"
nutriment_amt = 5
nutriment_desc = list("pasta" = 4, "tomato" = 2)
/obj/item/weapon/reagent_containers/food/snacks/classichotdog/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/donerkebab
name = "doner kebab"
desc = "A delicious sandwich-like food from ancient Earth. The meat is typically cooked on a vertical rotisserie."
icon_state = "doner_kebab"
nutriment_amt = 5
nutriment_desc = list("dough" = 4, "cabbage" = 2)
/obj/item/weapon/reagent_containers/food/snacks/donerkebab/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/sashimi
name = "carp sashimi"
desc = "A traditional human dish, recreated using space carp."
icon_state = "sashimi"
filling_color = "#FFDEFE"
center_of_mass = list("x"=17, "y"=13)
/obj/item/weapon/reagent_containers/food/snacks/sashimi/Initialize()
. = ..()
reagents.add_reagent("seafood", 3)
reagents.add_reagent("carpotoxin", 3)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/nugget
name = "chicken nugget"
icon_state = "nugget_lump"
/obj/item/weapon/reagent_containers/food/snacks/nugget/Initialize()
. = ..()
var/shape = pick("lump", "star", "lizard", "corgi")
desc = "A chicken nugget vaguely shaped like a [shape]."
icon_state = "nugget_[shape]"
reagents.add_reagent("protein", 4)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
name = "ice cream sandwich"
desc = "Portable ice cream in its own packaging."
icon_state = "4no_raisins"
filling_color = "#343834"
center_of_mass = list("x"=15, "y"=4)
nutriment_desc = list("ice cream" = 4)
nutriment_amt = 4
/obj/item/weapon/reagent_containers/food/snacks/honeybun
name = "honey bun"
desc = "A sticky pastry bun glazed with honey."
icon_state = "honeybun"
nutriment_desc = list("pastry" = 1)
nutriment_amt = 3
/obj/item/weapon/reagent_containers/food/snacks/honeybun/Initialize()
. = ..()
reagents.add_reagent("honey", 3)
bitesize = 3