Skip to content

Commit

Permalink
the test was a good idea. Found a bunch of missing
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Nov 27, 2023
1 parent 649386b commit 3c95660
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 25 deletions.
11 changes: 11 additions & 0 deletions code/modules/food_and_drinks/food/bread.dm
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,17 @@
tastes = list("bread" = 1)
foodtype = GRAIN

/obj/item/reagent_containers/food/snacks/griddle_toast
name = "griddle toast"
desc = "Thick cut bread, griddled to perfection."
icon = 'icons/obj/food/bread.dmi'
icon_state = "griddle_toast"
item_state = "garlicbread"
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("toast" = 1)
foodtype = GRAIN
w_class = WEIGHT_CLASS_SMALL

/obj/item/reagent_containers/food/snacks/garlicbread
name = "garlic bread"
desc = "Alas, it is limited."
Expand Down
11 changes: 11 additions & 0 deletions code/modules/food_and_drinks/food/egg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,17 @@
tastes = list("rice" = 1, "dried seaweed" = 1, "eggs" = 1)
foodtype = BREAKFAST | FRIED

/obj/item/reagent_containers/food/snacks/eggwrap
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
icon = 'icons/obj/food/egg.dmi'
icon_state = "eggwrap"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
filling_color = "#F0E68C"
tastes = list("egg" = 1)
foodtype = MEAT | GRAIN

/obj/item/reagent_containers/food/snacks/black_eggs
name = "black scrambled eggs"
desc = "A country dish from rural Kalixcis. Made with eggs, animal blood, and foraged greens. Traditionally eaten with rootbread and a spicy sauce."
Expand Down
13 changes: 7 additions & 6 deletions code/modules/food_and_drinks/food/meat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
name = "fish fillet"
desc = "A fillet of fish meat."
icon_state = "fishfillet"
icon = 'icons/obj/food/meat.dmi'
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 6
filling_color = "#FA8072"
Expand Down Expand Up @@ -85,7 +86,7 @@
/obj/item/reagent_containers/food/snacks/vegetariansushiroll
name = "vegetarian sushi roll"
desc = "A roll of simple vegetarian sushi with rice, carrots, and potatoes. Sliceable into pieces!"
icon_state = "vegan-sushi-roll"
icon_state = "vegan_sushi_roll"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#7daa70"
Expand All @@ -97,7 +98,7 @@
/obj/item/reagent_containers/food/snacks/vegetariansushislice
name = "vegetarian sushi slice"
desc = "A slice of simple vegetarian sushi with rice, carrots, and potatoes."
icon_state = "vegan-sushi-slice"
icon_state = "vegan_sushi_slice"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#7daa70"
Expand All @@ -107,7 +108,7 @@
/obj/item/reagent_containers/food/snacks/spicyfiletsushiroll
name = "spicy filet sushi roll"
desc = "A roll of tasty, spicy sushi made with fish and vegetables. Sliceable into pieces!"
icon_state = "spicy-sushi-roll"
icon_state = "spicy_sushi_roll"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#d8b02c"
Expand All @@ -119,7 +120,7 @@
/obj/item/reagent_containers/food/snacks/spicyfiletsushislice
name = "spicy filet sushi slice"
desc = "A slice of tasty, spicy sushi made with fish and vegetables. Don't eat it too fast!."
icon_state = "spicy-sushi-slice"
icon_state = "spicy_sushi_slice"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#d8b02c"
Expand All @@ -137,9 +138,9 @@
foodtype = VEGETABLES

/obj/item/reagent_containers/food/snacks/fishi
name = "Fi-shi roll"
name = "Fi_shi roll"
desc = "An entire fish, surrounded by a thick layer of seaweed. is this... edible?"
icon_state = "fi-shi"
icon_state = "fi_shi"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/toxin/carpotoxin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 18, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/toxin/carpotoxin = 8)
filling_color = "#eac57b"
Expand Down
19 changes: 0 additions & 19 deletions code/modules/food_and_drinks/food/other.dm
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,6 @@
filling_color = "#800000"
foodtype = TOXIC | SUGAR

/obj/item/reagent_containers/food/snacks/eggwrap
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
icon_state = "eggwrap"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
filling_color = "#F0E68C"
tastes = list("egg" = 1)
foodtype = MEAT | GRAIN

/obj/item/reagent_containers/food/snacks/spidereggs
name = "spider eggs"
desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health."
Expand Down Expand Up @@ -874,15 +864,6 @@
foodtype = DAIRY
w_class = WEIGHT_CLASS_SMALL

/obj/item/reagent_containers/food/snacks/griddle_toast
name = "griddle toast"
desc = "Thick cut bread, griddled to perfection."
icon_state = "griddle_toast"
list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("toast" = 1)
foodtype = GRAIN
w_class = WEIGHT_CLASS_SMALL

/obj/item/reagent_containers/food/snacks/pesto
name = "pesto"
desc = "A combination of firm cheese, salt, herbs, garlic, oil, and pine nuts. Frequently used as a sauce for pasta or pizza, or eaten on bread."
Expand Down
Binary file modified icons/obj/food/bread.dmi
Binary file not shown.
Binary file modified icons/obj/food/egg.dmi
Binary file not shown.
Binary file modified icons/obj/food/food.dmi
Binary file not shown.

0 comments on commit 3c95660

Please sign in to comment.