Add vox hairstyle (catfish hair) (#40689)

* add vox catfish

Co-authored-by: Cadunkus <140308611+Cadunkus@users.noreply.github.com>
* change indents from 2 to 4 in meta.json

* update sprite

Co-authored-by: Cadunkus <140308611+Cadunkus@users.noreply.github.com>
---------

Co-authored-by: Cadunkus <140308611+Cadunkus@users.noreply.github.com>

diff --git a/Resources/Locale/en-US/accessories/vox-hair.ftl b/Resources/Locale/en-US/accessories/vox-hair.ftl
index e6e32e9c80e37b01d83fb796c87909ba25498d2e..a0b2d74aec584dd9870e77a8db5fbe7b2783f218 100644 (file)
--- a/Resources/Locale/en-US/accessories/vox-hair.ftl
+++ b/Resources/Locale/en-US/accessories/vox-hair.ftl
@@ -5,7 +5,7 @@ marking-VoxHairEmperorQuills = Vox Emperor Quills
 marking-VoxHairFlowing = Vox Flowing
 marking-VoxHairHawk = Vox Hawk
 marking-VoxHairHorns = Vox Horns
-marking-VoxHairKeelQuills = Vox Keel Quills 
+marking-VoxHairKeelQuills = Vox Keel Quills
 marking-VoxHairKeetQuills = Vox Keet Quills
 marking-VoxHairKingly = Vox Kingly
 marking-VoxHairLongBraid = Vox Long Braid
@@ -25,4 +25,5 @@ marking-VoxHairSpotty = Vox Spotty Quills
 marking-VoxHairMadScientist = Vox Mad Scientist
 marking-VoxHairHedgehog = Vox Hedgehog
 marking-VoxHairBushy = Vox Bushy Quills
-marking-VoxHairSlick = Vox Slick Quills
\ No newline at end of file
+marking-VoxHairSlick = Vox Slick Quills
+marking-VoxHairCatfish = Vox Catfish

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
index 01d88513d8fca19708912a81554290499e7b61f0..e6e5026fc08675ce7b6b7706ab9d73eb552450bc 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
@@ -147,7 +147,7 @@
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: mange_s
-      
+
 - type: marking
   id: VoxHairMohawk
   bodyPart: Hair
@@ -267,7 +267,7 @@
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: wise_braid_s
-      
+
 - type: marking
   id: VoxHairYasu
   bodyPart: Hair
@@ -276,4 +276,14 @@
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: yasu_s
\ No newline at end of file
+      state: yasu_s
+
+- type: marking
+  id: VoxHairCatfish
+  bodyPart: Hair
+  markingCategory: Hair
+  canBeDisplaced: false
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: catfish_s

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/catfish_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/catfish_s.png
new file mode 100644 (file)
index 0000000..5c24134
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_hair.rsi/catfish_s.png differ

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
index 446bbd5c9582cf5ac7935e77955335175d9b24af..59791d521c1ba34cfc7ad43bd36d998c83380a90 100644 (file)
--- a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
@@ -1,123 +1,127 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled. wise_braid_s modified from braid_s by Flareguy. mad_scientist_s modified from keelquills_s by Flareguy. spotty_s, bushy_s, hedgehog_s, and slick_s by Flareguy",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "bushy_s",
-      "directions": 4
-    },
-    {
-      "name": "crestedquills_s",
-      "directions": 4
-    },
-    {
-      "name": "emperorquills_s",
-      "directions": 4
-    },
-    {
-      "name": "keelquills_s",
-      "directions": 4
-    },
-    {
-      "name": "keetquills_s",
-      "directions": 4
-    },
-    {
-      "name": "shortquills_s",
-      "directions": 4
-    },
-    {
-      "name": "tielquills_s",
-      "directions": 4
-    },
-    {
-      "name": "kingly_s",
-      "directions": 4
-    },
-    {
-      "name": "afro_s",
-      "directions": 4
-    },
-    {
-      "name": "yasu_s",
-      "directions": 4
-    },
-    {
-      "name": "razor_s",
-      "directions": 4
-    },
-    {
-      "name": "razor_clipped_s",
-      "directions": 4
-    },
-    {
-      "name": "mad_scientist_s",
-      "directions": 4
-    },
-    {
-      "name": "mohawk_s",
-      "directions": 4
-    },
-    {
-      "name": "hedgehog_s",
-      "directions": 4
-    },
-    {
-      "name": "horns_s",
-      "directions": 4
-    },
-    {
-      "name": "nights_s",
-      "directions": 4
-    },
-    {
-      "name": "hawk_s",
-      "directions": 4
-    },
-    {
-      "name": "long_braid_s",
-      "directions": 4
-    },
-    {
-      "name": "short_braid_s",
-      "directions": 4
-    },
-    {
-      "name": "wise_braid_s",
-      "directions": 4
-    },
-    {
-      "name": "mange_s",
-      "directions": 4
-    },
-    {
-      "name": "ponytail_s",
-      "directions": 4
-    },
-    {
-      "name": "braid_s",
-      "directions": 4
-    },
-    {
-      "name": "surf_s",
-      "directions": 4
-    },
-    {
-      "name": "spotty_s",
-      "directions": 4
-    },
-    {
-      "name": "flowing_s",
-      "directions": 4
-    },
-    {
-      "name": "slick_s",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled | wise_braid_s modified from braid_s by Flareguy (github) | mad_scientist_s modified from keelquills_s by Flareguy | spotty_s, bushy_s, hedgehog_s, and slick_s by Flareguy | catfish_s by Cadunkus (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "catfish_s",
+            "directions": 4
+        },
+        {
+            "name": "bushy_s",
+            "directions": 4
+        },
+        {
+            "name": "crestedquills_s",
+            "directions": 4
+        },
+        {
+            "name": "emperorquills_s",
+            "directions": 4
+        },
+        {
+            "name": "keelquills_s",
+            "directions": 4
+        },
+        {
+            "name": "keetquills_s",
+            "directions": 4
+        },
+        {
+            "name": "shortquills_s",
+            "directions": 4
+        },
+        {
+            "name": "tielquills_s",
+            "directions": 4
+        },
+        {
+            "name": "kingly_s",
+            "directions": 4
+        },
+        {
+            "name": "afro_s",
+            "directions": 4
+        },
+        {
+            "name": "yasu_s",
+            "directions": 4
+        },
+        {
+            "name": "razor_s",
+            "directions": 4
+        },
+        {
+            "name": "razor_clipped_s",
+            "directions": 4
+        },
+        {
+            "name": "mad_scientist_s",
+            "directions": 4
+        },
+        {
+            "name": "mohawk_s",
+            "directions": 4
+        },
+        {
+            "name": "hedgehog_s",
+            "directions": 4
+        },
+        {
+            "name": "horns_s",
+            "directions": 4
+        },
+        {
+            "name": "nights_s",
+            "directions": 4
+        },
+        {
+            "name": "hawk_s",
+            "directions": 4
+        },
+        {
+            "name": "long_braid_s",
+            "directions": 4
+        },
+        {
+            "name": "short_braid_s",
+            "directions": 4
+        },
+        {
+            "name": "wise_braid_s",
+            "directions": 4
+        },
+        {
+            "name": "mange_s",
+            "directions": 4
+        },
+        {
+            "name": "ponytail_s",
+            "directions": 4
+        },
+        {
+            "name": "braid_s",
+            "directions": 4
+        },
+        {
+            "name": "surf_s",
+            "directions": 4
+        },
+        {
+            "name": "spotty_s",
+            "directions": 4
+        },
+        {
+            "name": "flowing_s",
+            "directions": 4
+        },
+        {
+            "name": "slick_s",
+            "directions": 4
+        }
+    ]
+}