[Ultica-ISO] Add (kitchen) furniture (I-am-Erk#1614)

* make rotating desks * change order of rotates sprites to match CleverRaven/Cataclysm-DDA#61224 * make cupboards rotate away from walls * add multitile bed * add Ultica-ISO fridge * add Ultica-ISO ovens * tweak inner connections for counter, sink and cupboard; prep for counter gates
Maleclypse · Sep 27, 2022 · bd9e1a5 · bd9e1a5
1 parent d26d239
commit bd9e1a5
Show file tree

Hide file tree

Showing 157 changed files with 109 additions and 26 deletions.
diff --git a/gfx/Ultica_iso/pngs_iso_extra_tall_48x144/furniture/f_traffic_light/f_traffic_light.json b/gfx/Ultica_iso/pngs_iso_extra_tall_48x144/furniture/f_traffic_light/f_traffic_light.json
@@ -6,10 +6,10 @@
     {
       "id": "unconnected",
       "fg": [
-        "f_traffic_light_rotN",
-        "f_traffic_light_rotE",
         "f_traffic_light_rotS",
-        "f_traffic_light_rotW"
+        "f_traffic_light_rotW",
+        "f_traffic_light_rotN",
+        "f_traffic_light_rotE"
       ]
     }
   ]

diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_center.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_center.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_corner_ne.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_corner_ne.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_corner_nw.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_corner_nw.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_corner_se.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_corner_se.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_corner_sw.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_corner_sw.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_edge_ew.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_edge_ew.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_edge_ns.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_edge_ns.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_end_piece_e.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_end_piece_e.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_end_piece_n.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_end_piece_n.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_end_piece_s.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_end_piece_s.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_end_piece_w.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_end_piece_w.png
diff --git a/...Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_t_connection_e.png b/...Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_t_connection_e.png
diff --git a/...Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_t_connection_n.png b/...Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_t_connection_n.png
diff --git a/...Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_t_connection_s.png b/...Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_t_connection_s.png
diff --git a/...Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_t_connection_w.png b/...Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_t_connection_w.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_unconnected.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/f_counter_unconnected.png
diff --git a/...ica_iso/pngs_iso_full_48x72/furniture/f_counter/scratch/f_counter_multitile.png b/...ica_iso/pngs_iso_full_48x72/furniture/f_counter/scratch/f_counter_multitile.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/scratch/f_counter_multitile.xcf b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_counter/scratch/f_counter_multitile.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard.json b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard.json
@@ -1,6 +1,6 @@
 {
   "id": "f_cupboard",
-  "fg": "f_cupboard_unconnected",
+  "fg": "f_cupboard_unconnected_faceS",
   "height_3d": 30,
   "multitile": true,
   "additional_tiles": [
@@ -29,24 +29,32 @@
     {
       "id": "edge",
       "fg": [
-        "f_cupboard_edge_ns",
-        "f_cupboard_edge_ew"
+        "f_cupboard_edge_ns_faceW",
+        "f_cupboard_edge_ew_faceS",
+        "f_cupboard_edge_ns_faceE",
+        "f_cupboard_edge_ew_faceN"
       ]
     },
     {
       "id": "end_piece",
       "fg": [
-        "f_cupboard_end_piece_n",
-        "f_cupboard_end_piece_w",
-        "f_cupboard_end_piece_s",
-        "f_cupboard_end_piece_e"
+        "f_cupboard_end_piece_n_faceW",
+        "f_cupboard_end_piece_w_faceS",
+        "f_cupboard_end_piece_s_faceW",
+        "f_cupboard_end_piece_e_faceS",
+        "f_cupboard_end_piece_n_faceE",
+        "f_cupboard_end_piece_w_faceN",
+        "f_cupboard_end_piece_s_faceE",
+        "f_cupboard_end_piece_e_faceN"
       ]
     },
     {
       "id": "unconnected",
       "fg": [
-        "f_cupboard_unconnected",
-        "f_cupboard_unconnected"
+        "f_cupboard_unconnected_faceS",
+        "f_cupboard_unconnected_faceW",
+        "f_cupboard_unconnected_faceN",
+        "f_cupboard_unconnected_faceE"
       ]
     }
   ]

diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_center.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_center.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_corner_ne.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_corner_ne.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_corner_nw.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_corner_nw.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_corner_se.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_corner_se.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_corner_sw.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_corner_sw.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ew.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ew.png
diff --git a/...ltica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ew_faceN.png b/...ltica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ew_faceN.png
diff --git a/...ltica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ew_faceS.png b/...ltica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ew_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ns.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ns.png
diff --git a/...ltica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ns_faceE.png b/...ltica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ns_faceE.png
diff --git a/...ltica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ns_faceW.png b/...ltica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_edge_ns_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_e.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_e.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_e_faceN.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_e_faceN.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_e_faceS.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_e_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_n.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_n.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_n_faceE.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_n_faceE.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_n_faceW.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_n_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_s.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_s.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_s_faceE.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_s_faceE.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_s_faceW.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_s_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_w.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_w.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_w_faceN.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_w_faceN.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_w_faceS.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_end_piece_w_faceS.png
diff --git a/...tica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_t_connection_e.png b/...tica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_t_connection_e.png
diff --git a/...tica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_t_connection_n.png b/...tica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_t_connection_n.png
diff --git a/...tica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_t_connection_s.png b/...tica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_t_connection_s.png
diff --git a/...tica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_t_connection_w.png b/...tica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_t_connection_w.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_unconnected.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_unconnected.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_unconnected_faceE.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_unconnected_faceE.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_unconnected_faceN.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_unconnected_faceN.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_unconnected_faceS.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_unconnected_faceS.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_unconnected_faceW.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/f_cupboard_unconnected_faceW.png
diff --git a/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/scratch/f_cupboard_multitile.png b/...a_iso/pngs_iso_full_48x72/furniture/f_cupboard/scratch/f_cupboard_multitile.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/scratch/f_cupboard_multitile.xcf b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_cupboard/scratch/f_cupboard_multitile.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk.json b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk.json
@@ -1,6 +1,6 @@
 {
   "id": "f_desk",
-  "fg": "f_desk_unconnected",
+  "fg": "f_desk_unconnected_faceS",
   "height_3d": 26,
   "multitile": true,
   "additional_tiles": [
@@ -29,24 +29,32 @@
     {
       "id": "edge",
       "fg": [
-        "f_desk_edge_ns",
-        "f_desk_edge_ew"
+        "f_desk_edge_ns_faceW",
+        "f_desk_edge_ew_faceS",
+        "f_desk_edge_ns_faceE",
+        "f_desk_edge_ew_faceN"
       ]
     },
     {
       "id": "end_piece",
       "fg": [
-        "f_desk_end_piece_n",
-        "f_desk_end_piece_w",
-        "f_desk_end_piece_s",
-        "f_desk_end_piece_e"
+        "f_desk_end_piece_n_faceW",
+        "f_desk_end_piece_w_faceS",
+        "f_desk_end_piece_s_faceW",
+        "f_desk_end_piece_e_faceS",
+        "f_desk_end_piece_n_faceE",
+        "f_desk_end_piece_w_faceN",
+        "f_desk_end_piece_s_faceE",
+        "f_desk_end_piece_e_faceN"
       ]
     },
     {
       "id": "unconnected",
       "fg": [
-        "f_desk_unconnected",
-        "f_desk_unconnected"
+        "f_desk_unconnected_faceS",
+        "f_desk_unconnected_faceW",
+        "f_desk_unconnected_faceN",
+        "f_desk_unconnected_faceE"
       ]
     }
   ]

diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_center.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_center.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_corner_ne.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_corner_ne.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_corner_nw.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_corner_nw.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_corner_se.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_corner_se.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_corner_sw.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_corner_sw.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ew.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ew.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ew_faceN.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ew_faceN.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ew_faceS.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ew_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ns.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ns.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ns_faceE.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ns_faceE.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ns_faceW.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_edge_ns_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_e.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_e.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_e_faceN.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_e_faceN.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_e_faceS.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_e_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_n.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_n.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_n_faceE.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_n_faceE.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_n_faceW.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_n_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_s.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_s.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_s_faceE.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_s_faceE.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_s_faceW.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_s_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_w.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_w.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_w_faceN.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_w_faceN.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_w_faceS.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_end_piece_w_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_t_connection_e.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_t_connection_e.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_t_connection_n.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_t_connection_n.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_t_connection_s.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_t_connection_s.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_t_connection_w.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_t_connection_w.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_unconnected.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_unconnected.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_unconnected_faceE.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_unconnected_faceE.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_unconnected_faceN.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_unconnected_faceN.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_unconnected_faceS.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_unconnected_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_unconnected_faceW.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/f_desk_unconnected_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/scratch/f_desk_multitile.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/scratch/f_desk_multitile.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/scratch/f_desk_multitile.xcf b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_desk/scratch/f_desk_multitile.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven.json b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven.json
@@ -0,0 +1,7 @@
+{
+  "id": "f_oven",
+  "height_3d": 30,
+  "rotates": true,
+  "fg": [ "f_oven_faceS", "f_oven_faceW", "f_oven_faceN", "f_oven_faceE" ],
+  "bg": ""
+}
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceE.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceE.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceE.xcf b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceE.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceN.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceN.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceN.xcf b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceN.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceS.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceS.xcf b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceS.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceW.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceW.xcf b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_oven/f_oven_faceW.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink.json b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink.json
@@ -51,10 +51,10 @@
     {
       "id": "unconnected",
       "fg": [
-        "f_sink_unconnected_faceN",
-        "f_sink_unconnected_faceE",
         "f_sink_unconnected_faceS",
-        "f_sink_unconnected_faceW"
+        "f_sink_unconnected_faceW",
+        "f_sink_unconnected_faceN",
+        "f_sink_unconnected_faceE"
       ]
     }
   ]

diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_center.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_center.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_corner_ne.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_corner_ne.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_corner_nw.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_corner_nw.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_corner_se.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_corner_se.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_corner_sw.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_corner_sw.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_edge_ew_faceN.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_edge_ew_faceN.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_edge_ew_faceS.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_edge_ew_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_edge_ns_faceE.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_edge_ns_faceE.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_edge_ns_faceW.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_edge_ns_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_e_faceN.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_e_faceN.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_e_faceS.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_e_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_n_faceE.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_n_faceE.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_n_faceW.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_n_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_s_faceE.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_s_faceE.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_s_faceW.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_s_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_w_faceN.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_w_faceN.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_w_faceS.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_end_piece_w_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_t_connection_e.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_t_connection_e.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_t_connection_n.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_t_connection_n.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_t_connection_s.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_t_connection_s.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_t_connection_w.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_t_connection_w.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_unconnected_faceE.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_unconnected_faceE.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_unconnected_faceN.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_unconnected_faceN.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_unconnected_faceS.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_unconnected_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_unconnected_faceW.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/f_sink_unconnected_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/scratch/f_sink_multitile.png b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/scratch/f_sink_multitile.png
diff --git a/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/scratch/f_sink_multitile.xcf b/gfx/Ultica_iso/pngs_iso_full_48x72/furniture/f_sink/scratch/f_sink_multitile.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed.json b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed.json
@@ -0,0 +1,53 @@
+{
+  "id": "f_bed",
+  "fg": "f_bed_unconnected",
+  "height_3d": 15,
+  "multitile": true,
+  "additional_tiles": [
+    {
+      "id": "center",
+      "fg": "f_bed_center"
+    },
+    {
+      "id": "corner",
+      "fg": [
+        "f_bed_corner_nw",
+        "f_bed_corner_sw",
+        "f_bed_corner_se",
+        "f_bed_corner_ne"
+      ]
+    },
+    {
+      "id": "t_connection",
+      "fg": [
+        "f_bed_t_connection_n",
+        "f_bed_t_connection_w",
+        "f_bed_t_connection_s",
+        "f_bed_t_connection_e"
+      ]
+    },
+    {
+      "id": "edge",
+      "fg": [
+        "f_bed_edge_ns",
+        "f_bed_edge_ew"
+      ]
+    },
+    {
+      "id": "end_piece",
+      "fg": [
+        "f_bed_end_piece_n",
+        "f_bed_end_piece_w",
+        "f_bed_end_piece_s",
+        "f_bed_end_piece_e"
+      ]
+    },
+    {
+      "id": "unconnected",
+      "fg": [
+        "f_bed_unconnected",
+        "f_bed_unconnected"
+      ]
+    }
+  ]
+}
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_center.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_center.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_corner_ne.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_corner_ne.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_corner_nw.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_corner_nw.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_corner_se.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_corner_se.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_corner_sw.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_corner_sw.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_edge_ew.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_edge_ew.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_edge_ns.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_edge_ns.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_end_piece_e.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_end_piece_e.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_end_piece_n.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_end_piece_n.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_end_piece_s.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_end_piece_s.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_end_piece_w.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_end_piece_w.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_t_connection_e.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_t_connection_e.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_t_connection_n.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_t_connection_n.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_t_connection_s.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_t_connection_s.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_t_connection_w.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_t_connection_w.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_unconnected.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/f_bed_unconnected.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/scratch/.scratch b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/scratch/.scratch
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/scratch/f_bed_flat_multitile.xcf b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/scratch/f_bed_flat_multitile.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/scratch/f_bed_multitile.png b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/scratch/f_bed_multitile.png
diff --git a/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/scratch/f_bed_multitile.xcf b/gfx/Ultica_iso/pngs_iso_half_48x48/furniture/f_bed/scratch/f_bed_multitile.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge.json b/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge.json
@@ -0,0 +1,7 @@
+{
+  "id": "f_fridge",
+  "height_3d": 28,
+  "rotates": true,
+  "fg": [ "f_fridge_faceS", "f_fridge_faceW", "f_fridge_faceN", "f_fridge_faceE" ],
+  "bg": ""
+}
diff --git a/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceE.png b/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceE.png
diff --git a/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceE.xcf b/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceE.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceN.png b/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceN.png
diff --git a/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceN.xcf b/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceN.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceS.png b/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceS.png
diff --git a/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceS.xcf b/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceS.xcf
diff --git a/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceW.png b/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceW.png
diff --git a/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceW.xcf b/gfx/Ultica_iso/pngs_iso_high_48x96/furniture/f_fridge/f_fridge_faceW.xcf
diff --git a/tools/slice_multitile.py b/tools/slice_multitile.py
@@ -291,8 +291,8 @@ def main(args):
                             f"{args.tile}_end_piece_s_faceE", f"{args.tile}_end_piece_e_faceN"],
                     }, {
                         "id": "unconnected",
-                        "fg": [f"{args.tile}_unconnected_faceN", f"{args.tile}_unconnected_faceE",
-                               f"{args.tile}_unconnected_faceS", f"{args.tile}_unconnected_faceW"],
+                        "fg": [f"{args.tile}_unconnected_faceS", f"{args.tile}_unconnected_faceW",
+                               f"{args.tile}_unconnected_faceN", f"{args.tile}_unconnected_faceE"],
                     }
                 ]
             }