From 610d3daa444e83866fbb5cca4cb1f7bedf23ab5c Mon Sep 17 00:00:00 2001 From: CometBlaze <59415394+CometBlaze@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:21:43 +0100 Subject: [PATCH] Baseline Marking Fixes (#18907) Fixes some of the issues described in #18876, namely: - Hoplan using the wrong markings and having the option to add lights - Markings not applying to the hands when selecting the "Primary Color" option - Torso and arm markings not being selectable - Markings being lighter than the selected colour Additionally, makes it so the "Primary Color" option doesn't add a head marking to avoid applying the default TV head marking to the alternative heads. --- .../abstract/new_player/sprite_accessories.dm | 22 ++++++++++-------- html/changelogs/CometBlaze-baseline_stuff.yml | 10 ++++++++ icons/mob/human_races/markings_baseline.dmi | Bin 1751 -> 1780 bytes 3 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/CometBlaze-baseline_stuff.yml diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 090ca5f9889..02c88d277fe 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -6189,6 +6189,7 @@ Follow by example and make good judgement based on length which list to include name = "Baseline - Raxus Primary Colors" icon = 'icons/mob/human_races/markings_baseline.dmi' icon_state = "raxus_primary" + icon_blend_mode = ICON_MULTIPLY is_painted = TRUE body_parts = list(BP_HEAD) robotize_type_required = list(PROSTHETIC_RAXUS) @@ -6208,32 +6209,33 @@ Follow by example and make good judgement based on length which list to include /datum/sprite_accessory/marking/baseline_head/hoplan name = "Baseline - Hoplan Primary Colors" - icon_state = "indricus_primary" + icon_state = "hoplan_primary" robotize_type_required = list(PROSTHETIC_HOPLAN) -/datum/sprite_accessory/marking/baseline_head/hoplan/lights - name = "Baseline - Hoplan Lights" - icon_state = "hoplan_lights" - /datum/sprite_accessory/marking/baseline_color name = "Baseline - Primary Colors" icon = 'icons/mob/human_races/markings_baseline.dmi' icon_state = "machine_primary" + icon_blend_mode = ICON_MULTIPLY is_painted = TRUE - body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_L_ARM,BP_R_ARM,BP_GROIN,BP_CHEST,BP_HEAD) + body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_L_ARM,BP_R_ARM,BP_GROIN,BP_CHEST) /datum/sprite_accessory/marking/baseline_color/arm name = "Baseline - Primary Arm Colors" - body_parts = list(BP_R_ARM, BP_L_ARM, BP_R_HAND, BP_L_HAND) + body_parts = list(BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND) -/datum/sprite_accessory/marking/baseline_color/arm +/datum/sprite_accessory/marking/baseline_color/leg name = "Baseline - Primary Leg Colors" - body_parts = list(BP_R_LEG, BP_L_LEG, BP_R_LEG, BP_L_LEG) + body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_R_LEG,BP_L_LEG) -/datum/sprite_accessory/marking/baseline_color/chest +/datum/sprite_accessory/marking/baseline_color/head name = "Baseline - Primary Head Colors" body_parts = list(BP_HEAD) +/datum/sprite_accessory/marking/baseline_color/chest + name = "Baseline - Primary Chest Colors" + body_parts = list(BP_GROIN,BP_CHEST) + //bishop /datum/sprite_accessory/marking/bishop_lights name = "Bishop - Lights Colour" diff --git a/html/changelogs/CometBlaze-baseline_stuff.yml b/html/changelogs/CometBlaze-baseline_stuff.yml new file mode 100644 index 00000000000..14f1f0c6599 --- /dev/null +++ b/html/changelogs/CometBlaze-baseline_stuff.yml @@ -0,0 +1,10 @@ +author: CometBlaze + +delete-after: True + +changes: + - bugfix: "Hoplan Primary Color now uses the correct marking." + - bugfix: "Removed Hoplan Lights marking." + - bugfix: "Added the missing torso and arm markings to the list of available markings for baseline frames." + - bugfix: "Fixed markings for baseline frames using a lighter color than the one selected." + - bugfix: "Baseline - Primary Color no longer applies markings to the head to prevent issues where the default marking would be layered over the alternative ones." diff --git a/icons/mob/human_races/markings_baseline.dmi b/icons/mob/human_races/markings_baseline.dmi index 0e4dae31fb89489d8d69ae3c5fe044598858c937..8cb1a959219e3cdc9080b9b1eb5b758048a6bfea 100644 GIT binary patch delta 1718 zcmV;n21)tX4fG9=Qh(@rR9JLGWpiV4X>fFDZ*Bkpc$}To!D_=W3uupw>EFzq=N(oh1%E$+2*tUgYi;-?!NX%T^{!87bTE)`a^GD zR;oCYiFR1LZd75B8XNx>AwtBVTnJo#LdD}rc(w>;p$bD1#(xV`aS~{8tlx)SWax)- z{WOoaRnnZ>k~2c}Bc0d(vvxu)NdFkIzGHA{X3CbNTBt2KoRCx?ZL;DlC6xu29+7hy zW0R3FM{#xXK4vt_VztGPt{U;=l2z8D`u3(zM!Pk(cwOc2IJ9L|nt&dTatiZ$ox%iblfdrsAse*cfKvZ=gw&j1Y>MAkgN z${~&2Gc6ha(*nj$+tN!O04*&oF000000000$ zDX#LEYyBaAv;fx$oD&p*{s#a600000004lmOByX-s6CCAOuZOI(VW`DC}RFvb8W=5 zl}?%eDAoHW`Hi+(r^NPl5wA8IrD;ks99~R1q5qoh4%Ge`EvY^Dd3>eg57O1~N23HU zPj^b~-G9rD4XCH-jwZNFx0*bxX3=U!?M<@T(D+2p=$~L1Wjbk+ptl|jVs_w#oj`x> z{l_D|kA2eb8pMa}nLZq9-cEZ+^^y4dN1d`KASO64)4pY`jm?`vd_10000000000Oxo7yT4&MaWroiX_B}zr?+JoOhnC`(tVVL! zuOo`?tzT-+Ur2VnAY3Nm6Ini~Bhi2Oh<_IajQL9($YqO?Cqu4xW_1$$@UNx$izBK= z?=sE2?=vC*00000000000Qf41(vtesY>1PySmm?YWwDU?Rlk)6zaL^MWuRA5p%8ATK)Z?~Efp<8U5v2jAQ#q3Z;-=38-$jsFTmx`}AMjc5!11~$P;XlRUdG~$y;{d>=6`_|2mk>8Jp9W=QBiZo&9?Wj5%Br8?pc9g$7Nza z#ug_4RAKH{_?$eO`xUZ2y<=kCd*P~_AJUGzfjk#T>LTa)+Lu|)|6HWLiROMmulVkLNa z(XczZ1c{+6=;W=7#QsOxVDWO`M9p94Za09u1KsL(`&>U{`w!}Ibz4}s`kfl*`XSwa z@G`$&*;v=Dey7H{en=Ct<~QkBzgy?}A$`i${B}r(`kl9aPl#^sw>EEGbx%GjLd^XK zdy`--?yBGI-{&{`kNI^0aetKC>38{8jeK;{f4tAryXCf`jZkYp%u5hS|8ba?Hubso zV_&b&9DIlb_Vg;CAy`o*VG?>i7|?D|El!6xM2p3VBftknAs zWE;DFuxY6@0QUv@pCi!!T!H@Q4D>&Vg3Si$AyK~*;+;_wTmK{b4}XgKoeM!^&fw8FV`awaztBh{}qyEpX9~AVv>i9?I4~Y4@;e7KQ*8l(j M07*qoM6N<$f+{0vp#T5? delta 1689 zcmV;K24?y64c85jQh(igR9JLGWpiV4X>fFDZ*Bkpc$}Tn%?iRW3;^Ks`V_@oRs2Iw zUPKWO`U)ei(H62+()zQvcT<=k2)6W+q({4#0-mrl8v7rFV*mgJhehhVGe`7hnF< zGXwzu;4TQ$h2%1##@yH$dB%rZA-?wxr1+&2pN*vsLTXsviD$fCOYr~z0000000000 z09?jX9uwlz7q9r5{1z4{185_9#u6zt&tEF>R#_=KoOWolAZX zFIpGG4!0?`wb<^d{WD!sJNS8crR@jB>hQxU!PCo~QhWQnWew_S zv84$vi+>kQcB@&sno)a`Z#FbO*E4zwMro;YmjuIg5M*q_GdqCMI{c4Ed>=<-zH6NA z%O|=!(R@1XzR(BaA02eTUVxZjV8~~t+_oPZFE|fb2jzrcQ(?jD5mo*&nV-$kVwyW$ zgEl#z4;^~C zFzv{;uaVZdzf@1YHQC?Ol*w0>eNA~nErM{x>_f?HtxW}0yGfv)s3eG(z<4;mAE?7# zQ+2G;$F!4v=S%!l{SjN|*&}s0=6X);kPk}S+k%?3XyxpGdQ<6^+60+HCOA~gWS37PeW<85pE~`0GKCkKZgbe`{4cfl zX$GGl00000000000Dwu?8eQist~t!`8IqwV7!5r^aPQDk{0mnj*&MYIMR(ReK9uJH z;Y%Vuk>&F?68&EvaZsQYB^kE3aCpdgXMfoy!N2~kG=CB0bROKi0RR91000000002! z6H%;EzucO5_m;mRR=X?~GQaA#i@_h8m`WMzmF3~Z0FU7Cp%YkKMcO+5t4@fq2_4Jr zU2CdqpchsA<`x^*Twz_$*ilrckHvukev_&ik)KUD>Y%z@(K$`>HK^FUy13?oPI8MO0euRL8Jd5KAmv3{$O(a%?1PCGc&oY;Ke{q4t(}s6y{yKI$94z*K@9Zl5kF6i5$I|+PbdwnGi5ge>A6-8%oG3{S#H{>?8w)H{m+~~%-<&(^uJc|9#kLomAXgf5AUkx>23MGka1lgLj&tA3EyAGV0^oSjrZDAXTX@%K*kBi^h(bU8u3@f~2k zr@7W2dQ#O7n)Qb+Ul@JkMbyl$KWwfawCWFqcu(SuU4PhIKWNn-3V-qUPWA2Atp97) z4{iNXi1(x1*!6#n`k}2q3h@Bkn!fcvZ+h1Myy;v2^QLe8&!3+4KYx1G|2m*&{qOz} z^t+oQ=y$hA(C==Kq~8qy)bITR+_-*EqDj9S0*(6JAaK<0z}Mr(`rRGStltfQX8jJd jpi#dY0L}UxxXk|mBNDdm;J_hR00000NkvXXu0mjf-+)F~