From 952d82470d5d516f458a2385cc4b7d90ae776d2f Mon Sep 17 00:00:00 2001 From: desven <45808369+desvenlafaxine@users.noreply.github.com> Date: Thu, 18 Nov 2021 13:09:03 -0600 Subject: [PATCH] Fixes some body marks not showing (#12765) --- .../abstract/new_player/sprite_accessories.dm | 20 +++++++++--------- html/changelogs/desven-markfix.yml | 5 +++++ icons/mob/human_races/markings.dmi | Bin 24291 -> 24287 bytes 3 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/desven-markfix.yml diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 3139ac62768..245a59b0ab8 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -4151,21 +4151,21 @@ Follow by example and make good judgement based on length which list to include scar_chest name = "Scar, Chest" - icon_state = "surgicalscar_chest" + icon_state = "surgicalscar" body_parts = list(BP_CHEST) - species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b) + species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b) scar_chest_left name = "Scar, Chest Left" - icon_state = "chestscar_l_chest" + icon_state = "chestscar1" body_parts = list(BP_CHEST) - species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b) + species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b) scar_chest_right name = "Scar, Chest Right" - icon_state = "chestscar_r_chest" + icon_state = "chestscar2" body_parts = list(BP_CHEST) - species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b) + species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b) scratch_abdomen_left name = "Scratch, Abdomen Left" @@ -4241,13 +4241,13 @@ Follow by example and make good judgement based on length which list to include tat_circle_back name = "Tattoo (Circle, Back)" - icon_state = "tat_circle_back" + icon_state = "tat_circle" body_parts = list(BP_CHEST) species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/diona/coeu, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) tat_circle_big_back name = "Tattoo (Big Circle, Back)" - icon_state = "tat_bigcircle_back" + icon_state = "tat_bigcircle" body_parts = list(BP_CHEST) species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/diona/coeu, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) @@ -4265,7 +4265,7 @@ Follow by example and make good judgement based on length which list to include tat_harness name = "Tattoo (Harness, Chest)" - icon_state = "tat_harness_body" + icon_state = "tat_harness" body_parts = list(BP_CHEST) species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/diona/coeu, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) @@ -4367,7 +4367,7 @@ Follow by example and make good judgement based on length which list to include tat_spine_back name = "Tattoo (Spine, Back)" - icon_state = "tat_spine_back" + icon_state = "tat_spine" body_parts = list(BP_CHEST) species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/diona/coeu, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) diff --git a/html/changelogs/desven-markfix.yml b/html/changelogs/desven-markfix.yml new file mode 100644 index 00000000000..f6b75ff134f --- /dev/null +++ b/html/changelogs/desven-markfix.yml @@ -0,0 +1,5 @@ +author: Desven +delete-after: True +changes: + - bugfix: "Fixed some body marks not properly showing." + - bugfix: "Fixed those marks not being selectable for Axiori Skrell." diff --git a/icons/mob/human_races/markings.dmi b/icons/mob/human_races/markings.dmi index 0b5a4e503d9b87067031db0680422f3a00fb0683..c91051c67a0f2007029c77f18166763159ce5950 100644 GIT binary patch delta 1186 zcmV;T1YP^%y#e370gxmCu#qJ#e_a?+6Os`{3PUQc`|I~0*^+~zdE;9Ge2;H59F9nt zpQ!M-kYkR2fh$I*(l{n5XjM{aoPR~1wNPoIx2^;qtwLjH7+Vej zt^chATn6Vptguimv(5NW=i3@61>j=dLJaU*~54>wHB(`c+ zTp0*BRV$Ab+sb3byycOp-Nu9P9fwyS>obO>d||PCFEEzu1;#SHlg|MOf4P^YFi8gM zwHFSd=~8)r8@sUcD-Fg;1{I4I_C^7g_LTx^q}O3-B*u#goExCQTnhrWOK{UbQMD7D z6<|M|A~pC{;Y^2g#0A+*h0!hV`UJWS%;wdPzNj`E3{;YRcx7oPu})#MRe{ZRU976r zy{uT3=2E~nsRF8M92b^kf1ISj6Ylm#2l@p+f>~(8lpS7YFT|Dw4S%Bm120sXFuhRJ zSj+;2L!?64!LzWHC|sVC2^z3@iI+nr z{HQ$@U9rvrF!q?TIwChkWk`!cQ4vQUZEnf*ngcD96s4x+5KbUZf0Jz-Q#Xdms*dH| z7$)2K)PYHkYO~w=P|)ceifiAQqobyDyqNGA8UWVyX!d6sd}jD zzpmd-CP~DrdKI8EaAKXqD!?5AWv3WFPVaBSdH_8VQeO_v7>;a1aG ztaVoOp0mWb`R#g(e+mtcCfl@R`Y}mC_weUlXDEYBYpV#}x`N9>I1%Q{N?p_vr6fe9fxqzdMzq#ZSWNFe}l{$mBPz7&PChNmhP^R z6)H`kA@%8&?xfiCT{jzbF}{`F+N{*ZzfmjO)+SRoywHyRcAds_{ef^G>Cy5D>BwRn za}VzmSB2udTCyRj!JsaJJ-Y9h#Ck&^8$!1#h05}QNpl+WR;|gSj~d>QM9%2^4 z>67?|Pv}>0zGvW%9+B^DK4EAEAm<-HC+=q4ykUuu?Pu15SkJaP%3#Z-x-o%mNq*Rv_v*82+TCXWn A4FCWD delta 1190 zcmV;X1X=svy#eFB0gxmCw2>t(f1MbS6Os`{3M3WR{q=j0Y{@~<1LfXFTR!gYjL)TcXxiP~bEbjkzb~V76wQYEfBbu@ddvBJ zimJlMtJp`*_gyllk#cR8EP#REXGM8<*KTHmfX&KLH1NOz*yiLT97SLY2Z6I$J*QOR zfd#O3T;6A^x17Pbn^|n`W){ovIR+$a=NNDn%Fm@aQ zTK`)KxD3vHSYRPqW}ES$&bKuX3c$s@i3nPxn}B3Iy0A9}LIGAuW#ll$9(dPYNNm-t zxG)fKs#YE=ww1?obO>d||PCFEEzu1;#SHlg|MOf2Gf=GUWo+ zYo9p;Wm0{A8@sUcD-Fge4mxfTR$m*A#>qG%^N zE5Lp_MN;@y;Y^2g#05o9mC-Hl`UJ8K%;wdPzNj`E3{+Blc;(zp**byIRs}ZOb+L+8 z_p)L|no9xSqzb4?Ij)?Oe|9+yo^ZD}I?ylp5zImtrsD8Adm*-*(eO74Fz`xMh3SQ& z#9|f*93oXJ4xWXrMBwtAa^_McE@z3rrKaM%#A6nK4%%^XJ~L`?;lc4cAC1RQKJjwM zgder1Dl67m0LC6u5l7^vC=6*)2rA;}qb(ijUUHyi%2lZ8ID`|(f74`@V=`lytms&7 z#xPmqlL3<)S@$?uokwvdc-olY`O=QLFJpq2{3<|KWKKsBE2#cTf2{re?#^(aQ}fWY ze_g+wbjlI0>Q#Wwz=>rJs{nThRGeV^K*hoDeVwUlr>HY&;HcnJ_8VQeO;-jA;a1aG zEOi$2p0h-|`R#g(e+mtcCaXHq{g`q^_weUlr>THVYpV#}x{Av}I&yv?@H|43RYg-6 z=jVYnubeCY98-q-)EgC8_cU3RwDzN~6r^_7LV;sPx-Z_qo0cn$z^8b_#wVH4DiS*N z(=V}6KmEGN=ccDxg;GZ!e|fpxtP*+^$03}gUW-av8$3n)e<1TlCGgUYOOt-V^#<$X2o0Zu3H)>(q+GOg67uwO^u9KLqKM)R-d$fE)I&#*I zxrg_Ot3q&ItwmE-L19s?iVP~sl&#kkiY8Q2sV<+GR7bkUj$__RC1vzcfIG^OOHo}i zC+Pb;{q!k&f5j*Cn_NfHkmXiH??v=M7zzH}mMrgO_(6uZf?FYEc`w5cGQ1UBlp)J| z8GexAt>kje5{-mE2>DiUog;5{-mE z2>DiUn`@aXQF26hEBWDViAI(jkiYs7