Adds flannel jackets (#20765)

* Added flannel jackets

* Better desc

Turns out lumberjacks don't wear flannel jackets

* Added the jackets to maint fluff pool

* Moves the jackets to the winterdrobe

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
index 11e992adfb5a5a1fcf1932082b60b967490083c9..94d9e64703dd086b020f6bfc5ee0badfafac3505 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -10,6 +10,9 @@
     ClothingNeckScarfStripedOrange: 3
     ClothingNeckScarfStripedPurple: 3
     ClothingOuterWinterCoat: 6
+    ClothingOuterFlannelRed: 2
+    ClothingOuterFlannelBlue: 2
+    ClothingOuterFlannelGreen: 2
     ClothingShoesBootsWinter: 6
     ClothingOuterCoatBomber: 3
     ClothingHeadHatSantahat: 2

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
index bc7c46327f9376e61d96b454886bec0b54af4cf5..0b2e6f5edcc0cf061081497cded693496c0af710 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -255,3 +255,105 @@
     sprite: Clothing/OuterClothing/Misc/hospitalgown.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Misc/hospitalgown.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterFlannelRed
+  name: red flannel jacket
+  description: An old fashioned red flannel jacket for space autumn.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi
+    layers:
+    - state: icon
+      color: "#670a09"
+    - state: icon-lines
+      color: "#000000"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#670a09"
+      - state: inhand-left-lines
+        color: "#000000"
+      right:
+      - state: inhand-right
+        color: "#670a09"
+      - state: inhand-right-lines
+        color: "#000000"
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-OUTERCLOTHING
+        color: "#670a09"
+      - state: equipped-OUTERCLOTHING-lines
+        color: "#000000"
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterFlannelBlue
+  name: blue flannel jacket
+  description: An old fashioned blue flannel jacket for space autumn.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi
+    layers:
+    - state: icon
+      color: "#3232a6"
+    - state: icon-lines
+      color: "#000000"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#3232a6"
+      - state: inhand-left-lines
+        color: "#000000"
+      right:
+      - state: inhand-right
+        color: "#3232a6"
+      - state: inhand-right-lines
+        color: "#000000"
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-OUTERCLOTHING
+        color: "#3232a6"
+      - state: equipped-OUTERCLOTHING-lines
+        color: "#000000"
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterFlannelGreen
+  name: green flannel jacket
+  description: An old fashioned green flannel jacket for space autumn.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi
+    layers:
+    - state: icon
+      color: "#164d0f"
+    - state: icon-lines
+      color: "#000000"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#164d0f"
+      - state: inhand-left-lines
+        color: "#000000"
+      right:
+      - state: inhand-right
+        color: "#164d0f"
+      - state: inhand-right-lines
+        color: "#000000"
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-OUTERCLOTHING
+        color: "#164d0f"
+      - state: equipped-OUTERCLOTHING-lines
+        color: "#000000"
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 3884e81d7286f8b117d208c99b37402693e325d6..1d61ca9c7d94d162fed9c7e76004e810f689477b 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -99,6 +99,9 @@
         - ClothingOuterCoatPirate
         - ClothingOuterHoodieBlack
         - ClothingOuterHoodieGrey
+        - ClothingOuterFlannelRed
+        - ClothingOuterFlannelBlue
+        - ClothingOuterFlannelGreen
         - ClothingOuterVestHazard
         - ClothingShoesBootsJack
         - ClothingShoesBootsLaceup

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING-lines.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING-lines.png
new file mode 100644 (file)
index 0000000..44a2eba
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING-lines.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..c03d3c8
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/equipped-OUTERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon-lines.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon-lines.png
new file mode 100644 (file)
index 0000000..0936bc7
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon-lines.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon.png
new file mode 100644 (file)
index 0000000..1c2cdeb
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-left-lines.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-left-lines.png
new file mode 100644 (file)
index 0000000..4c0d831
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-left-lines.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..b5ea61f
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-right-lines.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-right-lines.png
new file mode 100644 (file)
index 0000000..e1c100c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-right-lines.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..033cbc5
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json
new file mode 100644 (file)
index 0000000..7b4a51d
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by nmajask (Github) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-lines"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-lines",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-lines",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-lines",
+      "directions": 4
+    }
+  ]
+}