Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NeoDays] "Food" and other mouth stimulators #2241

Merged
merged 10 commits into from
Dec 11, 2023
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/orange.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"id": [
"orange",
"lulo",
"irradiated_orange"
],
"fg": "orange"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gfx/NeoDays/pngs_tiles_10x10/items/food/honeydew.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"fried_spam",
"meat_aspic",
"hflesh_aspic",
"lobster",
"sashimi"
],
"fg": "fish"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"gastropod_cooked",
"mollusk_cooked"
],
"fg": "gastropod_cooked"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/food/oatmeal_cooked.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"oatmeal_cooked",
"oatmeal_deluxe"
],
"fg": "oatmeal_cooked"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"sandwich_egg_salad_wheat_free",
"fried_egg_sandwich",
"fried_egg_sandwich_wheat_free",
"caviar_egg_sandwich",
"deluxe_fried_egg_sandwich",
"deluxe_fried_egg_sandwich_wheat_free"
],
Expand Down
9 changes: 9 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/food/taco.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"id": [
"taco",
"ndn_taco",
"tiotaco",
"quesadilla_cheese"
],
"fg": "taco"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"garlic_clove",
"rehydrated_garlic"
],
"fg": "garlic_clove"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"raw_burdock",
"cholla_bud"
],
"fg": "raw_burdock"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"id": [
"young_leaves",
"wintergreen_leaves",
"tea_raw",
"tea_green_raw",
"grape_leaves",
"seasoning_italian"
],
"fg": "young_leaves"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"cucumber",
"irradiated_cucumber",
"cattail_stalk",
"japanese_knotweed_stem",
"stick_fiber",
"pickle"
],
Expand Down
35 changes: 19 additions & 16 deletions gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
{
"id": [
"mayonnaise",
"can_coconut",
"yoghurt",
"pudding",
"can_chicken",
"horseradish",
"con_milk",
"flour",
"flour_wheat_free",
"sugar",
"salt",
"meal_bone",
"meal_bone_tainted",
"starch",
"sourdough_young_uncovered",
"sourdough_split_uncovered",
"mayonnaise"
"yoghurt",
"pudding",
"can_chicken",
"horseradish",
"con_milk",
"flour",
"flour_wheat_free",
"sugar",
"salt",
"meal_bone",
"meal_bone_tainted",
"cottage_cheese",
"mascarpone",
"mozzarella_cheese",
"starch",
"sourdough_young_uncovered",
"sourdough_split_uncovered"
],
"fg": ["mayonnaise"]
"fg": "mayonnaise"
}

This file was deleted.

7 changes: 7 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/panacea.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"panacea",
"testcomest"
],
"fg": "panacea"
}
1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/items/panacea_0.json

This file was deleted.

1 change: 1 addition & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"rehydrated_fish",
"milk_powder",
"dry_rice",
"dry_wild_rice",
"rice_cooked",
"beansnrice",
"yeast",
Expand Down
2 changes: 2 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"corn_kernels",
"hot_corn_casserole",
"pan_roasted_corn",
"dry_corn",
"mustard_powder",
"grits"
],
"fg": "can_corn"
Expand Down
1 change: 1 addition & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/piles/chilly-p.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"meat_salted",
"hflesh_salted",
"red_phosphorous",
"rehydrated_chili",
"blood_rice_pudding"
],
"fg": "chilly-p"
Expand Down
2 changes: 2 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/piles/crack.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
"chem_compositionb",
"chem_lead_azide",
"popcorn_raw",
"buttercream",
"garlic_powder",
"wild_rice_cooked"
],
"fg": "crack"
Expand Down
1 change: 1 addition & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/piles/dry_meat.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"iskender",
"cooked_marrow",
"pepperbone",
"dry_chili",
"dry_hflesh"
],
"fg": "dry_meat"
Expand Down
3 changes: 3 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/puddles/milk.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"eggnog_spiked",
"ayran",
"paint_white",
"milkshake",
"milkshake_deluxe",
"milk_fortified",
"liq_bandage"
],
"fg": "milk"
Expand Down
2 changes: 2 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
"wash_moonshine",
"wash_whiskey",
"choc_drink",
"milkshake_choc",
"milkshake_deluxe_choc",
"paint_brown"
],

Expand Down
2 changes: 2 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/puddles/soup_tomato.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
"oxyacetylene",
"tomato_juice",
"red_pen_ink",
"hot_sauce",
"wine_marsala",
"paint_red"
],
"fg": "soup_tomato"
Expand Down
1 change: 1 addition & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/puddles/water.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"saline",
"salt_water",
"sweet_water",
"coconut_water",
"chem_DMSO",
"chem_chloroform",
"chem_phenol",
Expand Down
7 changes: 7 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/sauce_pesto.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"sauce_pesto",
"fertilizer"
],
"fg": "sauce_pesto"
}

This file was deleted.

1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/items/sugar_fried_0.json

This file was deleted.

This file was deleted.