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

Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20

Browse Source 
Ports several food sprites/foods from Baystation/Citadel RP
This commit is contained in:
silicons
2020-07-23 10:35:30 -07:00
committed by GitHub
parent ec72015f4f 82284ae381
commit 9f66163d4f
12 changed files with 166 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/snacks_meat.dm
+31
View File
@@ -174,6 +174,27 @@
tastes = list("meat" = 1, "smoke" = 1)
foodtype = MEAT
/obj/item/reagent_containers/food/snacks/meatloaf
name = "meatloaf"
desc = "Meat! In a loaf!"
icon_state = "meatloaf"
filling_color = "#8f0f0f"
list_reagents = list(/datum/reagent/consumable/nutriment = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/ketchup = 5)
tastes = list("meat" = 1, "ketchup" = 1)
slices_num = 5
slice_path = /obj/item/reagent_containers/food/snacks/meatloaf_slice
foodtype = MEAT
/obj/item/reagent_containers/food/snacks/meatloaf_slice
name = "meatloaf slice"
filling_color = "#8f0f0f"
desc = "Meat! In chunky slices!"
icon_state = "meatloaf_slice"
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ketchup = 1)
tastes = list("meat" = 1, "ketchup" = 1)
foodtype = MEAT
/obj/item/reagent_containers/food/snacks/kebab
trash = /obj/item/stack/rods
icon_state = "kebab"
@@ -302,6 +323,16 @@
desc = "A 'chicken' nugget vaguely shaped like a [shape]."
icon_state = "nugget_[shape]"
/obj/item/reagent_containers/food/snacks/sweet_and_sour
name = "sweet and sour chicken"
desc = "More sweet than sour, but delicious nonetheless."
icon_state = "sweet_and_sour"
filling_color = "#B22222"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/soysauce = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/soysauce = 2)
tastes = list("\"chicken\"" = 1)
foodtype = MEAT | PINEAPPLE
/obj/item/reagent_containers/food/snacks/pigblanket
name = "pig in a blanket"
desc = "A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it."
code/modules/food_and_drinks/food/snacks_other.dm
+20
View File
@@ -557,6 +557,26 @@
tastes = list("butter" = 1)
foodtype = JUNKFOOD
/obj/item/reagent_containers/food/snacks/mashedpotato
name = "mashed potatoes"
desc = "A diced and smashed potato, served with sour cream."
icon_state = "mashedpotato"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/sodiumchloride = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#FFD700"
tastes = list("butter" = 1, "sour cream" = 1)
foodtype = GRAIN
/obj/item/reagent_containers/food/snacks/butteredpotato
name = "buttered potatoes"
desc = "Mashed potatoes served with an ample serving of butter, and sour cream."
icon_state = "buttermash"
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/sodiumchloride = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#FFD700"
tastes = list("potatoes" = 1, "sour cream" = 1, "butter" = 1)
foodtype = GRAIN | DAIRY
/obj/item/reagent_containers/food/snacks/onionrings
name = "onion rings"
desc = "Onion slices coated in batter."
code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
+10
View File
@@ -153,3 +153,13 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("tuna" = 4, "mayonnaise" = 2, "bread" = 2)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/meatballsub
name = "meatball sub"
desc = "At some point, you need to be the cheif sub."
icon = 'icons/obj/food/food.dmi'
icon_state = "meatballsub"
list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("meat" = 2, "toasted bread" = 1)
foodtype = GRAIN | MEAT
code/modules/food_and_drinks/food/snacks_soup.dm
+19
View File
@@ -125,6 +125,15 @@
tastes = list("tomato" = 1, "mint" = 1)
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/soup/bearchili
name = "bear chili"
desc = "Sensationally seasoned bear meat diced up with some peppers."
icon_state = "bearchili"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/capsaicin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/medicine/morphine = 5, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/capsaicin = 5)
tastes = list("the outdoors" = 1, "hot peppers" = 1)
foodtype = VEGETABLES | MEAT
/obj/item/reagent_containers/food/snacks/soup/monkeysdelight
name = "monkey's delight"
desc = "A delicious soup with dumplings and hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas."
@@ -253,6 +262,16 @@
filling_color = "#CC2B52"
foodtype = VEGETABLES | TOXIC
/obj/item/reagent_containers/food/snacks/soup/spiral_soup
name = "spiral soup"
desc = "The swirling of this soup is both frightening, and enticing."
icon_state = "spiral_soup"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 5, /datum/reagent/cryptobiolin = 10, /datum/reagent/toxin/rotatium = 10)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/cryptobiolin = 15, /datum/reagent/toxin/rotatium = 15, /datum/reagent/consumable/liquidelectricity = 2)
tastes = list("the floor" = 1, "the ceiling" = 1, "regret" = 2)
filling_color = "#4476e2"
foodtype = GROSS | TOXIC | VEGETABLES
/obj/item/reagent_containers/food/snacks/soup/bungocurry
name = "bungo curry"
desc = "A spicy vegetable curry made with the humble bungo fruit, Exotic!"
code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+21
View File
@@ -84,6 +84,17 @@
result = /obj/item/reagent_containers/food/snacks/nugget
subcategory = CAT_MEAT
/datum/crafting_recipe/food/sweet_and_sour
name = "Sweet and sour \"chicken\""
reqs = list(
/obj/item/reagent_containers/food/snacks/nugget = 2,
/obj/item/reagent_containers/food/snacks/pineappleslice = 1,
/datum/reagent/consumable/soysauce = 2,
/datum/reagent/consumable/sodiumchloride = 1
)
result = /obj/item/reagent_containers/food/snacks/sweet_and_sour
subcategory = CAT_MEAT
/datum/crafting_recipe/food/corndog
name = "Corndog meal"
reqs = list(
@@ -135,6 +146,16 @@
result = /obj/item/reagent_containers/food/snacks/sausage
subcategory = CAT_MEAT
/datum/crafting_recipe/food/meatloaf
name = "Meatloaf"
reqs = list(
/obj/item/reagent_containers/food/snacks/meat/cutlet = 4,
/datum/reagent/consumable/eggyolk = 10,
/datum/reagent/consumable/ketchup = 5
)
result = /obj/item/reagent_containers/food/snacks/meatloaf
subcategory = CAT_MEAT
/datum/crafting_recipe/food/pigblanket
name = "Pig in a Blanket"
reqs = list(
code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+19
View File
@@ -113,6 +113,25 @@
result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/mashedpotato
name = "Mashed potato"
reqs = list(
/obj/item/reagent_containers/food/snacks/grown/potato = 1,
/datum/reagent/consumable/cream = 5,
/datum/reagent/consumable/sodiumchloride = 1
)
result = /obj/item/reagent_containers/food/snacks/mashedpotato
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/butteredpotato
name = "Buttered mash"
reqs = list(
/obj/item/reagent_containers/food/snacks/mashedpotato = 1,
/obj/item/reagent_containers/food/snacks/butter = 1
)
result = /obj/item/reagent_containers/food/snacks/butteredpotato
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/melonfruitbowl
name ="Melon fruit bowl"
reqs = list(
code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+9
View File
@@ -115,6 +115,15 @@
result = /obj/item/reagent_containers/food/snacks/tuna_sandwich
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/meatballsub
name = "Meatball sub"
reqs = list(
/obj/item/reagent_containers/food/snacks/meatball = 3,
/obj/item/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/reagent_containers/food/snacks/meatballsub
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/hotdog
name = "Hot dog"
reqs = list(
code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+23
View File
@@ -13,6 +13,17 @@
result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly
subcategory = CAT_SOUP
/datum/crafting_recipe/food/bearchili
name = "Bear chili"
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/reagent_containers/food/snacks/meat/steak/bear = 1,
/obj/item/reagent_containers/food/snacks/grown/chili = 1,
)
result = /obj/item/reagent_containers/food/snacks/soup/bearchili
subcategory = CAT_SOUP
/datum/crafting_recipe/food/beetsoup
name = "Beet soup"
reqs = list(
@@ -204,6 +215,18 @@
result = /obj/item/reagent_containers/food/snacks/soup/spacylibertyduff
subcategory = CAT_SOUP
/datum/crafting_recipe/food/spiralsoup
name = "Spiral soup"
reqs = list(
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup = 2,
/datum/reagent/cryptobiolin = 15,
/datum/reagent/toxin/rotatium = 15,
/datum/reagent/consumable/milk = 10
)
result = /obj/item/reagent_containers/food/snacks/soup/spacylibertyduff
subcategory = CAT_SOUP
/datum/crafting_recipe/food/sweetpotatosoup
name = "Sweet potato soup"
reqs = list(