cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #867 from CHOMPStationBot/upstream-merge-9301

Browse Source 
[MIRROR] Adding New Foods
This commit is contained in:
Razgriz
2020-11-19 12:57:00 -07:00
committed by GitHub
parent 744bbc9bc9 595f2ed82e
commit 12c5ca5ef4
5 changed files with 244 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
code/modules/food/food/snacks.dm
View File

@@ -6408,3 +6408,161 @@
/obj/item/weapon/reagent_containers/food/snacks/lasagna/Initialize()
..()
reagents.add_reagent("protein", 2) //For meaty things.
/obj/item/weapon/reagent_containers/food/snacks/gigapuddi
name = "Giga Puddi"
desc = "A large crème caramel"
icon = 'icons/obj/food.dmi'
icon_state = "gigapuddi"
trash = /obj/item/trash/plate
/obj/item/weapon/reagent_containers/food/snacks/gigapuddi/New()
..()
reagents.add_reagent("nutriment", 20)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/gigapuddi/happy
desc = "A large crème caramel made with extra love"
icon = 'icons/obj/food.dmi'
icon_state = "happypuddi"
/obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger
desc = "A large crème caramel made with extra hate"
icon_state = "angerpuddi"
/obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel
name = "\improper Buche de Noel"
desc = "Merry Christmas"
icon = 'icons/obj/food.dmi'
icon_state = "buche"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/bucheslice
slices_num = 5
w_class = 2
trash = /obj/item/trash/tray
/obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel/New()
..()
reagents.add_reagent("nutriment", 20)
reagents.add_reagent("sugar", 9)
reagents.add_reagent("coco", 5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/bucheslice
name = "\improper Buche de Noel slice"
desc = "A slice of winter magic."
icon = 'icons/obj/food.dmi'
icon_state = "buche_slice"
trash = /obj/item/trash/plate
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey
name = "turkey"
desc = "Tastes like chicken"
icon = 'icons/obj/food.dmi'
icon_state = "turkey"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/turkeyslice
slices_num = 6
w_class = 2
trash = /obj/item/trash/tray
/obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey/New()
..()
reagents.add_reagent("nutriment", 20)
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent("cornoil", 1)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/turkeyslice
name = "turkey drumstick"
desc = "Guaranteed vox-free"
icon = 'icons/obj/food.dmi'
icon_state = "turkey_drumstick"
trash = /obj/item/trash/plate
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/suppermatter
name = "suppermatter"
desc = "Extremely dense and powerful food."
slice_path = /obj/item/weapon/reagent_containers/food/snacks/suppermattershard
slices_num = 10
icon = 'icons/obj/food.dmi'
icon_state = "suppermatter"
w_class = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/suppermatter/New()
..()
reagents.add_reagent("nutriment", 48)
bitesize = 12
set_light(1.4,2,"#FFFF00")
/obj/item/weapon/reagent_containers/food/snacks/suppermattershard
name = "suppermatter shard"
desc = "A single portion of power."
icon = 'icons/obj/food.dmi'
icon_state = "suppermattershard"
bitesize = 3
trash = null
/obj/item/weapon/reagent_containers/food/snacks/suppermattershard/New()
..()
set_light(1.4,1.4,"#FFFF00")
/obj/item/weapon/reagent_containers/food/snacks/sliceable/excitingsuppermatter
name = "exciting suppermatter"
desc = "Extremely dense, powerful and exciting food!"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/excitingsuppermattershard
slices_num = 10
icon = 'icons/obj/food.dmi'
icon_state = "excitingsuppermatter"
w_class = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/excitingsuppermatter/New()
..()
reagents.add_reagent("nutriment", 60)
bitesize = 12
set_light(1.4,2,"#FF0000")
/obj/item/weapon/reagent_containers/food/snacks/excitingsuppermattershard
name = "exciting suppermatter shard"
desc = "A single portion of exciting power!"
icon = 'icons/obj/food.dmi'
icon_state = "excitingsuppermattershard"
bitesize = 4
trash = null
/obj/item/weapon/reagent_containers/food/snacks/excitingsuppermattershard/New()
..()
set_light(1.4,1.4,"#FF0000")
/obj/item/weapon/reagent_containers/food/snacks/omurice
name = "omelette rice"
desc = "Just like your Japanese animes!"
icon = 'icons/obj/food.dmi'
icon_state = "omurice"
trash = /obj/item/trash/plate
/obj/item/weapon/reagent_containers/food/snacks/omurice/New()
..()
reagents.add_reagent("nutriment", 8)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/omurice/heart
icon = 'icons/obj/food.dmi'
icon_state = "omuriceheart"
/obj/item/weapon/reagent_containers/food/snacks/omurice/face
icon = 'icons/obj/food.dmi'
icon_state = "omuriceface"
/obj/item/weapon/reagent_containers/food/snacks/cinnamonbun
name = "cinnamon bun"
desc = "Life needs frosting!"
icon = 'icons/obj/food.dmi'
icon_state = "cinnamonbun"
trash = null
/obj/item/weapon/reagent_containers/food/snacks/cinnamonbun/New()
..()
reagents.add_reagent("nutriment", 8)
bitesize = 1

17
code/modules/food/recipes_grill.dm
View File

@@ -228,4 +228,19 @@
/obj/item/weapon/reagent_containers/food/snacks/bacon,
/obj/item/weapon/reagent_containers/food/snacks/bacon
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/bacon
result = /obj/item/weapon/reagent_containers/food/snacks/burger/bacon
/datum/recipe/omurice
appliance = GRILL
reagents = list("rice" = 5, "ketchup" = 5, "egg" = 3)
result = /obj/item/weapon/reagent_containers/food/snacks/omurice
/datum/recipe/omurice/heart
appliance = GRILL
reagents = list("rice" = 5, "ketchup" = 5, "sugar" = 5, "egg" = 3)
result = /obj/item/weapon/reagent_containers/food/snacks/omurice/heart
/datum/recipe/omurice/face
appliance = GRILL
reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 5, "egg" = 3)
result = /obj/item/weapon/reagent_containers/food/snacks/omurice/face

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

