From 812fcc7e54bb425fcd1fa7645c1c4efc5019f41e Mon Sep 17 00:00:00 2001 From: NullFag <55005783+NullFag@users.noreply.github.com> Date: Tue, 27 Sep 2022 15:47:59 +0000 Subject: [PATCH] New markings and frills (#262) --- .../sprite_accessories/body_markings.dm | 26 +++++++++++++++++- .../new_player/sprite_accessories/frills.dm | 22 +++++++++++++++ modular_sand/icons/mob/frills.dmi | Bin 560 -> 1131 bytes modular_sand/icons/mob/mam_markings.dmi | Bin 0 -> 7858 bytes modular_sand/icons/mob/skyrat_markings.dmi | Bin 458 -> 0 bytes 5 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 modular_sand/icons/mob/mam_markings.dmi delete mode 100644 modular_sand/icons/mob/skyrat_markings.dmi diff --git a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm index 843470c583..9019d5630c 100644 --- a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm +++ b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm @@ -1,5 +1,29 @@ /datum/sprite_accessory/mam_body_markings/colorbelly name = "Coloured Belly" - icon = 'modular_sand/icons/mob/skyrat_markings.dmi' + icon = 'modular_sand/icons/mob/mam_markings.dmi' icon_state = "colorbelly" covered_limbs = list("Chest" = MATRIX_GREEN) + +/datum/sprite_accessory/mam_body_markings/abs + name = "Abdominals" + icon = 'modular_sand/icons/mob/mam_markings.dmi' + icon_state = "abs" + covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED, "Left Leg" = MATRIX_RED_BLUE, "Right Leg" = MATRIX_RED_BLUE) + +/datum/sprite_accessory/mam_body_markings/abstwo + name = "Abdominals Two-Tones" + icon = 'modular_sand/icons/mob/mam_markings.dmi' + icon_state = "absbelly" + covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED_GREEN) + +/datum/sprite_accessory/mam_body_markings/absthree + name = "Abdominals Three-Tones" + icon = 'modular_sand/icons/mob/mam_markings.dmi' + icon_state = "absarms" + covered_limbs = list("Head" = MATRIX_RED, "Chest" = MATRIX_RED_GREEN, "Left Leg" = MATRIX_ALL, "Right Leg" = MATRIX_ALL, "Left Arm" = MATRIX_RED_BLUE, "Right Arm" = MATRIX_RED_BLUE) + +/datum/sprite_accessory/mam_body_markings/gloss + name = "Body Gloss" + icon = 'modular_sand/icons/mob/mam_markings.dmi' + icon_state = "gloss" + covered_limbs = list("Chest" = MATRIX_RED, "Right Arm" = MATRIX_RED, "Left Arm" = MATRIX_RED, "Right Leg" = MATRIX_RED, "Left Leg" = MATRIX_RED, "Head" = MATRIX_RED) diff --git a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/frills.dm b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/frills.dm index d5131e8d55..f0acf01481 100644 --- a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/frills.dm +++ b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/frills.dm @@ -11,3 +11,25 @@ icon_state = "cobraears" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/frills/cobraslim + name = "Narrow Cobra Hood" + icon = 'modular_sand/icons/mob/frills.dmi' + icon_state = "cobraslim" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/frills/full + name = "Full" + icon = 'modular_sand/icons/mob/frills.dmi' + icon_state = "full" + +/datum/sprite_accessory/frills/long + name = "Long" + icon = 'modular_sand/icons/mob/frills.dmi' + icon_state = "long" + +/datum/sprite_accessory/frills/split + name = "Split" + icon = 'modular_sand/icons/mob/frills.dmi' + icon_state = "split" diff --git a/modular_sand/icons/mob/frills.dmi b/modular_sand/icons/mob/frills.dmi index 574372f4d6a7d3252250177092631bed67a7644d..04d621e5d6b7b10a9eafbd1b8dbdd80ac5344ee3 100644 GIT binary patch delta 1028 zcmdnM@|vT*Gr-TCmrII^fq{Y7)59eQNG||k4rU;^M{v44kg^Z(32{Ae;6N3S-OR8A zNG@U6#=vj_$k@hERaN!w-8-P{0|tiu3=Gp47*+zsS2COfk}#oz3=9*lzVHT$FqQ=Q z1v5B2yO9Ru%&iKU7+qGMd8>=N$jIB{@}#g?lbvVv&H1yZ#Hc2C&g7Zh{T7?=$`T^vIy=DeNtGH++r(U%vXQ^sRfTZ>r9(dn~Qn z9DLd2R!FvH{VlS;v8m?VjIX*(maUb6m&}hdr+S{d_DbH&AwN;@MPGzKM0?4GWvp6X z`=b@iH)uWi8vA-dRQ-MCwe{f|wklQi+%wtOuH3)Bu%=dfbhdDwXt^8|0 zd2OlmC!VbpS^v+^dr;Q$L^A8+m4EZC4}E?B63ef**x4S^z5Lt%ZOz#;uJ;J}*T4V& zm*K;Im_0EEHk^y`IQPuY_1NaS54(EP_gFsDnZI+(U$yTGj$W79xo6dctIwC6Ykg}z zbMaB87#rIp<%HH=CpA^xxd;Xz)f9ea_l)HPI zkNZ5yC^Rha;C!L*{r5)aBZAt6?RE7{m!uQoTmMyB%O5Ta=(2ydWI^QnHEmxP9Ie=P zXU`_ zRTR!Wqt@{9!J-SXGx#>`yPaHnbJ4?XnR0tXFZ~yOeEO8)yP1=Yww+zryya+i{XDnj zJqpRrr-k|+zPkT<#`5Pn4m$%Qe}9hVc)37`ufVciRQOTwe>KMQH}yYn|IH3{fr4u8 z^|GKlZMV5kf9DRWneZrA{d_!^i}#z~g>S_2aCboFyt=akR{0Kx|76#xJL delta 451 zcmaFOv4JJBGr-TCmrII^fq{Y7)59eQNGE_W3p0=u*p|f&q@)9ULR=3VI8X&-H!~~& zl1mu2F)*9}GPW@Q#WkmE!~)rjB|(0{3=Yq3q=D2;tgWcG%RR-lu1+uEIU~abbHh8F zO|Hv;%1k_6977^n-%fYTI&2`|>ONsYZphY>+j5Q?O1HP1W0YztYA(AwsdasPWOv2C z6D}$&Txa*RCcOFi%ZRO>|6-_)|LGFnlzjk?G%B`Vv&*^hHpW`dz+a5T z?9!dhY~uWy1&#II@&yO%^tMYG;!dW&yvh@Nqkjpe-S{o;d) zjS0PcX|t!_l(rA@Do}YCpi@=xLPc(ud!u5FsoIeTmCex?Q)d(`bO@YMe}2>5rXOY8 z3FQeBKR?XzHSxdW^sM!4<-^vbjp_2Q!{T_(>_1)wSxcv diff --git a/modular_sand/icons/mob/mam_markings.dmi b/modular_sand/icons/mob/mam_markings.dmi new file mode 100644 index 0000000000000000000000000000000000000000..448a89116771036047f0402f1cd97822ba390ce2 GIT binary patch literal 7858 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 NeBJU|#Z|YM{|ES$YH0uf literal 0 HcmV?d00001 diff --git a/modular_sand/icons/mob/skyrat_markings.dmi b/modular_sand/icons/mob/skyrat_markings.dmi deleted file mode 100644 index 8537496a16f8dc7d2d91714561b1dc8219de6f9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmV;*0X6=KP)005)_0D1txz`%BcK%xKu00DGTPE!Ct=GbNc004)2R9JLGWpiV4X>fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3K9+H$Evpr7}J@u_!w;FTFTEIX@@AC@D23r!wBr#Y>5cGbOXA7-Sk3XIfEWZYqdv zh|umvmUd+YS3ei9a{;^pIC>B)_9_4X0MkiCK~z|U?U&sR!Y~Yk6UYEGVS%J9K*Inj z?7tHaNEPS)ocvI!2!C%U+dV~!e5rHBf6-lZ{iiyR4&Okg(i4k<^;ico5V6i3(oO5| z0C_I`cE3wa>wp9MpF!>5>wUZ5bxnML-K8t3&rn`Y!!UM*