Skip to content

Commit

Permalink
[NeoDays] Exodii cleaning (#1501)
Browse files Browse the repository at this point in the history
* added: exodii quadruped (based on Erk's work left in scratch, exodii worker
trimmed: broken cyborg

* changed: exodii lights to orange
fixed: exodii quadruped in wrong tilesheet
added: upcycled turret

* cleaned: 20x20 monsters

* cleaned: robot monsters directory
moved: mon_turret_shockcannon to monsters/robots, 2520_bot_cyberdemon_0 to monsters/mod/unknown

* cleaned: metal grate
connected: scrap metal bridge to metal grate

* added: scrap metal table
changed: some bed and wood table connections to be more consistent

* added: various metal crates

* cleaned: furniture/storage

* added: ground cable/wall wiring/wall_wiring[item]. not entirely confident in design.

* changed: ground cable to alternating blue from feedback

* added: metal benches
cleaned: standard benches

* connected: foot locker to metal crate

* cleaned: furniture/outdoors
cleaned: still, robotic arm
moved: robotic arm terrain > furniture/tool

* fixed: bad json

* cleaned: furniture/exercise
trimmed: ergometer

* made punching bag from floor canvas

* changed: ground cables now orange

* removed: wall wiring from ground cable json

* removed: zombie hulk json
  • Loading branch information
Golfavel authored Aug 24, 2022
1 parent a83b545 commit 5419d15
Show file tree
Hide file tree
Showing 289 changed files with 325 additions and 138 deletions.

This file was deleted.

1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_large_20x20/monsters/mon_claygolem.json

This file was deleted.

1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_large_20x20/monsters/mon_devourer.json

This file was deleted.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_large_20x20/monsters/mon_flesh_golem.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_large_20x20/monsters/mon_irongolem.json

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_large_20x20/monsters/mon_stonegolem.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file modified gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_bed_2.png
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/indoors/f_bed_4.png
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/indoors/f_bed_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_metal_table.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"id": "f_metal_table",
"fg": "f_metal_table_0",
"rotates": false,
"multitile": true,
"additional_tiles": [
{
"id": "center",
"fg": "f_metal_table_1"
},
{
"id": "corner",
"fg": "f_metal_table_2"
},
{
"id": "edge",
"fg": "f_metal_table_3"
},
{
"id": "end_piece",
"fg": "f_metal_table_4"
},
{
"id": "t_connection",
"fg": "f_metal_table_5"
},
{
"id": "unconnected",
"fg": "f_metal_table_0"
}
]
}
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 modified gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_table_2.png
Binary file modified gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_table_4.png
Binary file modified gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_table_5.png
Diff not rendered.

This file was deleted.

12 changes: 12 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_bench.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"id": "f_bench",
"fg": "f_bench_0",
"rotates": true,
"multitile": true,
"additional_tiles": [
{
"id": "t_connection",
"fg": "f_bench_1"
}
]
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"id": [
"f_egg_sackcs",
"mon_trapdoor_egg",
"f_egg_sackbw"
],
"fg": "f_egg_sackcs"
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

5 changes: 5 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_ladder.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "f_ladder",
"fg": "f_ladder",
"//": "file 'vp_travois_0.json is the cause of this file"
}

This file was deleted.

This file was deleted.

This file was deleted.

12 changes: 12 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_metal_bench.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"id": "f_metal_bench",
"fg": "f_metal_bench_0",
"rotates": true,
"multitile": true,
"additional_tiles": [
{
"id": "t_connection",
"fg": "f_metal_bench_1"
}
]
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"id": "f_rubble_landfill",
"fg": "189_t_pit_corpsed_0",
"bg": "f_rubble_landfill",
"rotates": true,
"multitile": true,
"additional_tiles": [
{
"id": "center",
"bg": "f_rubble_landfill"
},
{
"id": "corner",
"fg": "190_t_pit_corpsed_2",
"bg": "f_rubble_landfill"
},
{
"id": "edge",
"fg": "191_t_pit_corpsed_3",
"bg": "f_rubble_landfill"
},
{
"id": "end_piece",
"fg": "192_t_pit_corpsed_4",
"bg": "f_rubble_landfill"
},
{
"id": "t_connection",
"fg": "193_t_pit_corpsed_5",
"bg": "f_rubble_landfill"
},
{
"id": "unconnected",
"fg": "189_t_pit_corpsed_0",
"bg": "f_rubble_landfill"
}
]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"id": "f_rubble_landfill_season_winter",
"fg": "189_t_pit_corpsed_0",
"bg": "f_rubble_landfill_season_winter",
"rotates": true,
"multitile": true,
"additional_tiles": [
{
"id": "center",
"bg": "f_rubble_landfill_season_winter"
},
{
"id": "corner",
"fg": "190_t_pit_corpsed_2",
"bg": "f_rubble_landfill_season_winter"
},
{
"id": "edge",
"fg": "191_t_pit_corpsed_3",
"bg": "f_rubble_landfill_season_winter"
},
{
"id": "end_piece",
"fg": "192_t_pit_corpsed_4",
"bg": "f_rubble_landfill_season_winter"
},
{
"id": "t_connection",
"fg": "193_t_pit_corpsed_5",
"bg": "f_rubble_landfill_season_winter"
},
{
"id": "unconnected",
"fg": "189_t_pit_corpsed_0",
"bg": "f_rubble_landfill_season_winter"
}
]
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"f_sign",
"f_bulletin"
],
"fg": "f_sign"
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"f_statue",
"t_sliding_brick_wall_control"
],
"fg": "f_statue"
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"still",
"f_still"
],
"fg": "still"
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"f_cupboard",
"t_sai_box"
],
"fg": "f_cupboard"
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"f_filing_cabinet",
"f_file_cabinet"
],
"fg": "f_filing_cabinet"
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"f_locker",
"t_switchgear_s"
],
"fg": "f_locker"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"f_metal_crate_c",
"f_foot_locker"
],
"fg": "f_metal_crate_c"
}
Loading

0 comments on commit 5419d15

Please sign in to comment.