]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Performer's Wig (#35764)
authorVelken <8467292+Velken@users.noreply.github.com>
Mon, 10 Mar 2025 23:17:23 +0000 (20:17 -0300)
committerGitHub <noreply@github.com>
Mon, 10 Mar 2025 23:17:23 +0000 (19:17 -0400)
* miku wig

* fix to correct json convention

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Resources/Prototypes/Catalog/Fills/Crates/service.yml
Resources/Prototypes/Entities/Clothing/Head/misc.yml
Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/meta.json [new file with mode: 0644]

index f5ba7b65f91f95bc0f8bf3cc69baa961155058fb..478aea4cc04de4ee62d78574690ad3979dfefe35 100644 (file)
     contents:
       - id: ClothingShoesBootsPerformer
       - id: ClothingUniformJumpskirtPerformer
+      - id: ClothingHeadPerformerWig
       - id: FoodMealMemoryleek
         amount: 2
 
index 59a1ed476d782314940870b73d266b3886d7d697..32cfce4628ee819b41f6f1f9ddfc20ced72aebc9 100644 (file)
@@ -89,6 +89,7 @@
     contents:
     - id: ClothingUniformJumpskirtPerformer
     - id: ClothingShoesBootsPerformer
+    - id: ClothingHeadPerformerWig
     - id: ClothingOuterSuitMonkey
     - id: ClothingHeadHatAnimalMonkey
     - id: ClothingNeckCloakMoth
index 28fe46e0fa0daf9a0ff1c9ec292610986b3f065f..9068bb576ab11e41cf2c7eeaa91efcc7dfaa536f 100644 (file)
     sprite: Clothing/Head/Misc/hairflower.rsi
   - type: Clothing
     sprite: Clothing/Head/Misc/hairflower.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadPerformerWig
+  name: performer's wig
+  description: On a closer inspection, it appears that it is made from optic fiber.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/performer-wig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/performer-wig.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
diff --git a/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..4d5e751
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/icon.png
new file mode 100644 (file)
index 0000000..bfbf380
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..ebdc468
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..63c609e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/performer-wig.rsi/meta.json
new file mode 100644 (file)
index 0000000..ddceddd
--- /dev/null
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by Velken",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}