From: MACMAN2003 <macman2003c@gmail.com>
Date: Sun, 3 Mar 2024 00:06:15 +0000 (-0800)
Subject: Cleanup chairs.yml (#25682)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=862ab5ca9f1e4034577fb2f8829b0cc4b793890d;p=space-station-14.git

Cleanup chairs.yml (#25682)

cleanup chairs.yml

not sure if i did this correctly
---

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index a235cd2546..d9f6270b45 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -49,17 +49,55 @@
   - type: StaticPrice
     price: 10
 
+#Starts unanchored, cannot be rotated while anchored
 - type: entity
   name: chair
-  id: Chair
+  id: UnanchoredChairBase
   parent: SeatBase
+  abstract: true
+  components:
+  - type: Anchorable
+  - type: Rotatable
+
+#Start anchored, cannot be rotated while anchored
+- type: entity
+  name: chair
+  id: ChairBase
+  abstract: true
+  parent: UnanchoredChairBase
   components:
+  - type: Physics
+    bodyType: Static
   - type: Transform
     anchored: true
+
+#Starts unanchored, can be rotated while anchored
+- type: entity
+  name: chair
+  id: OfficeChairBase
+  parent: UnanchoredChairBase
+  abstract: true
+  components:
+  - type: Rotatable
+    rotateWhileAnchored: true
+
+#Starts anchored, can be rotated while anchored
+- type: entity
+  name: stool
+  id: StoolBase
+  parent: OfficeChairBase
+  abstract: true
+  components:
   - type: Physics
     bodyType: Static
-  - type: Anchorable
-  - type: Rotatable
+  - type: Transform
+    anchored: true
+
+- type: entity
+  name: chair
+  id: Chair
+  parent: ChairBase
+  components:
   - type: Sprite
     state: chair
   - type: Construction
@@ -78,11 +116,9 @@
 - type: entity
   name: stool
   id: Stool
-  parent: SeatBase
+  parent: ChairBase
   description: Apply butt.
   components:
-  - type: Anchorable
-  - type: Rotatable
   - type: Sprite
     state: stool
   - type: Construction
@@ -92,15 +128,8 @@
 - type: entity
   name: bar stool
   id: StoolBar
-  parent: SeatBase
+  parent: StoolBase
   components:
-  - type: Transform
-    anchored: true
-  - type: Rotatable
-    rotateWhileAnchored: true
-  - type: Physics
-    bodyType: Static
-  - type: Anchorable
   - type: Sprite
     state: bar
   - type: Construction
@@ -110,11 +139,8 @@
 - type: entity
   name: white office chair
   id: ChairOfficeLight
-  parent: SeatBase
+  parent: OfficeChairBase
   components:
-  - type: Anchorable
-  - type: Rotatable
-    rotateWhileAnchored: true
   - type: Sprite
     state: office-white
   - type: Construction
@@ -135,15 +161,9 @@
 - type: entity
   name: comfy chair
   id: ComfyChair
-  parent: SeatBase
+  parent: ChairBase
   description: It looks comfy.
   components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-  - type: Anchorable
-  - type: Rotatable
   - type: Sprite
     state: comfy
   - type: Construction
@@ -153,15 +173,9 @@
 - type: entity
   name: pilot seat
   id: ChairPilotSeat
-  parent: SeatBase
+  parent: ChairBase
   description: The pilot seat of a prestigious ship.
   components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-  - type: Anchorable
-  - type: Rotatable
   - type: Sprite
     state: shuttle
   - type: Construction
@@ -171,11 +185,10 @@
 - type: entity
   name: wooden chair
   id: ChairWood
-  parent: SeatBase
+  parent: UnanchoredChairBase
   components:
   - type: Sprite
     state: wooden
-  - type: Rotatable
   - type: Construction
     graph: Seat
     node: chairWood
@@ -217,11 +230,10 @@
 
 - type: entity
   id: ChairMeat
-  parent: SeatBase
+  parent: ChairBase
   name: meat chair
   description: Uncomfortably sweaty.
   components:
-  - type: Rotatable
   - type: Sprite
     state: meat
   - type: Construction
@@ -262,13 +274,8 @@
   name: web chair
   id: ChairWeb
   description: For true web developers.
-  parent: SeatBase
+  parent: ChairBase
   components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-  - type: Rotatable
   - type: Sprite
     sprite: Structures/Web/chair.rsi
     state: icon
@@ -338,15 +345,9 @@
 - type: entity
   name: steel bench
   id: SteelBench
-  parent: SeatBase
+  parent: ChairBase
   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
   - type: Construction