From 48d134cc7dd610b2327a70eac8e6267c28ed1198 Mon Sep 17 00:00:00 2001 From: Futuristic-OK <141568243+Futuristic-OK@users.noreply.github.com> Date: Sun, 11 May 2025 06:09:27 +0600 Subject: [PATCH] New hairs2 (#36613) * Update human-hair.ftl 1 * Update human_hair.yml * longwithbangs.png * Update meta.json * fix png * Update meta.json * Update Resources/Locale/en-US/accessories/human-hair.ftl Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Locale/en-US/accessories/human-hair.ftl | 1 + .../Mobs/Customization/Markings/human_hair.yml | 7 +++++++ .../human_hair.rsi/longwithbangs.png | Bin 0 -> 1506 bytes .../Mobs/Customization/human_hair.rsi/meta.json | 6 +++++- 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/longwithbangs.png diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl index 0ce0e27be7..7754d772a5 100644 --- a/Resources/Locale/en-US/accessories/human-hair.ftl +++ b/Resources/Locale/en-US/accessories/human-hair.ftl @@ -196,3 +196,4 @@ marking-HumanHairVeryshortovereyealternate = Very Short (Over Eye) marking-HumanHairVlongfringe = Very Long with Fringe marking-HumanHairVolaju = Volaju marking-HumanHairWisp = Wisp +marking-HumanHairLongWithBangs = Long With Bangs diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml index 0af782a6a5..b67eb7631c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -1384,3 +1384,10 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: longbow +- type: marking + id: HumanHairLongWithBangs + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: longwithbangs diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/longwithbangs.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/longwithbangs.png new file mode 100644 index 0000000000000000000000000000000000000000..f1230241c0ec89b1dffd7665e1763caa6101292b GIT binary patch literal 1506 zcmV<81s(c{P)Px)f=NU{RCt{2n%_?oSro@VL#a(m1C}2xqf>2@CPhLFk+7IROz_3T2VZvAKKc*s z{vmdk5RASQlg0-hl$a=z*l3`}mJa=i!IpM_a`$E1KvoTRriHM~=VjVy=iGC@_uPBW z%p9<}*eGT%OeT|}zrP=Vsi`T`cC55tC=~Gf{Q%6*&zth0SN4L{)m1S%I*QZjq|s=Q z%jJ0U=8f3d*)i>eEU8pV02B%ZR8_TPt4HR~uV23wBO@bx{P+=v!$GszBoqqKXfy}} z0=#_rQdsil1SFG50ibCbe!m}0(~g~&MM?m-+f6>7XKrpzsaC7F-EIuSU}9o|dcBU% z=QHEOiAg4tVtRV|yT46OPn!}!N`PjwNv&1`;L4RN3V_SyqS0soP_Nek*xcOgXe9i| zp4IRNNdfZtJhQX2?Rh>lG^FhA?$X!SM>HBG8jVsem&L%qfMv&yGB7Yexm*?i*=!a~ z)4qEw6bjO|r3AQl@1C-}ynJjlg2AA&v9ZD7;UPUeJrs*Yyk2id7elYts}zex3WWl? zu9MAX0gfHty?bZMc1IlD%w)u-uH*4|n3$O8>Q3u-L!J%h{T0w5NP zNw+N(0RZ`YUMwyy9*crQ;PCK}-d^clRhn2VrWl4nCX?aU-+u$ZFbq?j2T1`EiGG}hME&@>H)!_huJGc$9l znP4myQ_|`5zsXRMU{Et{OL__b?F{g&SzTRaYU-9H8&U#{kB=*Ex0_O_#KVUVPd)!X z%7+ghD3!{V?MO#JE7^(1<6TdCf5!d$_m%DKZ8kR2mh4C`+itg;dcDrgn>Q^r+zEU> zA9HiFM59sD(I^!G@pxQRDwTHlx9-Z$ffwOVC(c*wLJQ<>mdlS-w85Q3qhA=cM7EZI7j0s!r2fftfg zDkZAbYJ2ZrT3QlIOG~D5fpfVA{2#X8j$(H7ZES38Y%V&M>H}0&ZD(YAdwUEH4xY;X zT&Yyr+n&`nO2Py}iBMy?d8y*RGMv<#4%N?Ck8&Y&QA&^((u( zyVB1GrSAq?ucKRNnugcwRlHuW(yftiasB#r0G>a8&i3{;ilT7!>Q(mk_Bc2=ps%k_ z+NQJsnx?U`vI2mv>;HKb-t9F2V1IwV{aM#_YPA~qe4bjZ)-KjKDbfP0tgJ9OIZ3Hh z>PUr#47#rK^yyOqfdHziQY;n$2m}ILx^#(py^diRQZ}Uo2!%p8olX*o1YWP#R7Hjr z=I7^?a=FZ%J9iX-k&zKTefmTs5>Wv9`}?J*fpoa0(`oVf^JfkY4p3FK>je=%Bb7>t z)~f&N)hp4e84QQRC-zBt3WUR9B^V6icDvcy+A>|9)(Lc7Z+|w^d9aWPrqgNh{{4G; zdU{Y*^-QWoJAq}VpFDXYoK7dfV6eR?omRzYC+LWy3kwTE2*KFc*qN>gX0ZHNyj8X3 za5yjw<4o5CGjwFM78e&qI2@+gY@WNdpkpsaCMPEqfVXeoo~sDxC~IqL7q{~^Ha0dk zHa0dkHa0friGKjGaXDn&V*fn=000hUSV?A0O#mtY000O800000007cclK=n!07*qo IM6N<$f`csAmH+?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json index 3184166186..454b6870eb 100644 --- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github) for SS14", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14", "license": "CC-BY-SA-3.0", "states": [ { @@ -802,6 +802,10 @@ { "name": "longbow", "directions": 4 + }, + { + "name": "longwithbangs", + "directions": 4 } ] } -- 2.51.2