shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The Crafting Menu now has subcategories! (#1364)

Browse Source
This commit is contained in:
CitadelStationBot
2017-06-04 11:09:59 -05:00
committed by kevinz000
parent dc3d656788
commit e0b5221ebd
21 changed files with 393 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/crafting/craft.dm
+67 -24
View File
@@ -1,24 +1,35 @@
/datum/personal_crafting
var/busy
var/viewing_category = 1 //typical powergamer starting on the Weapons tab
var/list/categories = list(CAT_WEAPON,
CAT_AMMO,
var/viewing_subcategory = 1
var/list/categories = list(
CAT_WEAPONRY,
CAT_ROBOT,
CAT_MISC,
CAT_PRIMAL,
CAT_BREAD,
CAT_BURGER,
CAT_CAKE,
CAT_EGG,
CAT_MEAT,
CAT_MISCFOOD,
CAT_PASTRY,
CAT_PIE,
CAT_PIZZA,
CAT_SALAD,
CAT_SANDWICH,
CAT_SOUP,
CAT_SPAGHETTI)
CAT_FOOD)
var/list/subcategories = list(
list( //Weapon subcategories
CAT_WEAPON,
CAT_AMMO),
CAT_NONE, //Robot subcategories
CAT_NONE, //Misc subcategories
CAT_NONE, //Tribal subcategories
list( //Food subcategories
CAT_BREAD,
CAT_BURGER,
CAT_CAKE,
CAT_EGG,
CAT_MEAT,
CAT_MISCFOOD,
CAT_PASTRY,
CAT_PIE,
CAT_PIZZA,
CAT_SALAD,
CAT_SANDWICH,
CAT_SOUP,
CAT_SPAGHETTI))
var/datum/action/innate/crafting/button
var/display_craftable_only = FALSE
var/display_compact = TRUE
@@ -262,11 +273,19 @@
/datum/personal_crafting/ui_data(mob/user)
var/list/data = list()
var/list/subs = list()
var/cur_subcategory = CAT_NONE
var/cur_category = categories[viewing_category]
if (islist(subcategories[viewing_category]))
subs = subcategories[viewing_category]
cur_subcategory = subs[viewing_subcategory]
data["busy"] = busy
data["prev_cat"] = categories[prev_cat()]
data["prev_subcat"] = subs[prev_subcat()]
data["category"] = cur_category
data["subcategory"] = cur_subcategory
data["next_cat"] = categories[next_cat()]
data["next_subcat"] = subs[next_subcat()]
data["display_craftable_only"] = display_craftable_only
data["display_compact"] = display_compact
@@ -275,7 +294,7 @@
var/list/cant_craft = list()
for(var/rec in GLOB.crafting_recipes)
var/datum/crafting_recipe/R = rec
if(R.category != cur_category)
if((R.category != cur_category) || (R.subcategory != cur_subcategory))
continue
if(check_contents(R, surroundings))
can_craft += list(build_recipe_data(R))
@@ -302,29 +321,41 @@
busy = 0
ui_interact(usr)
if("forwardCat") //Meow
viewing_category = next_cat()
to_chat(usr, "<span class='notice'>Category is now [categories[viewing_category]].</span>")
viewing_category = next_cat(FALSE)
. = TRUE
if("backwardCat")
viewing_category = prev_cat()
to_chat(usr, "<span class='notice'>Category is now [categories[viewing_category]].</span>")
viewing_category = prev_cat(FALSE)
. = TRUE
if("forwardSubCat")
viewing_subcategory = next_subcat()
. = TRUE
if("backwardSubCat")
viewing_subcategory = prev_subcat()
. = TRUE
if("toggle_recipes")
display_craftable_only = !display_craftable_only
to_chat(usr, "<span class='notice'>You will now [display_craftable_only ? "only see recipes you can craft":"see all recipes"].</span>")
. = TRUE
if("toggle_compact")
display_compact = !display_compact
to_chat(usr, "<span class='notice'>Crafting menu is now [display_compact? "compact" : "full size"].</span>")
. = TRUE
//Next works nicely with modular arithmetic
/datum/personal_crafting/proc/next_cat()
/datum/personal_crafting/proc/next_cat(readonly = TRUE)
if (!readonly)
viewing_subcategory = 1
. = viewing_category % categories.len + 1
/datum/personal_crafting/proc/next_subcat()
if(islist(subcategories[viewing_category]))
var/list/subs = subcategories[viewing_category]
. = viewing_subcategory % subs.len + 1
//Previous can go fuck itself
/datum/personal_crafting/proc/prev_cat()
/datum/personal_crafting/proc/prev_cat(readonly = TRUE)
if (!readonly)
viewing_subcategory = 1
if(viewing_category == categories.len)
. = viewing_category-1
else
@@ -332,6 +363,18 @@
if(. <= 0)
. = categories.len
/datum/personal_crafting/proc/prev_subcat()
if(islist(subcategories[viewing_category]))
var/list/subs = subcategories[viewing_category]
if(viewing_subcategory == subs.len)
. = viewing_subcategory-1
else
. = viewing_subcategory % subs.len - 1
if(. <= 0)
. = subs.len
else
. = null
/datum/personal_crafting/proc/build_recipe_data(datum/crafting_recipe/R)
var/list/data = list()
code/modules/crafting/recipes.dm
+60 -23
View File
@@ -8,6 +8,7 @@
var/parts[] = list() //type paths of items that will be placed in the result
var/chem_catalysts[] = list() //like tools but for reagents
var/category = CAT_NONE //where it shows up in the crafting UI
var/subcategory = CAT_NONE
/datum/crafting_recipe/pin_removal
@@ -17,7 +18,8 @@
parts = list(/obj/item/weapon/gun = 1)
tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver, /obj/item/weapon/wirecutters)
time = 50
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/IED
name = "IED"
@@ -28,7 +30,8 @@
/obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1)
parts = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1)
time = 15
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/lance
name = "explosive lance (grenade)"
@@ -38,7 +41,8 @@
parts = list(/obj/item/weapon/twohanded/spear = 1,
/obj/item/weapon/grenade = 1)
time = 15
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/strobeshield
name = "strobe shield"
@@ -47,7 +51,8 @@
/obj/item/device/assembly/flash/handheld = 1,
/obj/item/weapon/shield/riot = 1)
time = 40
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/molotov
name = "Molotov"
@@ -56,7 +61,8 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle = 1)
parts = list(/obj/item/weapon/reagent_containers/food/drinks/bottle = 1)
time = 40
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/stunprod
name = "Stunprod"
@@ -65,7 +71,8 @@
/obj/item/stack/rods = 1,
/obj/item/device/assembly/igniter = 1)
time = 40
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/teleprod
name = "Teleprod"
@@ -75,7 +82,8 @@
/obj/item/device/assembly/igniter = 1,
/obj/item/weapon/ore/bluespace_crystal = 1)
time = 40
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/bola
name = "Bola"
@@ -84,6 +92,7 @@
/obj/item/stack/sheet/metal = 6)
time = 20//15 faster than crafting them by hand!
category= CAT_WEAPON
subcategory = CAT_WEAPON
/datum/crafting_recipe/tailclub
name = "Tail Club"
@@ -91,7 +100,8 @@
reqs = list(/obj/item/severedtail = 1,
/obj/item/stack/sheet/metal = 1)
time = 40
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/tailwhip
name = "Liz O' Nine Tails"
@@ -99,7 +109,8 @@
reqs = list(/obj/item/severedtail = 1,
/obj/item/stack/cable_coil = 1)
time = 40
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/ed209
name = "ED209"
@@ -159,6 +170,18 @@
time = 40
category = CAT_ROBOT
/datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but
name = "Pneumatic Cannon"
result = /obj/item/weapon/pneumatic_cannon/ghetto
tools = list(/obj/item/weapon/weldingtool,
/obj/item/weapon/wrench)
reqs = list(/obj/item/stack/sheet/metal = 4,
/obj/item/stack/packageWrap = 8,
/obj/item/pipe = 2)
time = 300
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/flamethrower
name = "Flamethrower"
result = /obj/item/weapon/flamethrower
@@ -169,7 +192,8 @@
/obj/item/weapon/weldingtool = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 10
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/meteorshot
name = "Meteorshot Shell"
@@ -179,7 +203,8 @@
/obj/item/weapon/stock_parts/manipulator = 2)
tools = list(/obj/item/weapon/screwdriver)
time = 5
category = CAT_AMMO
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/pulseslug
name = "Pulse Slug Shell"
@@ -189,7 +214,8 @@
/obj/item/weapon/stock_parts/micro_laser/ultra = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 5
category = CAT_AMMO
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/dragonsbreath
name = "Dragonsbreath Shell"
@@ -197,7 +223,8 @@
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,/datum/reagent/phosphorus = 5)
tools = list(/obj/item/weapon/screwdriver)
time = 5
category = CAT_AMMO
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/frag12
name = "FRAG-12 Shell"
@@ -208,7 +235,8 @@
/datum/reagent/toxin/acid/fluacid = 5)
tools = list(/obj/item/weapon/screwdriver)
time = 5
category = CAT_AMMO
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/ionslug
name = "Ion Scatter Shell"
@@ -218,7 +246,8 @@
/obj/item/weapon/stock_parts/subspace/crystal = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 5
category = CAT_AMMO
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/improvisedslug
name = "Improvised Shotgun Shell"
@@ -229,7 +258,8 @@
/datum/reagent/fuel = 10)
tools = list(/obj/item/weapon/screwdriver)
time = 5
category = CAT_AMMO
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/improvisedslugoverload
name = "Overload Improvised Shell"
@@ -239,7 +269,8 @@
/datum/reagent/toxin/plasma = 20)
tools = list(/obj/item/weapon/screwdriver)
time = 5
category = CAT_AMMO
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/laserslug
name = "Laser Slug Shell"
@@ -249,7 +280,8 @@
/obj/item/weapon/stock_parts/micro_laser/high = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 5
category = CAT_AMMO
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/ishotgun
name = "Improvised Shotgun"
@@ -260,7 +292,8 @@
/obj/item/stack/packageWrap = 5)
tools = list(/obj/item/weapon/screwdriver)
time = 100
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/chainsaw
name = "Chainsaw"
@@ -270,7 +303,8 @@
/obj/item/stack/sheet/plasteel = 1)
tools = list(/obj/item/weapon/weldingtool)
time = 50
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/spear
name = "Spear"
@@ -279,7 +313,8 @@
/obj/item/weapon/shard = 1,
/obj/item/stack/rods = 1)
time = 40
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/spooky_camera
name = "Camera Obscura"
@@ -354,7 +389,8 @@
)
parts = list(/obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/weapon/grenade/chem_grenade = 2)
time = 30
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/chemical_payload2
name = "Chemical Payload (gibtonite)"
@@ -366,7 +402,8 @@
)
parts = list(/obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/weapon/grenade/chem_grenade = 2)
time = 50
category = CAT_WEAPON
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/bonearmor
name = "Bone Armor"
code/modules/food_and_drinks/recipes/food_mixtures.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/crafting_recipe/food
var/real_parts
category = CAT_FOOD
/datum/crafting_recipe/food/New()
real_parts = parts.Copy()
code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
+9 -9
View File
@@ -11,7 +11,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/meat
category = CAT_BREAD
subcategory = CAT_BREAD
/datum/crafting_recipe/food/xenomeatbread
name = "Xenomeat bread"
@@ -21,7 +21,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/xenomeat
category = CAT_BREAD
subcategory = CAT_BREAD
/datum/crafting_recipe/food/spidermeatbread
name = "Spidermeat bread"
@@ -31,7 +31,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/spidermeat
category = CAT_BREAD
subcategory = CAT_BREAD
/datum/crafting_recipe/food/banananutbread
name = "Banana nut bread"
@@ -42,7 +42,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/banana
category = CAT_BREAD
subcategory = CAT_BREAD
/datum/crafting_recipe/food/tofubread
name = "Tofu bread"
@@ -52,7 +52,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/tofu
category = CAT_BREAD
subcategory = CAT_BREAD
/datum/crafting_recipe/food/creamcheesebread
name = "Cream cheese bread"
@@ -62,7 +62,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/creamcheese
category = CAT_BREAD
subcategory = CAT_BREAD
/datum/crafting_recipe/food/mimanabread
name = "Mimana bread"
@@ -73,7 +73,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/mimana
category = CAT_BREAD
subcategory = CAT_BREAD
/datum/crafting_recipe/food/butteredtoast
name = "Buttered Toast"
@@ -82,7 +82,7 @@
/obj/item/weapon/reagent_containers/food/snacks/butter = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/butteredtoast
category = CAT_BREAD
subcategory = CAT_BREAD
/datum/crafting_recipe/food/butterbiscuit
name = "Butter Biscuit"
@@ -91,5 +91,5 @@
/obj/item/weapon/reagent_containers/food/snacks/butter = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/butterbiscuit
category = CAT_BREAD
subcategory = CAT_BREAD
code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
+28 -28
View File
@@ -14,7 +14,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/human
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/burger
name = "Burger"
@@ -24,7 +24,7 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/plain
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/corgiburger
name = "Corgi burger"
@@ -34,7 +34,7 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/corgi
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/appendixburger
name = "Appendix burger"
@@ -43,7 +43,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/appendix
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/brainburger
name = "Brain burger"
@@ -52,7 +52,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/brain
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/xenoburger
name = "Xeno burger"
@@ -61,7 +61,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/xeno
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/bearger
name = "Bearger"
@@ -70,7 +70,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/bearger
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/fishburger
name = "Fish burger"
@@ -79,7 +79,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/fish
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/tofuburger
name = "Tofu burger"
@@ -88,7 +88,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/tofu
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/ghostburger
name = "Ghost burger"
@@ -97,7 +97,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/ghost
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/clownburger
name = "Clown burger"
@@ -106,7 +106,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/clown
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/mimeburger
name = "Mime burger"
@@ -115,7 +115,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/mime
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/redburger
name = "Red burger"
@@ -125,7 +125,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/red
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/orangeburger
name = "Orange burger"
@@ -135,7 +135,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/orange
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/yellowburger
name = "Yellow burger"
@@ -145,7 +145,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/yellow
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/greenburger
name = "Green burger"
@@ -155,7 +155,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/green
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/blueburger
name = "Blue burger"
@@ -165,7 +165,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/blue
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/purpleburger
name = "Purple burger"
@@ -175,7 +175,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/purple
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/spellburger
name = "Spell burger"
@@ -183,7 +183,7 @@
/obj/item/clothing/head/wizard/fake = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/spell
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/spellburger2
name = "Spell burger"
@@ -192,7 +192,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/spell
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/bigbiteburger
name = "Big bite burger"
@@ -201,7 +201,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/bigbite
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/superbiteburger
name = "Super bite burger"
@@ -216,7 +216,7 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/superbite
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/slimeburger
name = "Jelly burger"
@@ -225,7 +225,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/jellyburger
name = "Jelly burger"
@@ -234,7 +234,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/fivealarmburger
name = "Five alarm burger"
@@ -243,7 +243,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/fivealarm
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/ratburger
name = "Rat burger"
@@ -252,7 +252,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/rat
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/baseballburger
name = "Home run baseball burger"
@@ -261,7 +261,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/baseball
category = CAT_BURGER
subcategory = CAT_BURGER
/datum/crafting_recipe/food/baconburger
name = "Bacon Burger"
@@ -272,4 +272,4 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/baconburger
category = CAT_BURGER
subcategory = CAT_BURGER
code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
+12 -12
View File
@@ -10,7 +10,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/carrot
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/cheesecake
name = "Cheese cake"
@@ -19,7 +19,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/cheese
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/applecake
name = "Apple cake"
@@ -28,7 +28,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/apple
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/orangecake
name = "Orange cake"
@@ -37,7 +37,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/orange
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/limecake
name = "Lime cake"
@@ -46,7 +46,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/lime
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/lemoncake
name = "Lemon cake"
@@ -55,7 +55,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/lemon
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/chocolatecake
name = "Chocolate cake"
@@ -64,7 +64,7 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/chocolate
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/birthdaycake
name = "Birthday cake"
@@ -73,7 +73,7 @@
/obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/braincake
name = "Brain cake"
@@ -82,7 +82,7 @@
/obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/brain
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/slimecake
name = "Slime cake"
@@ -91,7 +91,7 @@
/obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/slimecake
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/pumpkinspicecake
name = "Pumpkin spice cake"
@@ -100,7 +100,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/pumpkinspice
category = CAT_CAKE
subcategory = CAT_CAKE
/datum/crafting_recipe/food/cak
name = "Living cat/cake hybrid"
@@ -114,4 +114,4 @@
/datum/reagent/teslium = 1 //To shock the whole thing into life
)
result = /mob/living/simple_animal/pet/cat/cak
category = CAT_CAKE //Cat! Haha, get it? CAT? GET IT???
subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT???
code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
+4 -4
View File
@@ -11,7 +11,7 @@
/obj/item/weapon/reagent_containers/food/snacks/boiledegg = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/friedegg
category = CAT_EGG
subcategory = CAT_EGG
/datum/crafting_recipe/food/omelette
name = "omelette"
@@ -20,7 +20,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/omelette
category = CAT_EGG
subcategory = CAT_EGG
/datum/crafting_recipe/food/chocolateegg
name = "Chocolate egg"
@@ -29,7 +29,7 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg
category = CAT_EGG
subcategory = CAT_EGG
/datum/crafting_recipe/food/eggsbenedict
name = "Eggs benedict"
@@ -39,4 +39,4 @@
/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/benedict
category = CAT_EGG
subcategory = CAT_EGG
code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+17 -17
View File
@@ -9,7 +9,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/kebab/human
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/kebab
name = "Kebab"
@@ -18,7 +18,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/steak = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/kebab/monkey
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/tofukebab
name = "Tofu kebab"
@@ -27,7 +27,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tofu = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/kebab/tofu
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/tailkebab
name = "Lizard tail kebab"
@@ -36,7 +36,7 @@
/obj/item/severedtail = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/kebab/tail
category = CAT_MEAT
subcategory = CAT_MEAT
// see code/module/crafting/table.dm
@@ -50,7 +50,7 @@
/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/cubancarp
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/fishandchips
name = "Fish and chips"
@@ -59,7 +59,7 @@
/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/fishfingers
name = "Fish fingers"
@@ -69,7 +69,7 @@
/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/sashimi
name = "Sashimi"
@@ -79,7 +79,7 @@
/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/sashimi
category = CAT_MEAT
subcategory = CAT_MEAT
////////////////////////////////////////////////MR SPIDER////////////////////////////////////////////////
@@ -91,7 +91,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/spidereggsham
category = CAT_MEAT
subcategory = CAT_MEAT
////////////////////////////////////////////////MISC RECIPE's////////////////////////////////////////////////
@@ -103,7 +103,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/bearsteak
name = "Filet migrawr"
@@ -113,7 +113,7 @@
)
tools = list(/obj/item/weapon/lighter)
result = /obj/item/weapon/reagent_containers/food/snacks/bearsteak
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/enchiladas
name = "Enchiladas"
@@ -123,7 +123,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tortilla = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/stewedsoymeat
name = "Stewed soymeat"
@@ -133,7 +133,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/sausage
name = "Sausage"
@@ -142,7 +142,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/sausage
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/nugget
name = "Chicken nugget"
@@ -150,7 +150,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/nugget
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/rawkhinkali
name = "Raw Khinkali"
@@ -159,7 +159,7 @@
/obj/item/weapon/reagent_containers/food/snacks/faggot = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/rawkhinkali
category = CAT_MEAT
subcategory = CAT_MEAT
/datum/crafting_recipe/food/pigblanket
name = "Pig in a Blanket"
@@ -169,4 +169,4 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pigblanket
category = CAT_MEAT
subcategory = CAT_MEAT
code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+31 -31
View File
@@ -10,7 +10,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/chococoin
name = "Choco coin"
@@ -19,7 +19,7 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/chococoin
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/fudgedice
name = "Fudge dice"
@@ -28,7 +28,7 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/fudgedice
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/chocoorange
name = "Choco orange"
@@ -37,7 +37,7 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/chocoorange
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/loadedbakedpotato
name = "Loaded baked potato"
@@ -47,7 +47,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/cheesyfries
name = "Cheesy fries"
@@ -56,7 +56,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/cheesyfries
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/wrap
name = "Wrap"
@@ -65,7 +65,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/eggwrap
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/beans
name = "Beans"
@@ -74,7 +74,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/beans
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/eggplantparm
name ="Eggplant parmigiana"
@@ -83,7 +83,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/eggplantparm
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/baguette
name = "Baguette"
@@ -93,7 +93,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/baguette
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
////////////////////////////////////////////////TOAST////////////////////////////////////////////////
@@ -104,7 +104,7 @@
/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/jelliedyoast
name = "Jellied toast"
@@ -113,7 +113,7 @@
/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/twobread
name = "Two bread"
@@ -122,7 +122,7 @@
/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/twobread
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/burrito
name ="Burrito"
@@ -131,7 +131,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/cheesyburrito
name ="Cheesy burrito"
@@ -141,7 +141,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/cheesyburrito
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/carneburrito
name ="Carne de asada burrito"
@@ -151,7 +151,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/carneburrito
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/fuegoburrito
name ="Fuego plasma burrito"
@@ -161,7 +161,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/melonfruitbowl
name ="Melon fruit bowl"
@@ -174,7 +174,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/melonfruitbowl
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/spacefreezy
name ="Space freezy"
@@ -184,7 +184,7 @@
/obj/item/weapon/reagent_containers/food/snacks/icecream = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/spacefreezy
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/sundae
name ="Sundae"
@@ -195,7 +195,7 @@
/obj/item/weapon/reagent_containers/food/snacks/icecream = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/sundae
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/honkdae
name ="Honkdae"
@@ -207,7 +207,7 @@
/obj/item/weapon/reagent_containers/food/snacks/icecream = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/honkdae
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/nachos
name ="Nachos"
@@ -216,7 +216,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tortilla = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/nachos
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/cheesynachos
name ="Cheesy nachos"
@@ -226,7 +226,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tortilla = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/cheesynachos
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/cubannachos
name ="Cuban nachos"
@@ -236,7 +236,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tortilla = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/cubannachos
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/melonkeg
name ="Melon keg"
@@ -247,7 +247,7 @@
)
parts = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/melonkeg
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/honeybar
name = "Honey nut bar"
@@ -256,7 +256,7 @@
/datum/reagent/consumable/honey = 5
)
result = /obj/item/weapon/reagent_containers/food/snacks/honeybar
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/stuffedlegion
@@ -269,7 +269,7 @@
/datum/reagent/consumable/capsaicin = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/stuffedlegion
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/lizardwine
@@ -280,7 +280,7 @@
/datum/reagent/consumable/ethanol = 100
)
result = /obj/item/weapon/reagent_containers/food/drinks/bottle/lizardwine
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/powercrepe
@@ -294,7 +294,7 @@
/obj/item/weapon/melee/sabre = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/powercrepe
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/taco
name ="Classic Taco"
@@ -305,7 +305,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/taco
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/tacoplain
name ="Plain Taco"
@@ -315,7 +315,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/taco/plain
category = CAT_MISCFOOD
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/branrequests
name = "Bran Requests Cereal"
code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm.rej
+7
View File
@@ -0,0 +1,7 @@
diff a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm (rejected hunks)
@@ -324,4 +324,4 @@
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/branrequests
- category = CAT_MISCFOOD
+ subcategory = CAT_MISCFOOD
code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+28 -28
View File
@@ -11,7 +11,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/donut
time = 15
@@ -21,7 +21,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/jellydonut
name = "Jelly donut"
@@ -30,7 +30,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/cherryjellydonut
name = "Cherry jelly donut"
@@ -39,7 +39,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/slimejellydonut
name = "Slime jelly donut"
@@ -48,7 +48,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/slimejelly
category = CAT_PASTRY
subcategory = CAT_PASTRY
////////////////////////////////////////////////WAFFLES////////////////////////////////////////////////
@@ -59,7 +59,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/waffles
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/soylenviridians
@@ -69,7 +69,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/soylentgreen
name = "Soylent green"
@@ -78,7 +78,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/rofflewaffles
@@ -88,7 +88,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
category = CAT_PASTRY
subcategory = CAT_PASTRY
////////////////////////////////////////////////DONKPOCCKETS////////////////////////////////////////////////
@@ -100,7 +100,7 @@
/obj/item/weapon/reagent_containers/food/snacks/faggot = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/dankpocket
time = 15
@@ -110,7 +110,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/dankpocket
category = CAT_PASTRY
subcategory = CAT_PASTRY
////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
@@ -122,7 +122,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/berrymuffin
name = "Berry muffin"
@@ -132,7 +132,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/berries = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin/berry
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/booberrymuffin
name = "Booberry muffin"
@@ -143,7 +143,7 @@
/obj/item/weapon/ectoplasm = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/chawanmushi
name = "Chawanmushi"
@@ -154,7 +154,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi
category = CAT_PASTRY
subcategory = CAT_PASTRY
////////////////////////////////////////////OTHER////////////////////////////////////////////
@@ -166,7 +166,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sausage = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/hotdog
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/meatbun
name = "Meat bun"
@@ -177,7 +177,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatbun
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/khachapuri
name = "Khachapuri"
@@ -187,7 +187,7 @@
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/khachapuri
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/sugarcookie
time = 15
@@ -197,7 +197,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/fortunecookie
time = 15
@@ -210,7 +210,7 @@
/obj/item/weapon/paper = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/poppypretzel
time = 15
@@ -220,7 +220,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/plumphelmetbiscuit
time = 15
@@ -230,7 +230,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/cracker
time = 15
@@ -240,7 +240,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/cracker
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/chococornet
name = "Choco cornet"
@@ -250,7 +250,7 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/chococornet
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/oatmealcookie
name = "Oatmeal cookie"
@@ -268,7 +268,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/oat = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/raisincookie
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/cherrycupcake
name = "Cherry cupcake"
@@ -277,7 +277,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/cherrycupcake
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/bluecherrycupcake
name = "Blue cherry cupcake"
@@ -286,7 +286,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/bluecherrycupcake
category = CAT_PASTRY
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/honeybun
name = "Honey bun"
@@ -295,4 +295,4 @@
/datum/reagent/consumable/honey = 5
)
result = /obj/item/weapon/reagent_containers/food/snacks/honeybun
category = CAT_PASTRY
subcategory = CAT_PASTRY
code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
+16 -16
View File
@@ -11,7 +11,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/cream
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/meatpie
name = "Meat pie"
@@ -22,7 +22,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/meatpie
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/tofupie
name = "Tofu pie"
@@ -31,7 +31,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tofu = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/tofupie
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/xenopie
name = "Xeno pie"
@@ -40,7 +40,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/xemeatpie
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/cherrypie
name = "Cherry pie"
@@ -49,7 +49,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/cherrypie
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/berryclafoutis
name = "Berry clafoutis"
@@ -58,7 +58,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/berries = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/berryclafoutis
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/bearypie
name = "Beary Pie"
@@ -68,7 +68,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/bearypie
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/amanitapie
name = "Amanita pie"
@@ -77,7 +77,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/amanita_pie
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/plumppie
name = "Plump pie"
@@ -86,7 +86,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/plump_pie
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/applepie
name = "Apple pie"
@@ -95,7 +95,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/applepie
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/pumpkinpie
name = "Pumpkin pie"
@@ -106,7 +106,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/pumpkinpie
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/goldenappletart
name = "Golden apple tart"
@@ -117,7 +117,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/appletart
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/grapetart
name = "Grape tart"
@@ -128,7 +128,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/grapetart
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/blumpkinpie
name = "Blumpkin pie"
@@ -139,7 +139,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/blumpkinpie
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/dulcedebatata
name = "Dulce de batata"
@@ -149,7 +149,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/dulcedebatata
category = CAT_PIE
subcategory = CAT_PIE
/datum/crafting_recipe/food/frostypie
name = "Frosty pie"
@@ -158,4 +158,4 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/frostypie
category = CAT_PIE
subcategory = CAT_PIE
code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
+7 -7
View File
@@ -11,7 +11,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pizza/margherita
category = CAT_PIZZA
subcategory = CAT_PIZZA
/datum/crafting_recipe/food/meatpizza
name = "Meat pizza"
@@ -22,7 +22,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pizza/meat
category = CAT_PIZZA
subcategory = CAT_PIZZA
/datum/crafting_recipe/food/mushroompizza
name = "Mushroom pizza"
@@ -31,7 +31,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom = 5
)
result = /obj/item/weapon/reagent_containers/food/snacks/pizza/mushroom
category = CAT_PIZZA
subcategory = CAT_PIZZA
/datum/crafting_recipe/food/vegetablepizza
name = "Vegetable pizza"
@@ -43,7 +43,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pizza/vegetable
category = CAT_PIZZA
subcategory = CAT_PIZZA
/datum/crafting_recipe/food/donpocketpizza
name = "Donkpocket pizza"
@@ -54,7 +54,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pizza/donkpocket
category = CAT_PIZZA
subcategory = CAT_PIZZA
/datum/crafting_recipe/food/dankpizza
name = "Dank pizza"
@@ -65,7 +65,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pizza/dank
category = CAT_PIZZA
subcategory = CAT_PIZZA
/datum/crafting_recipe/food/sassysagepizza
name = "Sassysage pizza"
@@ -76,4 +76,4 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pizza/sassysage
category = CAT_PIZZA
subcategory = CAT_PIZZA
code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
+11 -11
View File
@@ -11,7 +11,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad
category = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/aesirsalad
name = "Aesir salad"
@@ -21,7 +21,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/salad/aesirsalad
category = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/validsalad
name = "Valid salad"
@@ -32,7 +32,7 @@
/obj/item/weapon/reagent_containers/food/snacks/faggot = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/salad/validsalad
category = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/monkeysdelight
name = "Monkeys delight"
@@ -45,7 +45,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight
category = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/oatmeal
name = "Oatmeal"
@@ -55,7 +55,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/oat = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/salad/oatmeal
category = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/fruitsalad
name = "Fruit salad"
@@ -68,7 +68,7 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/salad/fruit
category = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/junglesalad
name = "Jungle salad"
@@ -81,7 +81,7 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/salad/jungle
category = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/citrusdelight
name = "Citrus delight"
@@ -93,7 +93,7 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/salad/citrusdelight
category = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/ricepork
name = "Rice and pork"
@@ -102,7 +102,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/salad/ricepork
category = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/eggbowl
name = "Egg bowl"
@@ -113,7 +113,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/corn = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/salad/eggbowl
category = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/ricepudding
name = "Rice pudding"
@@ -123,4 +123,4 @@
/obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/salad/ricepudding
category = CAT_SALAD
subcategory = CAT_SALAD
code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+6 -6
View File
@@ -14,7 +14,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/sandwich
category = CAT_SANDWICH
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/grilledcheesesandwich
name = "Grilled cheese sandwich"
@@ -23,7 +23,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese
category = CAT_SANDWICH
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/slimesandwich
name = "Jelly sandwich"
@@ -32,7 +32,7 @@
/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2,
)
result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime
category = CAT_SANDWICH
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/cherrysandwich
name = "Jelly sandwich"
@@ -41,7 +41,7 @@
/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2,
)
result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
category = CAT_SANDWICH
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/icecreamsandwich
name = "Icecream sandwich"
@@ -51,7 +51,7 @@
/obj/item/weapon/reagent_containers/food/snacks/icecream = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
category = CAT_SANDWICH
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/notasandwich
name = "Not a sandwich"
@@ -60,7 +60,7 @@
/obj/item/clothing/mask/fakemoustache = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/notasandwich
category = CAT_SANDWICH
subcategory = CAT_SANDWICH
code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+21 -21
View File
@@ -13,7 +13,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/potato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/meatball
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/vegetablesoup
name = "Vegetable soup"
@@ -26,7 +26,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/potato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/vegetable
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/nettlesoup
name = "Nettle soup"
@@ -38,7 +38,7 @@
/obj/item/weapon/reagent_containers/food/snacks/boiledegg = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/nettle
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/wingfangchu
name = "Wingfangchu"
@@ -48,7 +48,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/wingfangchu
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/wishsoup
name = "Wish soup"
@@ -57,7 +57,7 @@
/obj/item/weapon/reagent_containers/glass/bowl = 1
)
result= /obj/item/weapon/reagent_containers/food/snacks/soup/wish
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/hotchili
name = "Hot chili"
@@ -68,7 +68,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/hotchili
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/coldchili
name = "Cold chili"
@@ -79,7 +79,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/coldchili
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/tomatosoup
name = "Tomato soup"
@@ -89,7 +89,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/eyeballsoup
name = "Eyeball soup"
@@ -100,7 +100,7 @@
/obj/item/organ/eyes = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato/eyeball
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/milosoup
@@ -112,7 +112,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tofu = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/milo
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/bloodsoup
name = "Blood soup"
@@ -122,7 +122,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/blood
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/slimesoup
name = "Slime soup"
@@ -132,7 +132,7 @@
/obj/item/weapon/reagent_containers/glass/bowl = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/slime
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/clownstears
name = "Clowns tears"
@@ -143,7 +143,7 @@
/obj/item/weapon/ore/bananium = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/clownstears
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/mysterysoup
name = "Mystery soup"
@@ -156,7 +156,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/mystery
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/mushroomsoup
name = "Mushroom soup"
@@ -167,7 +167,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/mushroom
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/beetsoup
name = "Beet soup"
@@ -178,7 +178,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/beet
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/stew
name = "Stew"
@@ -193,7 +193,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/stew
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/spacylibertyduff
name = "Spacy liberty duff"
@@ -203,7 +203,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/spacylibertyduff
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/amanitajelly
name = "Amanita jelly"
@@ -213,7 +213,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/amanitajelly
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/sweetpotatosoup
name = "Sweet potato soup"
@@ -224,7 +224,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/sweetpotato
category = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/redbeetsoup
name = "Red beet soup"
@@ -235,4 +235,4 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/beet/red
category = CAT_SOUP
subcategory = CAT_SOUP
code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
+7 -7
View File
@@ -10,7 +10,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato
category = CAT_SPAGHETTI
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/copypasta
name = "Copypasta"
@@ -18,7 +18,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastatomato = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/copypasta
category = CAT_SPAGHETTI
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/spaghettimeatball
name = "Spaghetti meatball"
@@ -27,7 +27,7 @@
/obj/item/weapon/reagent_containers/food/snacks/faggot = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti
category = CAT_SPAGHETTI
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/spesslaw
name = "Spesslaw"
@@ -36,7 +36,7 @@
/obj/item/weapon/reagent_containers/food/snacks/faggot = 4
)
result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
category = CAT_SPAGHETTI
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/beefnoodle
name = "Beef noodle"
@@ -47,7 +47,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/beefnoodle
category = CAT_SPAGHETTI
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/chowmein
name = "Chowmein"
@@ -58,7 +58,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/chowmein
category = CAT_SPAGHETTI
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/butternoodles
name = "Butter Noodles"
@@ -67,4 +67,4 @@
/obj/item/weapon/reagent_containers/food/snacks/butter = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/butternoodles
category = CAT_SPAGHETTI
subcategory = CAT_SPAGHETTI