Fixes!

Simple-Station · Sep 15, 2024 · 9027bad · 9027bad
1 parent 41a8b1b
commit 9027bad
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"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,9 +18,6 @@ @@
             ]
           ]
         },
-        {
-          "name": "barberchair"
-        },
         {
           "name": "dyedispenser"
         },
@@ Expand Down @@