Adds beanies to the WinterDrobe! (#32946)

* sprites

* messing with the ymls

* new sprites

* that's a lotta yaml

* make the sprites gooder

* color adjustment

* to the winterdrobe with you

* layering fix

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
index 8909fb163f1e5eed83d1c44085470e628ba04225..510257c04582399953559c446cb1bbbe6fe3bb71 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -16,6 +16,7 @@
     ClothingOuterFlannelBlue: 2
     ClothingOuterFlannelGreen: 2
     ClothingOuterCoatBomber: 3
+    ClothingHeadHatCanadaBeanie: 4
     ClothingHeadHatSantahat: 2
     ClothingHeadHatXmasCrown: 2
     ClothingUniformTurtleneckColorWhite: 2

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 64d55a2dd923c849819a07e800ae850126f415bc..2477e1e9963bd6c8dfaa574f67a2fbb365a39c4e 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -523,6 +523,43 @@
       map: ["foldedLayer"]
       visible: false
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCanadaBeanie
+  name: beanie
+  description: Red, white and snug. It radiates a homely feeling, if your home happens to be chilly and filled with coffeehouses.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beanie.rsi
+    layers:
+    - state: body-icon
+    - state: cuffcrown-icon
+      color: "#a60b0b"
+    - state: pompom-icon
+      color: "#a60b0b"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: body-inhand-left
+      - state: cuffcrown-inhand-left
+        color: "#a60b0b"
+      - state: pompom-inhand-left
+        color: "#a60b0b"
+      right:
+      - state: body-inhand-right
+      - state: cuffcrown-inhand-right
+        color: "#a60b0b"
+      - state: pompom-inhand-right
+        color: "#a60b0b"
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beanie.rsi
+    clothingVisuals:
+      head:
+      - state: body-equipped-HELMET
+      - state: cuffcrown-equipped-HELMET
+        color: "#a60b0b"
+      - state: pompom-equipped-HELMET
+        color: "#a60b0b"
 
 - type: entity
   parent: ClothingHeadHatWizardBase

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..0645294
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-icon.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-icon.png
new file mode 100644 (file)
index 0000000..eaee610
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-inhand-left.png
new file mode 100644 (file)
index 0000000..342bdde
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-inhand-right.png
new file mode 100644 (file)
index 0000000..db0a12d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/body-inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..414d83d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-icon.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-icon.png
new file mode 100644 (file)
index 0000000..951aeb3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-inhand-left.png
new file mode 100644 (file)
index 0000000..048c6b4
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-inhand-right.png
new file mode 100644 (file)
index 0000000..baf135d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/cuffcrown-inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/meta.json
new file mode 100644 (file)
index 0000000..40fbf11
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/meta.json
@@ -0,0 +1,56 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by UBlueberry for SS14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "body-icon"
+        },
+        {
+            "name": "cuffcrown-icon"
+        },
+        {
+            "name": "pompom-icon"
+        },
+        {
+            "name": "body-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "cuffcrown-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "pompom-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "body-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cuffcrown-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "pompom-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "body-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cuffcrown-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "pompom-inhand-right",
+            "directions": 4
+        }
+    ]
+}

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..4f9a4dc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-icon.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-icon.png
new file mode 100644 (file)
index 0000000..5d46efe
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-inhand-left.png
new file mode 100644 (file)
index 0000000..2d239f2
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-inhand-right.png
new file mode 100644 (file)
index 0000000..805f9c8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beanie.rsi/pompom-inhand-right.png differ