From ce5f3d6618cc894cfad1a028df1b2cd6fbf9957f Mon Sep 17 00:00:00 2001 From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Sat, 30 Nov 2024 19:37:32 -0800 Subject: [PATCH] Moves Lizard Full Stub horns to beard because of overlay issues. (#2590) ## About The Pull Request Moves Lizard Full Stub horns to beard because of overlay issues. The horn option of it would overlay over masks, looking silly. ## Why It's Good For The Game Fixes good. ## Proof Of Testing it just werks. ## Changelog :cl: BurgerBB fix: Moves Lizard Full Stub horns to beard because of overlay issues. /:cl: Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com> --- .../customization/sprite_accessories/horns.dm | 4 ---- .../new_player/sprite_accessories/hair.dm | 6 ++++++ .../icons/customization/facial_hair.dmi | Bin 6583 -> 801 bytes modular_zubbers/icons/customization/horns.dmi | Bin 1599 -> 1536 bytes 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/horns.dm b/modular_zubbers/code/modules/customization/sprite_accessories/horns.dm index c62be8327d7..f8224e8a0f0 100644 --- a/modular_zubbers/code/modules/customization/sprite_accessories/horns.dm +++ b/modular_zubbers/code/modules/customization/sprite_accessories/horns.dm @@ -33,10 +33,6 @@ name = "Biter's Horns" icon_state = "biterhorns" -/datum/sprite_accessory/horns/bubber/fullstub - name = "Full Stubby" - icon_state = "fullstub" - /datum/sprite_accessory/horns/bubber/big icon = 'modular_zubbers/icons/customization/horns_big.dmi' diff --git a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm index 109cb409211..61c8ac1a8a7 100644 --- a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm +++ b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm @@ -24,6 +24,12 @@ icon = 'modular_zubbers/icons/customization/facial_hair.dmi' icon_state = "noselick" +/datum/sprite_accessory/facial_hair/fullstub + name = "Full Stub" + icon = 'modular_zubbers/icons/customization/facial_hair.dmi' + icon_state = "facial_fullstub_s" + natural_spawn = FALSE //Only works with the full face snout. + /datum/sprite_accessory/hair/twistedlong icon = 'modular_zubbers/icons/customization/hair.dmi' name = "Twisted Long" diff --git a/modular_zubbers/icons/customization/facial_hair.dmi b/modular_zubbers/icons/customization/facial_hair.dmi index 5d9285798f2647e93391c9f0619df184c6ecb064..5dc472395f93fa43ecf9b501858d846a7116dc3c 100644 GIT binary patch literal 801 zcmeAS@N?(olHy`uVBq!ia0y~yU_JoCOw2%$_8mVsfD})FPlzkSe})GS9{m6RAISJ7 zYM2BRXDkWw3ubV5b|VeQ*gnBKVH{+9+1N{A&Z9|3CWR;jYw8+W8XKzHsc+WW zsG+KEY-z2#afiyjh|X?f)y*p;Qh3DEqXLuiv^sKGObk^`)i(;AFuS72^=RWt3-$dn z(|yI3+%^di=;tr|d9I~wpYski{rwiAPdXloAIMy4X?aw2sppQS>l3^q4_-abI!B&C z!;w+zoq{qA`Q;WpZ!7N{C9Jab@O*D z47n_Q=~`6Z`SW`ghHPvD1{M-9SbgPtzj@xj@3YJEs+{fSe4ot-mi5^1@x9~u{O9+Z z=e;|;pPd&;3uVj=hH&@#*VZk1^v|lE$L$wu`_E!wxyL{MwH^AJ%o};*OWT&M(;j~| z&esTCqX@BZ!o_p`kMY{w@W$_;$6e`t*H%y6#GB|0QJbLn@ZpuEoT1a#xBpzVd!^_T z#Y;WtOnU%tXUBfe#gzOf{pfc^>bP0 Hl+XkKhvp7E literal 6583 zcmeAS@N?(olHy`uVBq!ia0y~yU_JoC9Be?5U)Ka?1F6+jArU1msl~}fnFS@8`FRWs z6?1~a3W`dc*DVx*K<>?2G8^HdfudLL!AnJUuEfDNm~-m&L?T z)l_|>&I2uC!3!FEia&Y{_kt0D*q~!k_0_%Jw<$P}ARUA^N0aq5OeUT#Ar*7p-U-ZmeVZUm+5WUG$&6T=-rB{|29>OK*k4ijszej#9{y>IhiCF7#dg@c^DWR znizngqu|KE%)l@~p#iAW!@|Cb@%)QlReNLO^iIFIo+AHx&9&=+pQUPTzdikzZ~Wiv z{C~6W_A-b2>lyFKow}`^|E(h6?2iw|zkj=(%RY8<{h9yCulHQrE4k7Bc4=A-|BU~& z%HPwD)qeZ=f9Ijk^ZP^3)fbf5^F4UmR+4O%+g`-J;QmjB6w{=%&FAj^{l7DvUt#|L z@0I_U&*WQL?qj(B#jZi-90P*|S3L{&53~IYj0^=Xc%3hB0O&&%qJ2B696234{PTj9 zf#JZ#*!cC^PoGYm`FGZv?ygv z#_Qf*WD#Is*c|2ei5Hk78GvaVPsSXC!8Dr9Fw4);XhJSgkZYFFkQogbkI_Uhnh0o? z2ny=HFfmlfUBCYN?Wdy1wEb$oBht6->zj4`#p{jw-|J`p+%Eg_=X>#lhWuNQrt6Od zvp#-E{`S3h&h?(n@iYG)zgD@n+Bm6x+v_tw|BKx#|8YaK8Oxoy zalcHXoZ(mOQ*Hq}b6CrDG0O%2pMUnh_c;Im>634)3_m7)XM7^SQ(#la$j0zP3D|U% znT^rd9%Q+}ddI%FeD@t{z>YyD!@Yw~pKg+QI1AXGRvm3}Lpn!;EWSp&I@tTLWJS{) z`MtpKd?1mx{C2LT?&-zX4JX@vPg(Xi?)s*`-*vKoaf13k4Dm%zKHNM#uiEHxU4Hh= zOkaCNP_OyN;>E|`dx7K!ai0e0KZ{kjUzSDto&NNq^i0N+duMi?f4%G4b;;}BJgU!R zKl^^5=QR_mOj~%dTK}|8=3k z?e^Zo=Z}Azak*;k&1dJ213O9UpFjL2HzW1m`~3_vQ+@x~?qm2pL*Jocv4q@#YFnPP z>Jw+S&5N7?Du>_h)Hi8!2|NpD{A_Qz}bpK%*lC{Kt#{2hwDxL}u`wFb)89ZJ6 KT-G@yGywoAzJ3P) diff --git a/modular_zubbers/icons/customization/horns.dmi b/modular_zubbers/icons/customization/horns.dmi index 7a10b671956ed4d1c3377a62cd448c30fc092668..afd2e71e2340eb78d18a9f6a4558972fe99f1006 100644 GIT binary patch delta 1460 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 U{~_gM5B`5;ZwI%nwfQ~iKlQWeNB{r;