@@ -137,7 +137,7 @@ I said no!
fruit = list("potato" = 1)
items = list(/obj/item/weapon/reagent_containers/food/snacks/cheesewedge)
result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
/datum/recipe/microchips
appliance = MICROWAVE
items = list(
@@ -186,7 +186,7 @@ I said no!
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(/obj/item/weapon/reagent_containers/food/snacks/meat)
result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
/datum/recipe/syntisteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh)
@@ -208,7 +208,7 @@ I said no!
/datum/recipe/amanitajelly
reagents = list("water" = 5, "vodka" = 5, "amatoxin" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/amanitajelly
/datum/recipe/amanitajelly/make_food(var/obj/container as obj)
. = ..(container)
for(var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked in .)
@@ -532,7 +532,7 @@ I said no!
fruit = list("potato" = 1, "ambrosia" = 3)
items = list(/obj/item/weapon/reagent_containers/food/snacks/meatball)
result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
/datum/recipe/validsalad/make_food(var/obj/container as obj)
. = ..(container)
for (var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked in .)
@@ -552,7 +552,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/stuffing,
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofurkey
/datum/recipe/mashedpotato
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spreads/butter // to prevent conflicts with yellow curry
@@ -860,7 +860,7 @@ I said no!
/obj/item/device/soulstone
)
result = /obj/item/weapon/reagent_containers/food/snacks/bageltwo
/////////////////////////////////////////////////////////////
//Synnono Meme Foods
//
@@ -1392,3 +1392,48 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/makaroni
/datum/recipe/gigapuddi
reagents = list("milk" = 15)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg
)
result = /obj/item/weapon/reagent_containers/food/snacks/gigapuddi
/datum/recipe/gigapuddi/happy
reagents = list("milk" = 15, "sugar" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg
)
result = /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/happy
/datum/recipe/gigapuddi/anger
reagents = list("milk" = 15, "sodiumchloride" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg
)
result = /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger
/datum/recipe/buchedenoel
fruit = list("berries" = 2)
reagents = list("milk" = 5, "flour" = 15, "cream" = 10, "coco" = 5, "egg" = 6)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel
/datum/recipe/turkey
fruit = list("carrot" = 2)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken,
/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey
/datum/recipe/cinnamonbun
reagents = list("sugar" = 15, "cream" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/cinnamonbun
result_quantity = 4

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

@@ -557,4 +557,22 @@
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/macncheese
result = /obj/item/weapon/reagent_containers/food/snacks/macncheese
/datum/recipe/suppermatter
appliance = OVEN
reagents = list("radium" = 5, "milk" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake
)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/suppermatter
/datum/recipe/excitingsuppermatter
appliance = OVEN
reagents = list("radium" = 5, "spacespice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake
)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/excitingsuppermatter