Bench and fixes (#19748)

* Bench Proto

* Bench sprites

* Update meta.json

* Grammatic fixes

* Update meta.json

* Add files via upload

* Delete Resources/Textures/Structures/Furniture/chairs.rsi/steel-bench-overlay.png

* Meta

* Spaces

Final changes in git web

* Directions fix

Bar and stool fixes

* Final proto fixes

* Physics

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 350d22ea4909cef9ab78ed1764472db8eecd39cb..aaff4e1e288c1aea1d6a8d055c0613ecb9c0642b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -324,3 +324,19 @@
   components:
   - type: Foldable
     folded: true
+
+- type: entity
+  name: steel bench
+  id: SteelBench
+  parent: SeatBase
+  description: A long chair made for a metro. Really standard design.
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+  - type: Anchorable
+  - type: Rotatable
+  - type: Sprite
+    state: steel-bench
+ 

diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
index 613d2a1b153c09ad99eaac76782ee0286c33ec58..f73db12625fa4d11b0cf1990812a9e202ffa17e8 100644 (file)
--- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
@@ -1,91 +1,95 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "bar",
-      "directions": 1
-    },
-    {
-      "name": "bar-knocked",
-      "directions": 1
-    },
-    {
-      "name": "chair",
-      "directions": 4
-    },
-    {
-      "name": "chair-knocked",
-      "directions": 4
-    },
-    {
-      "name": "chair-greyscale",
-      "directions": 4
-    },
-    {
-      "name": "chair-greyscale-knocked",
-      "directions": 4
-    },
-    {
-      "name": "comfy",
-      "directions": 4
-    },
-    {
-      "name": "comfy-overlay",
-      "directions": 4
-    },
-    {
-      "name": "meat",
-      "directions": 4
-    },
-    {
-      "name": "office-dark",
-      "directions": 4
-    },
-    {
-      "name": "office-white",
-      "directions": 4
-    },
-    {
-      "name": "shuttle",
-      "directions": 4
-    },
-    {
-      "name": "shuttle-overlay",
-      "directions": 4
-    },
-    {
-      "name": "stool",
-      "directions": 1
-    },
-    {
-      "name": "stool-knocked",
-      "directions": 1
-    },
-    {
-      "name": "wooden",
-      "directions": 4
-    },
-    {
-      "name": "wooden-wings",
-      "directions": 4
-    },
-    {
-      "name": "wooden-wings-knocked",
-      "directions": 4
-    },
-    {
-      "name": "ritual",
-      "directions": 4
-    },
-    {
-      "name": "cursed",
-      "directions": 4
-    }
-  ]
-}
+{\r
+  "version": 1,\r
+  "license": "CC-BY-SA-3.0",\r
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC",\r
+  "size": {\r
+    "x": 32,\r
+    "y": 32\r
+  },\r
+  "states": [\r
+    {\r
+      "name": "bar",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "bar-knocked",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "chair",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "chair-knocked",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "chair-greyscale",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "chair-greyscale-knocked",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "comfy",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "comfy-overlay",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "meat",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "office-dark",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "office-white",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "shuttle",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "shuttle-overlay",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "stool",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "stool-knocked",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "wooden",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "wooden-wings",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "wooden-wings-knocked",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "ritual",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "cursed",\r
+      "directions": 4\r
+    },\r
+    {\r
+      "name": "steel-bench",\r
+      "directions": 4\r
+    }\r
+  ]\r
+}\r

diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/steel-bench.png b/Resources/Textures/Structures/Furniture/chairs.rsi/steel-bench.png
new file mode 100644 (file)
index 0000000..c554b2c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/steel-bench.png differ