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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Thalpy
2019-07-06 16:03:17 +01:00
committed by GitHub
parent 7fa072030b bd675d3bae
commit cc39c9f896
34 changed files with 248 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/condiment.dm
+2 -1
View File
@@ -24,7 +24,8 @@
"blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
"cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
"sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"),
"mayonnaise" = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."))
"mayonnaise" = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."),
"peanut_butter" = list("peanutbutter", "peanut butter jar", "A deliciously and sticky spread made from peanuts."))
var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
/obj/item/reagent_containers/food/condiment/suicide_act(mob/living/carbon/user)
code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
+40
View File
@@ -52,6 +52,33 @@
list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2)
foodtype = GRAIN | FRUIT
/obj/item/reagent_containers/food/snacks/jellysandwich/pbj
name = "\improper PB & J sandwich"
desc = "A grand creation of peanut butter, jelly and bread! An all-american classic."
icon_state = "pbjsandwich"
tastes = list("bread" = 1, "jelly" = 1, "peanuts" = 1)
/obj/item/reagent_containers/food/snacks/jellysandwich/pbj/cherry
bonus_reagents = list("cherryjelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
foodtype = GRAIN | FRUIT
/obj/item/reagent_containers/food/snacks/jellysandwich/pbj/slime
bonus_reagents = list("slimejelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "slimejelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
foodtype = GRAIN | TOXIC
/obj/item/reagent_containers/food/snacks/peanutbutter_sandwich
name = "peanut butter sandwich"
desc = "You wish you had some jelly to go with this..."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "peanutbuttersandwich"
trash = /obj/item/trash/plate
bitesize = 3
bonus_reagents = list("peanut_butter" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "peanut_butter" = 5, "vitamin" = 2)
foodtype = GRAIN
/obj/item/reagent_containers/food/snacks/notasandwich
name = "not-a-sandwich"
desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
@@ -83,6 +110,19 @@
list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2)
foodtype = GRAIN | TOXIC | SUGAR
/obj/item/reagent_containers/food/snacks/peanut_buttertoast
name = "peanut butter toast"
desc = "A slice of toast covered with delicious peanut butter."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "peanutbuttertoast"
trash = /obj/item/trash/plate
bitesize = 3
bonus_reagents = list("peanut_butter" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 1, "peanut_butter" = 5, "vitamin" = 2)
tastes = list("toast" = 1, "peanuts" = 1)
foodtype = GRAIN
/obj/item/reagent_containers/food/snacks/twobread
name = "two bread"
desc = "This seems awfully bitter."
code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+10 -1
View File
@@ -116,7 +116,7 @@
result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/jelliedyoast
/datum/crafting_recipe/food/jelliedtoast
name = "Jellied toast"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
@@ -125,6 +125,15 @@
result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/peanutbuttertoast
name = "Peanut butter toast"
reqs = list(
/datum/reagent/consumable/peanut_butter = 5,
/obj/item/reagent_containers/food/snacks/breadslice/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/twobread
name = "Two bread"
reqs = list(
code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+42
View File
@@ -43,6 +43,48 @@
result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/pbj_slimesandwich
name = "PB&J sandwich"
reqs = list(
/datum/reagent/toxin/slimejelly = 5,
/datum/reagent/consumable/peanut_butter = 5,
/obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
)
result = /obj/item/reagent_containers/food/snacks/jellysandwich/pbj/slime
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/pbj_slimesandwich/alt
reqs = list(
/obj/item/reagent_containers/food/snacks/jelliedtoast/slime = 1,
/obj/item/reagent_containers/food/snacks/peanut_buttertoast = 1,
)
/datum/crafting_recipe/food/pbj_sandwich
name = "PB&J sandwich"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
/datum/reagent/consumable/peanut_butter = 5,
/obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
)
result = /obj/item/reagent_containers/food/snacks/jellysandwich/pbj/cherry
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/pbj_sandwich/alt
reqs = list(
/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry = 1,
/obj/item/reagent_containers/food/snacks/peanut_buttertoast = 1,
)
/datum/crafting_recipe/peanutbutter_sandwich
name = "Peanut butter sandwich"
reqs = list(
/datum/reagent/consumable/peanut_butter = 5,
/obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
)
result = /obj/item/reagent_containers/food/snacks/peanutbutter_sandwich
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/notasandwich
name = "Not a sandwich"
reqs = list(