Fixes to Bench and Barber Chair Rotation (#925)

# Description Changed the textures of wooden and metal benches. Now wooden benches are turned correctly, and metal ones have the correct texture of the left and right halves --- # TODO - [x] Task - [x] Completed Task --- ![Screenshot_80](https://github.com/user-attachments/assets/ff51a698-5387-4b4e-8d2e-4408c2893577) ![Screenshot_81](https://github.com/user-attachments/assets/235f4dbd-c379-45cd-86ea-821a145f0862) ![Screenshot_82](https://github.com/user-attachments/assets/04757bd0-c317-4f3f-91eb-91c1c2d52dec) ![Screenshot_83](https://github.com/user-attachments/assets/dcf006e9-50d6-443f-80b1-c2cce22b1b9a) --- # Changelog :cl: JayJacobs - tweak: Changed the sprite of the barber chair. - fix: Fixed bench textures. Co-authored-by: Flybik <[email protected]>
Simple-Station · Sep 17, 2024 · 2f8d9e8 · 2f8d9e8
1 parent 0079259
commit 2f8d9e8
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 4 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Specific/bay12barbershop.yml b/Resources/Prototypes/Entities/Structures/Specific/bay12barbershop.yml
@@ -10,7 +10,7 @@
   - type: Anchorable
   - type: Rotatable
   - type: Sprite
-    sprite: Structures/Specific/barbershop.rsi
+    sprite: Structures/Specific/barberchair.rsi
     state: barberchair
 
 - type: entity

diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/left.png
diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/right.png
diff --git a/.../Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/left.png b/.../Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/left.png
diff --git a/...Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/right.png b/...Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/right.png
diff --git a/...res/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/left.png b/...res/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/left.png
diff --git a/...es/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/right.png b/...es/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/right.png
diff --git a/Resources/Textures/Structures/Specific/barberchair.rsi/barberchair.png b/Resources/Textures/Structures/Specific/barberchair.rsi/barberchair.png
diff --git a/Resources/Textures/Structures/Specific/barberchair.rsi/meta.json b/Resources/Textures/Structures/Specific/barberchair.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from BlueMoon at https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/blob/master/modular_bluemoon/krashly/icons/obj/chairs.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "barberchair",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/barberchair.png b/Resources/Textures/Structures/Specific/barbershop.rsi/barberchair.png
diff --git a/Resources/Textures/Structures/Specific/barbershop.rsi/meta.json b/Resources/Textures/Structures/Specific/barbershop.rsi/meta.json
@@ -18,9 +18,6 @@
         ]
       ]
     },
-    {
-      "name": "barberchair"
-    },
     {
       "name": "dyedispenser"
     },