From ba6ceac7eff918e654e59e7b420c02b234a6f6b5 Mon Sep 17 00:00:00 2001
From: creamybag <lygadenis@gmail.com>
Date: Tue, 25 Feb 2025 17:32:45 +0300
Subject: [PATCH] DismasHair (#939)

* DismasHair

* new rsi, new meta, new name
---
 .../Locale/en-US/_CP14/markings/human-hair.ftl  |   3 ++-
 .../Locale/ru-RU/_CP14/markings/human-hair.ftl  |   3 ++-
 .../Mobs/Customization/Markings/human_hair.yml  |  10 +++++++++-
 .../CP14_human_hair.rsi/dismas.png              | Bin 0 -> 560 bytes
 .../Customization/CP14_human_hair.rsi/meta.json |  16 ++++++++++++++++
 .../Mobs/Customization/human_hair.rsi/meta.json |   1 +
 6 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/dismas.png
 create mode 100644 Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/meta.json

diff --git a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl
index 4725cf65fb..e829bdfcad 100644
--- a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl
+++ b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl
@@ -18,4 +18,5 @@ marking-CP14HumanHairUpdo = Updo
 marking-CP14HumanHairVLongFringe = Straight bangs
 marking-CP14HumanHairVolaju = Volaju
 marking-CP14HumanHairWisp = Wisp
-marking-CP14HumanHairMaxyShagy = Maximum Shagginess
\ No newline at end of file
+marking-CP14HumanHairMaxyShagy = Maximum Shagginess
+marking-CP14HumanHairDismas = From the high road
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl
index a70d4f78e6..826b9f5cca 100644
--- a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl
+++ b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl
@@ -18,4 +18,5 @@ marking-CP14HumanHairUpdo = Пучок
 marking-CP14HumanHairVLongFringe = Прямая челка
 marking-CP14HumanHairVolaju = Вояж
 marking-CP14HumanHairWisp = Огонек
-marking-CP14HumanHairMaxyShagy = Максимальная лохматость
\ No newline at end of file
+marking-CP14HumanHairMaxyShagy = Максимальная лохматость
+marking-CP14HumanHairDismas = С большой дороги
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml
index 479fd0f9ed..9f0f830e79 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -164,4 +164,12 @@
   markingCategory: Hair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_hair.rsi
-      state: maxy_shagy
\ No newline at end of file
+      state: maxy_shagy
+
+- type: marking
+  id: CP14HumanHairDismas
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/CP14_human_hair.rsi
+      state: dismas
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/dismas.png b/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/dismas.png
new file mode 100644
index 0000000000000000000000000000000000000000..68b19faa4e086a745955bc80e155623abd85fc6b
GIT binary patch
literal 560
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zUwOJXhE&XX
zd&jo#k%7dqkLs&+S5DL^Z1^I^{y;?2g3XfEtIzQvb3k=f+dcCQPj1z2V>oYQ{d=LT
zrLx2S`7JHFiPrC%3yx|t0u5%^7ZP0Un7y_waYm3=e(~w2LACeICzaUE&(4pW`~BbH
zpXRfDzeaf)vpm>4zsIo4aNpUfh4;Uo-OK)A`{(n5hqlk^ZWV}A>CL@uc1&Vw`0Z`I
zOFkA@?74Dh{WgI^2|bee-TIz}Zj#Bz1P%pMpI^neCT#WfDM4GVW$nIecKhwN%-h>G
zUej7C62AIs_SwH#-Pcb^Cm*~0)2MI1TJXW|v$|#bkMFqu{=V$JC~ePO=iX<%3%~uf
z{J%5D(hu9eJLztY(dj>9xqY&pczz(){nEQXe*4$TG5&GnbegsN1ITZfpuzvwq&mk*
zS4!_X|JA;4X@0lQ`~2ctZ_Co&i<kWVC-{qXs{Vv8|K1dT<5_jA+WzUB<#Rqi*ek!}
zG;^!KGJ!)+=FIl`KBYQk?bPBtt>?PwU+?i-K39BhQ~7>*z0T+ORm)};&+}V;S;JFv
z=?@)Wy*b6ZpB81RWbTc7FV^k4bysNajW0b%r|aDf3i1m4^|NPd2(Q9Yk@;(XxN<IJ
g0Y?UkgBz?rGBbPpI&g>e^eT{qr>mdKI;Vst04^W=GXMYp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/meta.json
new file mode 100644
index 0000000000..59899044ae
--- /dev/null
+++ b/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/meta.json
@@ -0,0 +1,16 @@
+{
+    "version": 1,
+    "size": {
+      "x": 48,
+      "y": 48
+    },
+    "copyright": "dismas by creamy",
+    "license": "All right reserved",
+    "states": [
+      {
+        "name": "dismas",
+        "directions": 4
+      }
+      
+    ]
+  }
diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json
index b9d427b328..6ad5eb1897 100644
--- a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json
@@ -91,5 +91,6 @@
         "name": "wisp",
         "directions": 4
       }
+
     ]
   }