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

Merge remote-tracking branch 'forrest/wewlad' into tos-compliance

Browse Source
This commit is contained in:
Linzolle
2020-04-14 17:33:47 -05:00
parent 79f41bc654 430d179c73
commit f828f4c4b7
24 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/snacks_meat.dm
+4 -4
View File
@@ -132,10 +132,10 @@
tastes = list("meat" = 1, "salmon" = 1)
foodtype = MEAT | ALCOHOL
/obj/item/reagent_containers/food/snacks/faggot
name = "faggot"
desc = "A great meal all round. Not a cord of wood."
icon_state = "faggot"
/obj/item/reagent_containers/food/snacks/meatball
name = "meatball"
desc = "MAMA MIA DAS A SPICY"
icon_state = "meatball"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#800000"
tastes = list("meat" = 1)
code/modules/food_and_drinks/recipes/processor_recipes.dm
+1 -1
View File
@@ -6,7 +6,7 @@
/datum/food_processor_process/meat
input = /obj/item/reagent_containers/food/snacks/meat/slab
output = /obj/item/reagent_containers/food/snacks/faggot
output = /obj/item/reagent_containers/food/snacks/meatball
/datum/food_processor_process/bacon
input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet
code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
+1 -1
View File
@@ -67,7 +67,7 @@
/datum/reagent/consumable/sodiumchloride = 1,
/datum/reagent/consumable/blackpepper = 1,
/obj/item/reagent_containers/food/snacks/boiledegg = 1,
/obj/item/reagent_containers/food/snacks/faggot = 1
/obj/item/reagent_containers/food/snacks/meatball = 1
)
result = /obj/item/reagent_containers/food/snacks/scotchegg
subcategory = CAT_EGG
code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+1 -1
View File
@@ -129,7 +129,7 @@
/datum/crafting_recipe/food/sausage
name = "Sausage"
reqs = list(
/obj/item/reagent_containers/food/snacks/faggot = 1,
/obj/item/reagent_containers/food/snacks/meatball = 1,
/obj/item/reagent_containers/food/snacks/meat/cutlet = 2
)
result = /obj/item/reagent_containers/food/snacks/sausage
code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+2 -2
View File
@@ -37,7 +37,7 @@
name = "Raw Khinkali"
reqs = list(
/obj/item/reagent_containers/food/snacks/doughslice = 1,
/obj/item/reagent_containers/food/snacks/faggot = 1,
/obj/item/reagent_containers/food/snacks/meatball = 1,
/obj/item/reagent_containers/food/snacks/grown/garlic = 1
)
result = /obj/item/reagent_containers/food/snacks/rawkhinkali
@@ -48,7 +48,7 @@
reqs = list(
/datum/reagent/consumable/soysauce = 5,
/obj/item/reagent_containers/food/snacks/bun = 1,
/obj/item/reagent_containers/food/snacks/faggot = 1,
/obj/item/reagent_containers/food/snacks/meatball = 1,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
)
result = /obj/item/reagent_containers/food/snacks/meatbun
code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+1 -1
View File
@@ -177,7 +177,7 @@
name = "Donkpocket"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/faggot = 1
/obj/item/reagent_containers/food/snacks/meatball = 1
)
result = /obj/item/reagent_containers/food/snacks/donkpocket
subcategory = CAT_PASTRY
code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
+1 -1
View File
@@ -71,7 +71,7 @@
name = "Sassysage pizza"
reqs = list(
/obj/item/reagent_containers/food/snacks/pizzabread = 1,
/obj/item/reagent_containers/food/snacks/faggot = 3,
/obj/item/reagent_containers/food/snacks/meatball = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1
)
code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
+1 -1
View File
@@ -80,7 +80,7 @@
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
/obj/item/reagent_containers/food/snacks/grown/potato = 1,
/obj/item/reagent_containers/food/snacks/faggot = 1
/obj/item/reagent_containers/food/snacks/meatball = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/validsalad
subcategory = CAT_SALAD
code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+1 -1
View File
@@ -104,7 +104,7 @@
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/reagent_containers/food/snacks/faggot = 1,
/obj/item/reagent_containers/food/snacks/meatball = 1,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
/obj/item/reagent_containers/food/snacks/grown/potato = 1
)
code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
+2 -2
View File
@@ -15,7 +15,7 @@
name = "Spaghetti meatball"
reqs = list(
/obj/item/reagent_containers/food/snacks/boiledspaghetti = 1,
/obj/item/reagent_containers/food/snacks/faggot = 2
/obj/item/reagent_containers/food/snacks/meatball = 2
)
result = /obj/item/reagent_containers/food/snacks/meatballspaghetti
subcategory = CAT_SPAGHETTI
@@ -24,7 +24,7 @@
name = "Spesslaw"
reqs = list(
/obj/item/reagent_containers/food/snacks/boiledspaghetti = 1,
/obj/item/reagent_containers/food/snacks/faggot = 4
/obj/item/reagent_containers/food/snacks/meatball = 4
)
result = /obj/item/reagent_containers/food/snacks/spesslaw
subcategory = CAT_SPAGHETTI