Santa hat with a foldable beard (#36510)

* Added foldable component to santa hat

* Modified sprites, modified YAML. YAML is cursed

* Changed santa hat description to mention the beard fold

* Removed HideLayerClothing since it doesnt work

* Changed the prefix from "beard" to "nobeard" to match with the fold/unfold verb

* Credits for sprite changes

---------

Co-authored-by: Lanedon <matth.galvez@gmail>

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 2477e1e9963bd6c8dfaa574f67a2fbb365a39c4e..b665708ebae7d1214c17b510f867caad200065e3 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -421,15 +421,28 @@
     sprite: Clothing/Head/Hats/redwizard.rsi
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ClothingHeadBase, BaseFoldable]
   id: ClothingHeadHatSantahat
   name: santa hat
-  description: A festive hat worn by Santa Claus.
+  description: A festive hat worn by Santa Claus. Now with a foldable beard.
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Hats/santahat.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/santahat.rsi
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+  - type: FoldableClothing
+    foldedEquippedPrefix: nobeard
+    foldedHeldPrefix: nobeard
+  - type: Sprite
+    sprite: Clothing/Head/Hats/santahat.rsi
+    layers:
+    - state: icon
+      map: ["unfoldedLayer"]
+    - state: icon-nobeard
+      map: [ "foldedLayer" ]
+      visible: true
+    
 
 - type: entity
   parent: ClothingHeadBase

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

diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png
index 88fb770f8d4905fe37096d5fd250f39d30f85a3c..5b6ddcc296fb60c3474bdb009eb1da5c01be2f70 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json
index cec1961dce8414e36110ccb8d79346fe04f65411..4399ee55c2c76bf264a641c6522784653770b061 100644 (file)
--- a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json
@@ -1,30 +1,49 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy, no beard variant by Banedon",
   "size": {
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon-nobeard"
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "nobeard-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "nobeard-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "nobeard-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "nobeard-inhand-right",
+            "directions": 4
+        }
+    ]
 }

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

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

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

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