From 6e0466fb2596035d0da6e88a9b14d6176ed97769 Mon Sep 17 00:00:00 2001
From: SonicHDC <100022571+SonicHDC@users.noreply.github.com>
Date: Sun, 10 Sep 2023 00:56:10 +1200
Subject: [PATCH] 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>
---
 .../Entities/Structures/Furniture/chairs.yml  |  16 ++
 .../Structures/Furniture/chairs.rsi/meta.json | 186 +++++++++---------
 .../Furniture/chairs.rsi/steel-bench.png      | Bin 0 -> 876 bytes
 3 files changed, 111 insertions(+), 91 deletions(-)
 create mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/steel-bench.png

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 350d22ea49..aaff4e1e28 100644
--- 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 613d2a1b15..f73db12625 100644
--- 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
-    }
-  ]
-}
+{
+  "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, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bar",
+      "directions": 4
+    },
+    {
+      "name": "bar-knocked",
+      "directions": 4
+    },
+    {
+      "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": 4
+    },
+    {
+      "name": "stool-knocked",
+      "directions": 4
+    },
+    {
+      "name": "wooden",
+      "directions": 4
+    },
+    {
+      "name": "wooden-wings",
+      "directions": 4
+    },
+    {
+      "name": "wooden-wings-knocked",
+      "directions": 4
+    },
+    {
+      "name": "ritual",
+      "directions": 4
+    },
+    {
+      "name": "cursed",
+      "directions": 4
+    },
+    {
+      "name": "steel-bench",
+      "directions": 4
+    }
+  ]
+}
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
index 0000000000000000000000000000000000000000..c554b2c207a2ca50f569d1e0f24fd5fcec891b22
GIT binary patch
literal 876
zcmV-y1C#uTP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0009sNkl<ZcmeHN
zJ<jSd5DZVR;RJLDS_)b^ByPbG;S@+5fr1u9#|bFE_a<Vj#aSCm*yfYGE-?PvnH_KJ
z#7Wm#G6hTlQ@|831xx``z!WeAOaW8C6fgx$fz}il(c$%a{lot?^5gO7uxsFjF#e(e
z&aYOh?(ukp`em&jkH@h0BSrYu1oQ%c4V(wD>-CCau{4{_213L6<#O3A7K>uI((w6w
zMzNm&Cje^TyhadhIT8h)OeO<!aQ<?+RG9!^old8o!;1i@na}4vkpaUD6|fDFwS-x@
z-|yXKv(cKf)g2Cpmk4wMKot-`0@0F5&VYu4NGOpsznlP=0favkDw%-syarVmIA3Zp
z)`aZ^U|4Rq+v2kiuXnqhdMQ90a#7XEPzekvu!{fygIJB^JIOM30&RiJ$qCM50VJjq
zpoaQ%M8hH>_9>Z5EGGceN5k!Q8<hl~PN)5zFG&DT6QvXniRA=%-kp`ge6g!xeQN^#
zkeRkcuq}74VQHe|#-%-p<pj{S2oA`dYgn2nxp8SvVmSf!`#sx>=NgtKN+}`|tLTE4
z>Hro-_N}o9ODt7@)JIeKI7_47$Uouhb^#KHv3F+!d~*9g=H;25HfrYNi|aaei~U^q
z27Ctsfc(3&0T`3FlQkXIu)qb^H6P~uKG^p|d{qHp05>XfAZDEj4@`J$<uf(wzm<a<
zIgtaS0h0w^LbupK0bq!cfd5=M<raea-<HUedwpo;$=hv%tY|Ga0a}}J-(QOWUy;_z
z76GlzxbLq;fUihvWs88;X59DJBEVOqwX#J(YcuZqYZ2fp(pousA|%iL<dN8K7KtZT
z@<=SkHz<I7fd~Wgz!7Z(h#9Zd1}@+f`nUsap`)>Z060KIioL6c%At=O`oR@{$QK`X
zgq%dZ{3bxs8_5Fx^DPZjizNb=ev=d9fVNNh4k7?X;XEBgSxYH>v~eZsQn-Zrr~<ru
zS0DPwp@efOHb3F3-UskZJqDiACpJE3TMCy@A5{QuB{7mIePZKtwxw_h^-%@j+m#r}
zls>WXIondWg!%+`0T2wW@LYLgeR4V&vz5Xn*5@DBF^Q-4mY-$-0000<MNUMnLSTY&
C5sBph

literal 0
HcmV?d00001

-- 
2.51.2