From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Thu, 29 Feb 2024 22:25:41 +0000 (+0300)
Subject: Colourful curtains (#25684)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=66cf642e5632dd960a0af56b526020ec1b025c24;p=space-station-14.git

Colourful curtains (#25684)

* curwa

* fix

* huh

* revert huh

* add fancy white

* resprite hospital

* add suffix
---

diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
index ed35fb0110..85c9bdae3d 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
@@ -1,16 +1,13 @@
 - type: entity
-  id: HospitalCurtains
+  id: BaseCurtains
   parent: BaseStructure
   name: curtains
-  description: Contains less than 1% mercury.
+  description: Hides what others shouldn't see.
+  abstract: true
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Occluder
-  - type: Sprite
-    snapCardinals: true
-    sprite: Structures/Decoration/curtains.rsi
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
   - type: AnimationPlayer
   - type: Fixtures
     fixtures:
@@ -39,10 +36,7 @@
   - type: Appearance
   - type: Damageable
     damageContainer: Inorganic
-    damageModifierSet: Wood
-  - type: Construction
-    graph: Curtains
-    node: Curtains
+    damageModifierSet: Wood  
   - type: Destructible
     thresholds:
     - trigger:
@@ -56,20 +50,304 @@
           MaterialCloth1:
             min: 1
             max: 2
-  placement:
-    mode: SnapgridCenter
+        
+- type: entity
+  id: HospitalCurtains
+  parent: BaseCurtains
+  suffix: Hospital
+  description: Contains less than 1% mercury.
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/hospital.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: Curtains
 
 - type: entity
   id: HospitalCurtainsOpen
   parent: HospitalCurtains
-  suffix: Open
+  suffix: Open, Hospital
   components:
   - type: Door
     state: Open
   - type: Occluder
     enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsOpen
   - type: Physics
     canCollide: false
+
+- type: entity
+  id: CurtainsBlack
+  parent: BaseCurtains
+  suffix: Fancy black
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/black.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
   - type: Construction
     graph: Curtains
-    node: CurtainsOpen
+    node: CurtainsBlack
+
+- type: entity
+  id: CurtainsBlackOpen
+  parent: CurtainsBlack
+  suffix: Open, Fancy black
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsBlackOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsBlue
+  parent: BaseCurtains
+  suffix: Fancy blue
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/blue.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsBlue
+
+- type: entity
+  id: CurtainsBlueOpen
+  parent: CurtainsBlue
+  suffix: Open, Fancy blue
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsBlueOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsCyan
+  parent: BaseCurtains
+  suffix: Fancy cyan
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/cyan.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsCyan
+
+- type: entity
+  id: CurtainsCyanOpen
+  parent: CurtainsCyan
+  suffix: Open, Fancy cyan
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsCyanOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsGreen
+  parent: BaseCurtains
+  suffix: Fancy green
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/green.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsGreen
+
+- type: entity
+  id: CurtainsGreenOpen
+  parent: CurtainsGreen
+  suffix: Open, Fancy green
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsGreenOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsOrange
+  parent: BaseCurtains
+  suffix: Fancy orange
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/orange.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsOrange
+
+- type: entity
+  id: CurtainsOrangeOpen
+  parent: CurtainsOrange
+  suffix: Open, Fancy orange
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsOrangeOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsPink
+  parent: BaseCurtains
+  suffix: Fancy pink
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/pink.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsPink
+
+- type: entity
+  id: CurtainsPinkOpen
+  parent: CurtainsPink
+  suffix: Open, Fancy pink
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsPinkOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsPurple
+  parent: BaseCurtains
+  suffix: Fancy purple
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/purple.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsPurple
+
+- type: entity
+  id: CurtainsPurpleOpen
+  parent: CurtainsPurple
+  suffix: Open, Fancy purple
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsPurpleOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsRed
+  parent: BaseCurtains
+  suffix: Fancy red
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/red.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsRed
+
+- type: entity
+  id: CurtainsRedOpen
+  parent: CurtainsRed
+  suffix: Open, Fancy red
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsRedOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsWhite
+  parent: BaseCurtains
+  suffix: Fancy white
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/white.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsWhite
+
+- type: entity
+  id: CurtainsWhiteOpen
+  parent: CurtainsWhite
+  suffix: Open, Fancy white
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsWhiteOpen
+  - type: Physics
+    canCollide: false
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
index 2f9edcb41d..90e77d6720 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
@@ -13,6 +13,97 @@
             - material: Cloth
               amount: 2
               doAfter: 1
+        - to: CurtainsBlack
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetBlack
+              doAfter: 1
+              name: black carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-black
+        - to: CurtainsBlue
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetBlue
+              doAfter: 1
+              name: blue carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-blue
+        - to: CurtainsCyan
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetCyan
+              doAfter: 1
+              name: cyan carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-cyan
+        - to: CurtainsGreen
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetGreen
+              doAfter: 1
+              name: green carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-green
+        - to: CurtainsOrange
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetOrange
+              doAfter: 1
+              name: orange carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-orange
+        - to: CurtainsPink
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetPink
+              doAfter: 1
+              name: pink carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-pink
+        - to: CurtainsPurple
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetPurple
+              doAfter: 1
+              name: purple carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-purple
+        - to: CurtainsRed
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetRed
+              doAfter: 1
+              name: red carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-red
+        - to: CurtainsWhite
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetWhite
+              doAfter: 1
+              name: white carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-white
+              
     - node: Curtains
       entity: HospitalCurtains
       edges:
@@ -35,3 +126,210 @@
           steps:
             - tool: Cutting
               doAfter: 1
+    
+    - node: CurtainsBlack
+      entity: CurtainsBlack
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemBlack
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsBlackOpen
+      entity: CurtainsBlackOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemBlack
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1    
+              
+    - node: CurtainsBlue
+      entity: CurtainsBlue
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemBlue
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsBlueOpen
+      entity: CurtainsBlueOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemBlue
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsCyan
+      entity: CurtainsCyan
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemCyan
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsCyanOpen
+      entity: CurtainsCyanOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemCyan
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsGreen
+      entity: CurtainsGreen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemGreen
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsGreenOpen
+      entity: CurtainsGreenOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemGreen
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsOrange
+      entity: CurtainsOrange
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemOrange
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsOrangeOpen
+      entity: CurtainsOrangeOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemOrange
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsPink
+      entity: CurtainsPink
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemPink
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsPinkOpen
+      entity: CurtainsPinkOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemPink
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsPurple
+      entity: CurtainsPurple
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemPurple
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsPurpleOpen
+      entity: CurtainsPurpleOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemPurple
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsRed
+      entity: CurtainsRed
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemRed
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsRedOpen
+      entity: CurtainsRedOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemRed
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsWhite
+      entity: CurtainsWhite
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemWhite
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsWhiteOpen
+      entity: CurtainsWhiteOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemWhite
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index a08b3cc24d..bbe307ad23 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -676,7 +676,160 @@
   targetNode: Curtains
   category: construction-category-furniture
   icon:
-    sprite: Structures/Decoration/curtains.rsi
+    sprite: Structures/Decoration/Curtains/hospital.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsBlack
+  name: black curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsBlack
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/black.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked  
+
+- type: construction
+  id: CurtainsBlue
+  name: blue curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsBlue
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/blue.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked  
+    
+- type: construction
+  id: CurtainsCyan
+  name: cyan curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsCyan
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/cyan.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsGreen
+  name: green curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsGreen
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/green.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsOrange
+  name: orange curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsOrange
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/orange.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsPink
+  name: pink curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsPink
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/pink.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsPurple
+  name: purple curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsPurple
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/purple.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsRed
+  name: red curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsRed
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/red.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked    
+
+- type: construction
+  id: CurtainsWhite
+  name: white curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsWhite
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/white.rsi
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
diff --git a/Resources/Textures/Structures/Decoration/Curtains/black.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/closed.png
new file mode 100644
index 0000000000..d81aa6a6fb
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/curtains.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/meta.json
similarity index 63%
rename from Resources/Textures/Structures/Decoration/curtains.rsi/meta.json
rename to Resources/Textures/Structures/Decoration/Curtains/black.rsi/meta.json
index 68afb3696a..77c92df8f8 100644
--- a/Resources/Textures/Structures/Decoration/curtains.rsi/meta.json
+++ b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/951c7976bf6cda431aed8a1b22a8624ff7dfd8e2",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Decoration/Curtains/black.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/open.png
new file mode 100644
index 0000000000..91981c6d40
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/closed.png
new file mode 100644
index 0000000000..06fa747422
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/open.png
new file mode 100644
index 0000000000..9095893cd2
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/closed.png
new file mode 100644
index 0000000000..fefa173eea
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/open.png
new file mode 100644
index 0000000000..aef1f723d5
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/green.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/closed.png
new file mode 100644
index 0000000000..48c8387d25
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/green.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/green.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/open.png
new file mode 100644
index 0000000000..a1dc439f1e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/closed.png
new file mode 100644
index 0000000000..8a9d2737a2
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/open.png
new file mode 100644
index 0000000000..127c2f88ec
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/closed.png
new file mode 100644
index 0000000000..047b573bf5
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/open.png
new file mode 100644
index 0000000000..fb647ddb61
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/closed.png
new file mode 100644
index 0000000000..83a8b61af3
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/open.png
new file mode 100644
index 0000000000..071b3cbbfa
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/closed.png
new file mode 100644
index 0000000000..0f03f5e973
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/open.png
new file mode 100644
index 0000000000..8f9359fd38
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/red.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/closed.png
new file mode 100644
index 0000000000..aae143f5db
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/red.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/red.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/open.png
new file mode 100644
index 0000000000..70dc194c15
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/white.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/closed.png
new file mode 100644
index 0000000000..fbfbe84cfc
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/white.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/white.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/open.png
new file mode 100644
index 0000000000..f636da8155
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/curtains.rsi/closed.png b/Resources/Textures/Structures/Decoration/curtains.rsi/closed.png
deleted file mode 100644
index 33f24e93d6..0000000000
Binary files a/Resources/Textures/Structures/Decoration/curtains.rsi/closed.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Decoration/curtains.rsi/open.png b/Resources/Textures/Structures/Decoration/curtains.rsi/open.png
deleted file mode 100644
index 4b4e6aa360..0000000000
Binary files a/Resources/Textures/Structures/Decoration/curtains.rsi/open.png and /dev/null differ