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>

diff --git a/Resources/Locale/en-US/construction/recipes/curtains.ftl b/Resources/Locale/en-US/construction/recipes/curtains.ftl
index 92c3c758f3e601da0fb4c5f04b7d9ee439b6eab6..ad441b3264bf6132922e36c86d1b765602f0e90c 100644 (file)
--- a/Resources/Locale/en-US/construction/recipes/curtains.ftl
+++ b/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)

diff --git a/Resources/Locale/en-US/construction/recipes/furniture.ftl b/Resources/Locale/en-US/construction/recipes/furniture.ftl
index c9a6265a2829d985cca16bf7a40389740679e8c9..b5c66a691319ffb55171260834dcb193ced503c5 100644 (file)
--- a/Resources/Locale/en-US/construction/recipes/furniture.ftl
+++ b/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)

diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
index eb575efb67ed013a38d612d3149007ac6d66272e..883bd32c4a688935397a68bf265cd8e105acc22b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index fda2ac5e182da082a59a654f6335988ad55430db..f90f20db357ce2c03c7a4f9ed38a1f0ccc981d8a 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/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

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
index e7e1086ea44c01e70fcb54012f6f432e873eec56..9a958105bd838bd119201d9d0fc906a49cdc1f06 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
+++ b/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:

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
index c0721cf1548260c77c1076cbd4d7f4108979f847..232339213f44448c0e63cbdadbfad2f95fb51c13 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
+++ b/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:

diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 80ddd7d2dc791d4d75738018b87b0d6eee22dcdd..889fbd2d2da0a77709d94ed8b0f60e02d15e88b0 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/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

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
index aa95781729fcc30267b86beb4884cbc110a0c22a..a0a814a7b603f8633338632ee8f33e80b353c7c9 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
@@ -200,6 +200,7 @@
   - CarpetPurple
   - CarpetCyan
   - CarpetWhite
+  - CarpetSkyBlue
 
 - type: latheRecipePack
   id: ClothingCentComm

diff --git a/Resources/Prototypes/Recipes/Lathes/carpets.yml b/Resources/Prototypes/Recipes/Lathes/carpets.yml
index fe172879e71d4de8d9418edb774267e1e49eefa1..d2d53cc524db9e02305e294bf29e582f56cef19e 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/carpets.yml
+++ b/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

diff --git a/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/closed.png
new file mode 100644 (file)
index 0000000..50be268
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/closed.png differ

diff --git a/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/meta.json
new file mode 100644 (file)
index 0000000..f6c3af7
--- /dev/null
+++ b/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
+    }
+  ]
+}

diff --git a/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/open.png
new file mode 100644 (file)
index 0000000..062b496
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/open.png differ

diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/full.png
new file mode 100644 (file)
index 0000000..ca7935c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/full.png differ

diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/meta.json
new file mode 100644 (file)
index 0000000..ecdc3d7
--- /dev/null
+++ b/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
+        ]
+      ]
+    }
+  ]
+}

diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_0.png
new file mode 100644 (file)
index 0000000..4fb072f
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_0.png differ

diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_1.png
new file mode 100644 (file)
index 0000000..2d10bee
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_1.png differ

diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_2.png
new file mode 100644 (file)
index 0000000..4fb072f
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_2.png differ

diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_3.png
new file mode 100644 (file)
index 0000000..2d10bee
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_3.png differ

diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_4.png
new file mode 100644 (file)
index 0000000..371a275
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_4.png differ

diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_5.png
new file mode 100644 (file)
index 0000000..f5e208b
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_5.png differ

diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_6.png
new file mode 100644 (file)
index 0000000..222b24c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_6.png differ

diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_7.png
new file mode 100644 (file)
index 0000000..ec3dab4
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_7.png differ