Bring sky blue carpet in line with other carpets (#40867)

* add table and curtains as constructables; carpet now in printer

* add textures

* whoops, didn't mean to change that

* textures v2

* add open curtain proto

---------

Co-authored-by: Quasr <~182430031+quasr-9@users.noreply.github.com>

Resources/Locale/en-US/construction/recipes/curtains.ftl

@@ -1,6 +1,7 @@
 construction-recipe-curtains-cloth = curtains (cloth)
 construction-recipe-curtains-black = curtains (black)
 construction-recipe-curtains-blue = curtains (blue)
+construction-recipe-curtains-sky-blue = curtains (sky blue)
 construction-recipe-curtains-cyan = curtains (cyan)
 construction-recipe-curtains-green = curtains (green)
 construction-recipe-curtains-orange = curtains (orange)

Resources/Locale/en-US/construction/recipes/furniture.ftl

@@ -2,6 +2,7 @@ construction-recipe-red-comf-bench = comfortable bench (red)
 construction-recipe-blue-comf-bench = comfortable bench (blue)
 construction-recipe-table-fancy-black = fancy table (black)
 construction-recipe-table-fancy-blue = fancy table (blue)
+construction-recipe-table-fancy-sky-blue = fancy table (sky blue)
 construction-recipe-table-fancy-cyan = fancy table (cyan)
 construction-recipe-table-fancy-green = fancy table (green)
 construction-recipe-table-fancy-orange = fancy table (orange)

Resources/Prototypes/Entities/Structures/Decoration/curtains.yml

@@ -135,6 +135,21 @@
     graph: Curtains
     node: CurtainsBlue
 
+- type: entity
+  id: CurtainsSkyBlue
+  parent: BaseCurtains
+  suffix: Fancy sky blue
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/skyblue.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsSkyBlue
+
 - type: entity
   id: CurtainsBlueOpen
   parent: CurtainsBlue
@@ -150,6 +165,21 @@
   - type: Physics
     canCollide: false
 
+- type: entity
+  id: CurtainsSkyBlueOpen
+  parent: CurtainsSkyBlue
+  suffix: Open, Fancy sky blue
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsSkyBlueOpen
+  - type: Physics
+    canCollide: false
+
 - type: entity
   id: CurtainsCyan
   parent: BaseCurtains

Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml

@@ -756,6 +756,21 @@
   - type: IconSmooth
     key: fancytableblue
 
+- type: entity
+  id: TableFancySkyBlue
+  parent: TableFancyBase
+  suffix: SkyBlue
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/skyblue.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/skyblue.rsi
+  - type: Construction
+    graph: Table
+    node: TableFancySkyBlue
+  - type: IconSmooth
+    key: fancytableskyblue
+
 - type: entity
   id: TableFancyCyan
   parent: TableFancyBase

Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml

@@ -27,6 +27,13 @@
             - material: FloorCarpetBlue
               amount: 1
               doAfter: 1
+        - to: CurtainsSkyBlue
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+          - material: FloorCarpetSkyBlue
+            amount: 1
+            doAfter: 1
         - to: CurtainsCyan
           completed:
             - !type:SnapToGrid { }
@@ -146,6 +153,29 @@
             - tool: Cutting
               doAfter: 1
 
+    - node: CurtainsSkyBlue
+      entity: CurtainsSkyBlue
+      edges:
+      - to: start
+        completed:
+        - !type:GivePrototype
+          prototype: FloorCarpetItemSkyBlue
+          amount: 1
+        steps:
+        - tool: Cutting
+          doAfter: 1
+    - node: CurtainsSkyBlueOpen
+      entity: CurtainsSkyBlueOpen
+      edges:
+      - to: start
+        completed:
+        - !type:GivePrototype
+          prototype: FloorCarpetItemSkyBlue
+          amount: 1
+        steps:
+        - tool: Cutting
+          doAfter: 1
+
     - node: CurtainsCyan
       entity: CurtainsCyan
       edges:

Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml

@@ -244,6 +244,11 @@
             - material: FloorCarpetBlue
               amount: 1
 
+        - to: TableFancySkyBlue
+          steps:
+            - material: FloorCarpetSkyBlue
+              amount: 1
+
         - to: TableFancyCyan
           steps:
             - material: FloorCarpetCyan
@@ -315,6 +320,18 @@
             - tool: Prying
               doAfter: 1
 
+    - node: TableFancySkyBlue
+      entity: TableFancySkyBlue
+      edges:
+        - to: TableWood
+          completed:
+          - !type:SpawnPrototype
+            prototype: FloorCarpetItemSkyBlue
+            amount: 1
+          steps:
+          - tool: Prying
+            doAfter: 1
+
     - node: TableFancyCyan
       entity: TableFancyCyan
       edges:

Resources/Prototypes/Recipes/Construction/furniture.yml

@@ -340,6 +340,19 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  id: TableFancySkyBlue
+  name: construction-recipe-table-fancy-sky-blue
+  graph: Table
+  startNode: start
+  targetNode: TableFancySkyBlue
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
 - type: construction
   id: TableFancyCyan
   name: construction-recipe-table-fancy-cyan
@@ -576,6 +589,17 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: true
 
+- type: construction
+  id: CurtainsSkyBlue
+  name: construction-recipe-curtains-sky-blue
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsSkyBlue
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+
 - type: construction
   id: CurtainsCyan
   name: construction-recipe-curtains-cyan

Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml

@@ -200,6 +200,7 @@
   - CarpetPurple
   - CarpetCyan
   - CarpetWhite
+  - CarpetSkyBlue
 
 - type: latheRecipePack
   id: ClothingCentComm

Resources/Prototypes/Recipes/Lathes/carpets.yml

@@ -27,6 +27,11 @@
   id: CarpetBlue
   result: FloorCarpetItemBlue
 
+- type: latheRecipe
+  parent: BaseCarpetRecipe
+  id: CarpetSkyBlue
+  result: FloorCarpetItemSkyBlue
+
 - type: latheRecipe
   parent: BaseCarpetRecipe
   id: CarpetGreen

Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Derived from white curtain, created by TheShuEd (github) for Space Station14, by Quasr",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}

Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/meta.json

@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi, and modified by Quasr",
+  "states": [
+    {
+      "name": "full",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "state_0",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_1",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_2",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_3",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_4",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_5",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_6",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_7",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    }
+  ]
+}