diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_ne.png index 614504b96e..1de2b14d3c 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_ne.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_ne.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_nw.png index f9b56b4d67..77d7346097 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_nw.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_nw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_se.png index cff39965c3..afc8c9afa4 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_se.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_se.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_sw.png index b6834c3066..50d8a9b16f 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_sw.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_corner_sw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_edge_ew.png index 1602fe052b..06fd345291 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_edge_ew.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_edge_ew.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_edge_ns.png index 0033cf2f5d..2fff7d2281 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_edge_ns.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_edge_ns.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_e.png index df689b3544..c98d088c5b 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_e.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_n.png index 53eb43af7b..161b651dbc 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_n.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_s.png index 1aa1db7932..2eb7e575c7 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_s.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_w.png index 12c736605e..c12964afc9 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_w.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_end_piece_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_e.png index 89d7e1a624..ee9696120f 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_e.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_n.png index f586452c9d..33f548d3db 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_n.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_s.png index c1344769d7..26d683ad8f 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_s.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_w.png index 467c219fb5..778a0d7104 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_w.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_t_connection_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_unconnected.png index 63cb9af977..0cbaa1283d 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_unconnected.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/shallow/snow_shallow_unconnected.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/snow_deep.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/snow_deep.png index 45b02f06aa..bfc9616813 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/snow_deep.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/snow_deep.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter.png index b14b372bd4..fe925ed17b 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter2.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter2.png index c6b3524a47..ea54d38f1a 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter2.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter2.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter3.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter3.png index ab930abd4d..f401cbb7fb 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter3.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter3.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter4.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter4.png index a0c25686b0..d22069fab6 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter4.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter4.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/vehicle/frames/vp_frame_handle_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/vehicle/frames/vp_frame_handle_0.json index be1892d3a5..55dba93268 100644 --- a/gfx/MShockXotto+/pngs_tiles_32x32/vehicle/frames/vp_frame_handle_0.json +++ b/gfx/MShockXotto+/pngs_tiles_32x32/vehicle/frames/vp_frame_handle_0.json @@ -1 +1,20 @@ -{"id": "vp_frame_handle", "fg": ["4023_vp_frame_handle_0"], "rotates": true, "multitile": true, "additional_tiles": [{"id": "broken", "fg": ["3987_vp_cargo_space_2"], "bg": ["4023_vp_frame_handle_0"]}], "bg": []} \ No newline at end of file +{ + "id": "vp_frame_handle", + "fg": [ + "4023_vp_frame_handle_0" + ], + "rotates": true, + "multitile": true, + "additional_tiles": [ + { + "id": "broken", + "fg": [ + "3987_vp_cargo_space_2" + ], + "bg": [ + "4023_vp_frame_handle_0" + ] + } + ], + "bg": [] +} diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1561_f_sandbag_wall_0.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1561_f_sandbag_wall_0.png new file mode 100644 index 0000000000..7340754296 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1561_f_sandbag_wall_0.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1567_f_sandbag_wall_1.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1567_f_sandbag_wall_1.png new file mode 100644 index 0000000000..5adb212e9a Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1567_f_sandbag_wall_1.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1568_f_sandbag_wall_2.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1568_f_sandbag_wall_2.png new file mode 100644 index 0000000000..8a38222c9f Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1568_f_sandbag_wall_2.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1569_f_sandbag_wall_3.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1569_f_sandbag_wall_3.png new file mode 100644 index 0000000000..ce84f5031f Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1569_f_sandbag_wall_3.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1570_f_sandbag_wall_4.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1570_f_sandbag_wall_4.png new file mode 100644 index 0000000000..85af2d7c24 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1570_f_sandbag_wall_4.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1571_f_sandbag_wall_5.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1571_f_sandbag_wall_5.png new file mode 100644 index 0000000000..21c5070fe2 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1571_f_sandbag_wall_5.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1576_f_slab_0.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1576_f_slab_0.png new file mode 100644 index 0000000000..5c81c584b7 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/1576_f_slab_0.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/f_sandbag_wall_0.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/f_sandbag_wall_0.json new file mode 100644 index 0000000000..1142e352d2 --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/f_sandbag_wall_0.json @@ -0,0 +1 @@ +{"id": "f_sandbag_wall", "fg": ["1561_f_sandbag_wall_0"], "rotates": true, "multitile": true, "additional_tiles": [{"id": "unconnected", "fg": ["1561_f_sandbag_wall_0"], "bg": []}, {"id": "center", "fg": ["1567_f_sandbag_wall_1"], "bg": []}, {"id": "corner", "fg": ["1568_f_sandbag_wall_2"], "bg": []}, {"id": "edge", "fg": ["1569_f_sandbag_wall_3"], "bg": []}, {"id": "end_piece", "fg": ["1570_f_sandbag_wall_4"], "bg": []}, {"id": "t_connection", "fg": ["1571_f_sandbag_wall_5"], "bg": []}], "bg": []} \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/f_slab_0.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/f_slab_0.json new file mode 100644 index 0000000000..61d73bcc60 --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/furniture/f_slab_0.json @@ -0,0 +1 @@ +{"id": "f_slab", "fg": ["1576_f_slab_0"], "bg": []} \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/1707_vp_chime_0.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/1707_vp_chime_0.png new file mode 100644 index 0000000000..8e8ac020a1 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/1707_vp_chime_0.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/4131_vp_robot_controls_0.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/4131_vp_robot_controls_0.png new file mode 100644 index 0000000000..38c4385a07 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/4131_vp_robot_controls_0.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/vp_chime_0.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/vp_chime_0.json new file mode 100644 index 0000000000..186b312ff7 --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/vp_chime_0.json @@ -0,0 +1 @@ +{"id": "vp_chime", "fg": ["1707_vp_chime_0"], "rotates": true, "bg": []} \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/vp_chimes_0.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/vp_chimes_0.json new file mode 100644 index 0000000000..d69494bd1b --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/vp_chimes_0.json @@ -0,0 +1 @@ +{"id": "vp_chimes", "fg": ["1707_vp_chime_0"], "rotates": true, "bg": []} \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/vp_robot_controls_0.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/vp_robot_controls_0.json new file mode 100644 index 0000000000..856344ad40 --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/scrap/vehicle/vp_robot_controls_0.json @@ -0,0 +1 @@ +{"id": "vp_robot_controls", "fg": ["4131_vp_robot_controls_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/3116_t_manhole_0.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/3116_t_manhole_0.png new file mode 100644 index 0000000000..ea8a471c78 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/3116_t_manhole_0.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/3117_t_manhole_cover_0.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/3117_t_manhole_cover_0.png new file mode 100644 index 0000000000..8ae7cd754e Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/3117_t_manhole_cover_0.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_manhole_0.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_manhole_0.json new file mode 100644 index 0000000000..f5558f6966 --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_manhole_0.json @@ -0,0 +1 @@ +{"id": "t_manhole", "fg": ["3116_t_manhole_0"], "bg": ["t_pavement"], "rotates": false} \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_manhole_cover_0.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_manhole_cover_0.json new file mode 100644 index 0000000000..8420077362 --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_manhole_cover_0.json @@ -0,0 +1,12 @@ +[ + { + "id": "t_manhole_cover", + "fg": "3117_t_manhole_cover_0", + "bg": "t_pavement" + }, + { + "id": "manhole_cover", + "fg": "3117_t_manhole_cover_0", + "bg": [] + } +] diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_pit_corpsed.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_pit_corpsed.json new file mode 100644 index 0000000000..ff33f6ca5c --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_pit_corpsed.json @@ -0,0 +1 @@ +{"id": "t_pit_corpsed", "fg": "t_pit_corpsed", "bg": "t_dirt"} \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_pit_corpsed.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_pit_corpsed.png new file mode 100644 index 0000000000..d8ba0fbb45 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/terrain/t_pit_corpsed.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/cracks_dents/3987_vp_cargo_space_2.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/cracks_dents/3987_vp_cargo_space_2.png new file mode 100644 index 0000000000..37def0fcc7 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/cracks_dents/3987_vp_cargo_space_2.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/frames/4023_vp_frame_handle_0.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/frames/4023_vp_frame_handle_0.png new file mode 100644 index 0000000000..0234578a5b Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/frames/4023_vp_frame_handle_0.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/frames/vp_frame_handle_0.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/frames/vp_frame_handle_0.json new file mode 100644 index 0000000000..55dba93268 --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/frames/vp_frame_handle_0.json @@ -0,0 +1,20 @@ +{ + "id": "vp_frame_handle", + "fg": [ + "4023_vp_frame_handle_0" + ], + "rotates": true, + "multitile": true, + "additional_tiles": [ + { + "id": "broken", + "fg": [ + "3987_vp_cargo_space_2" + ], + "bg": [ + "4023_vp_frame_handle_0" + ] + } + ], + "bg": [] +} diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/wheels/4132_vp_roller_drum_0.png b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/wheels/4132_vp_roller_drum_0.png new file mode 100644 index 0000000000..25351e88a2 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/wheels/4132_vp_roller_drum_0.png differ diff --git a/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/wheels/vp_roller_drum_0.json b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/wheels/vp_roller_drum_0.json new file mode 100644 index 0000000000..ad66fb5806 --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_fillerhoder_32x32/MShockXotto+/vehicle/wheels/vp_roller_drum_0.json @@ -0,0 +1 @@ +{"id": "vp_roller_drum", "fg": ["4132_vp_roller_drum_0"], "rotates": true, "multitile": true, "additional_tiles": [{"id": "broken", "fg": ["3987_vp_cargo_space_2"], "bg": ["4132_vp_roller_drum_0"]}], "bg": []} \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/bathroom_scale/bathroom_scale.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/bathroom_scale/bathroom_scale.json new file mode 100644 index 0000000000..85e8f616ae --- /dev/null +++ b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/bathroom_scale/bathroom_scale.json @@ -0,0 +1,5 @@ +{ + "id": "bathroom_scale", + "fg": "bathroom_scale", + "bg": [] +} \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/bathroom_scale/bathroom_scale.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/bathroom_scale/bathroom_scale.png new file mode 100644 index 0000000000..aa26cbd643 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/bathroom_scale/bathroom_scale.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/pedestrian_crossing/t_zebra.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/pedestrian_crossing/t_zebra.json index b0aed073ed..455a63b52f 100644 --- a/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/pedestrian_crossing/t_zebra.json +++ b/gfx/UltimateCataclysm/pngs_incomplete_32x32/terrain/pedestrian_crossing/t_zebra.json @@ -1,5 +1,12 @@ +[ { "id": "t_zebra", - "fg": ["t_zebra"], + "fg": "t_zebra", "bg": [] -} \ No newline at end of file +}, +{ + "id": "t_zebra_season_winter", + "fg": "snow_shallow_center", + "bg": [] +} +] \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/doors/vp_door.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/doors/vp_door.json index 6f2367b679..58d0aee991 100644 --- a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/doors/vp_door.json +++ b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/doors/vp_door.json @@ -1,6 +1,6 @@ [ { - "id": [ "vp_door_interior" ], + "id": [ "vp_door_internal" ], "fg": [ "vp_door_interior_rotN", "vp_door_interior_rotW", "vp_door_interior_rotS", "vp_door_interior_rotE" ], "bg": [ ], "rotates": true, @@ -19,7 +19,7 @@ ] }, { - "id": [ "vp_door", "vp_door_inboard" ], + "id": [ "vp_door", "vp_door_inboard", "vp_door_sliding" ], "fg": "vp_door_inboard", "bg": [ ], "rotates": true, diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/other/utilities.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/other/utilities.json index 03918d8461..26f3396b3d 100644 --- a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/other/utilities.json +++ b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/other/utilities.json @@ -1,6 +1,6 @@ [ { - "id": "vp_veh_table", + "id": ["vp_veh_table", "vp_veh_table_wood"], "fg": [ "veh_table", "veh_table" ], "bg": [ "vp_wooden_aisle_vertical", "vp_wooden_aisle_horizontal" ], "additional_tiles": [ { "id": "broken", "fg": "veh_table_broken", "bg": [ "vp_wooden_aisle_vertical", "vp_wooden_aisle_horizontal" ] } ], @@ -9,7 +9,7 @@ }, { "id": "vp_workbench", - "fg": "f_workbench", + "fg": "vp_workbench", "bg": "t_metal_floor_unconnected" }, { diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/other/vp_workbench.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/other/vp_workbench.png new file mode 100644 index 0000000000..85567c0d2d Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/vehicle/other/vp_workbench.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/overlay/effects/overlay_effects_bleed.png b/gfx/UltimateCataclysm/pngs_normal_32x32/overlay/effects/overlay_effects_bleed.png index 90a5706c85..d6fdaaaed5 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/overlay/effects/overlay_effects_bleed.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/overlay/effects/overlay_effects_bleed.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_ne.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_ne.png index 614504b96e..1de2b14d3c 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_ne.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_ne.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_nw.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_nw.png index f9b56b4d67..77d7346097 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_nw.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_nw.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_se.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_se.png index cff39965c3..afc8c9afa4 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_se.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_se.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_sw.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_sw.png index b6834c3066..50d8a9b16f 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_sw.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_corner_sw.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_edge_ew.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_edge_ew.png index 1602fe052b..06fd345291 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_edge_ew.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_edge_ew.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_edge_ns.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_edge_ns.png index 0033cf2f5d..2fff7d2281 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_edge_ns.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_edge_ns.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_e.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_e.png index df689b3544..c98d088c5b 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_e.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_e.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_n.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_n.png index 53eb43af7b..161b651dbc 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_n.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_n.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_s.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_s.png index 1aa1db7932..2eb7e575c7 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_s.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_s.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_w.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_w.png index 12c736605e..c12964afc9 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_w.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_end_piece_w.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_e.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_e.png index 89d7e1a624..ee9696120f 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_e.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_e.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_n.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_n.png index f586452c9d..33f548d3db 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_n.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_n.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_s.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_s.png index c1344769d7..26d683ad8f 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_s.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_s.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_w.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_w.png index 467c219fb5..778a0d7104 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_w.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_t_connection_w.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_unconnected.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_unconnected.png index 63cb9af977..0cbaa1283d 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_unconnected.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/shallow/snow_shallow_unconnected.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/snow_deep.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/snow_deep.png index 45b02f06aa..bfc9616813 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/snow_deep.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/snow/snow_deep.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter.png index b14b372bd4..fe925ed17b 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter2.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter2.png index c6b3524a47..ea54d38f1a 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter2.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter2.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter3.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter3.png index ab930abd4d..f401cbb7fb 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter3.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter3.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter4.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter4.png index a0c25686b0..d22069fab6 100644 Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter4.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_dirt/t_dirt_winter4.png differ diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_underbrush/t_underbrush.json b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_underbrush/t_underbrush.json index 3c1921d807..e8eb1d5adf 100644 --- a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_underbrush/t_underbrush.json +++ b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_underbrush/t_underbrush.json @@ -38,10 +38,5 @@ "id": "t_underbrush_season_winter", "fg": [ "t_underbrush" ], "bg": [ "snow_deep" ] - }, - { - "id": "t_underbrush_harvested_winter", - "fg": [ "t_underbrush_harvested" ], - "bg": [ "snow_deep" ] } ] diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/terrain/t_gutter_downspout/t_gutter_downspout.json b/gfx/UltimateCataclysm/pngs_tall_32x64/terrain/t_gutter_downspout/t_gutter_downspout.json index b30091b513..d03616c04c 100644 --- a/gfx/UltimateCataclysm/pngs_tall_32x64/terrain/t_gutter_downspout/t_gutter_downspout.json +++ b/gfx/UltimateCataclysm/pngs_tall_32x64/terrain/t_gutter_downspout/t_gutter_downspout.json @@ -1,5 +1,22 @@ +[ { "id": "t_gutter_downspout", - "fg": ["t_gutter_downspout"], - "bg": [] -} \ No newline at end of file + "fg": "t_gutter_downspout", + "bg": "t_dirt_tall" +}, +{ + "id": "t_gutter_downspout_season_autumn", + "fg": "t_gutter_downspout", + "bg": "t_dirt_autumn_tall" +}, +{ + "id": "t_gutter_downspout_season_summer", + "fg": "t_gutter_downspout", + "bg": "t_dirt_summer_tall" +}, +{ + "id": "t_gutter_downspout_season_winter", + "fg": "t_gutter_downspout", + "bg": "snow_shallow_tall" +} +] \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/terrain/t_gutter_downspout/t_gutter_downspout.png b/gfx/UltimateCataclysm/pngs_tall_32x64/terrain/t_gutter_downspout/t_gutter_downspout.png index 50a27416e5..d269fc0bf9 100644 Binary files a/gfx/UltimateCataclysm/pngs_tall_32x64/terrain/t_gutter_downspout/t_gutter_downspout.png and b/gfx/UltimateCataclysm/pngs_tall_32x64/terrain/t_gutter_downspout/t_gutter_downspout.png differ