Wood chairs, wood tables, bar stools, more sprites from Eris.

Resources/Prototypes/Construction/structures.yml

@@ -26,7 +26,7 @@
   id: Table
   category: Structures
   icon:
-    sprite: Buildings/table_solid.rsi
+    sprite: Buildings/tables.rsi
     state: plain_preview
   result: Table
   placementmode: SnapgridCenter

Resources/Prototypes/Entities/Buildings/furniture.yml

@@ -13,6 +13,17 @@
     sprite: Buildings/furniture.rsi
     state: stool_base
 
+- type: entity
+  name: bar stool
+  id: StoolBar
+  parent: Stool
+  components:
+  - type: Sprite
+    state: bar_stool
+    color: "white"
+  - type: Icon
+    state: bar_stool
+
 - type: entity
   name: White Office Chair
   id: ChairOfficeLight
@@ -57,3 +68,15 @@
   - type: Icon
     sprite: Buildings/furniture.rsi
     state: chair
+
+
+- type: entity
+  name: Wooden Chair
+  id: ChairWood
+  parent: Chair
+  components:
+  - type: Sprite
+    state: wooden_chair
+    color: "white"
+  - type: Icon
+    state: wooden_chair

Resources/Prototypes/Entities/Buildings/table.yml

@@ -7,10 +7,10 @@
   - type: PlaceableSurface
   - type: Sprite
     netsync: false
-    sprite: Buildings/table_solid.rsi
+    sprite: Buildings/tables.rsi
 
   - type: Icon
-    sprite: Buildings/table_solid.rsi
+    sprite: Buildings/tables.rsi
     state: plain_preview
 
   - type: Collidable
@@ -29,3 +29,16 @@
   - type: Destructible
     thresholdvalue: 50
     spawnondestroy: TableParts
+
+- type: entity
+  id: TableWood
+  parent: Table
+  name: "wood table"
+  components:
+  - type: IconSmooth
+    base: wood_
+
+  - type: Damageable
+  - type: Destructible
+    thresholdvalue: 50
+    spawnondestroy: TableParts

Resources/Textures/Buildings/furniture.rsi/meta.json

@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "chair", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "officechair_dark", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "officechair_white", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "stool_base", "directions": 1, "delays": [[1.0]]}]}
+{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "armchair_preview", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "bar_chair", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "bar_chair_over", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "bar_stool", "directions": 1, "delays": [[1.0]]}, {"name": "bed", "directions": 1, "delays": [[1.0]]}, {"name": "bed_padding", "directions": 1, "delays": [[1.0]]}, {"name": "blank", "directions": 1, "delays": [[1.0]]}, {"name": "chair", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "chair_armrest", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "chair_padding", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "chair_padding_over", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "chair_preview", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "comfychair_preview", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "officechair_dark", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "officechair_white", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "onestar_chair_grey", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "onestar_chair_red", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "psychbed", "directions": 1, "delays": [[1.0]]}, {"name": "psychbed_padding", "directions": 1, "delays": [[1.0]]}, {"name": "shuttle_chair", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "stool_base", "directions": 1, "delays": [[1.0]]}, {"name": "stool_padded_preview", "directions": 1, "delays": [[1.0]]}, {"name": "stool_padding", "directions": 1, "delays": [[1.0]]}, {"name": "stool_preview", "directions": 1, "delays": [[1.0]]}, {"name": "w_overlay", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "wheelchair", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "wheelchair_folded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "wooden_chair", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "wooden_chair_wings", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}

Resources/Textures/Buildings/table_solid.rsi/meta.json

@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", "states": [{"name": "plain_preview", "directions": 1, "delays": [[1.0]]}, {"name": "solid_0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}

Resources/Textures/Buildings/tables.rsi/meta.json

@@ -0,0 +1,308 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi",
+  "states": [
+    {
+      "name": "plain_preview",
+      "directions": 1,
+      "delays": [
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "solid_0",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "solid_1",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "solid_2",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "solid_3",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "solid_4",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "solid_5",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "solid_6",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "solid_7",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "wood_0",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "wood_1",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "wood_2",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "wood_3",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "wood_4",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "wood_5",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "wood_6",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "wood_7",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    }
+  ]
+}