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] Fillout #2195

Merged
merged 15 commits into from
Nov 16, 2023
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_trashcan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"f_drill_press",
"vp_ap_drill_press"
],
"fg": "f_drill_press"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"id": [
"f_freezer",
"vp_ap_freezer"
"vp_ap_freezer",
"f_sample_freezer"
],
"fg": "f_freezer"
}
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.
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.
9 changes: 9 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/emer_blanket.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"id": [
"emer_blanket",
"welding_blanket",
"makeshift_welding_blanket",
"generic_folded_vehicle"
],
"fg": "emer_blanket"
}

This file was deleted.

10 changes: 10 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/engine_block.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"id": [
"engine_block_tiny",
"engine_block_small",
"engine_block_medium",
"engine_block_large",
"engine_block_massive"
],
"fg": "engine_block"
}
Binary file added gfx/NeoDays/pngs_tiles_10x10/items/engine_block.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/family_photo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"id": [
"family_photo",
"wallet_photo",
"polaroid_photo"
],
"fg": "family_photo"
}
1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/items/family_photo_0.json

This file was deleted.

Binary file added gfx/NeoDays/pngs_tiles_10x10/items/pencil_case.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
"teargas_spray",
"chem_washing_soda",
"hominy",
"rebreather_filler_ko2",
"rebreather_filler_soda_lime",
"albuterol"
],
"fg": "can_clams"
Expand Down

This file was deleted.

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

This file was deleted.

14 changes: 14 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/rebreather_filter.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"id": [
"rebreather_filter",
"rebreather_cartridge_regen",
"rebreather_cartridge_o2",
"rebreather_cartridge_air",
"gasfilter_s",
"gasfilter_sm",
"gasfilter_m",
"gasfilter_med",
"gasfilter_l"
],
"fg": "rebreather_filter"
}
Binary file added gfx/NeoDays/pngs_tiles_10x10/items/sharpener.png
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.
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.
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/wallet.png
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/wallet_large.png
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/wallet_leather.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"wallet_leather",
"wallet_stylish"
],
"fg": "wallet_leather"
}