From 49dcb50a7bf7b98641c7f5632c7ea569b0a661e1 Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Sun, 1 Sep 2024 15:08:53 -0700 Subject: [PATCH 1/8] neck stuff --- .../GAGS/greyscale_configs_neck.dm | 40 ++++++++--- .../GAGS/icons/mob/maid_costume_worn.dmi | Bin 0 -> 1150 bytes .../modular_cosmetics/GAGS/icons/mob/neck.dmi | Bin 0 -> 5055 bytes .../GAGS/icons/obj/maid_costume.dmi | Bin 0 -> 757 bytes .../modular_cosmetics/GAGS/icons/obj/neck.dmi | Bin 0 -> 2178 bytes .../json_configs/maid/maid_arm_covers.json | 16 +++++ .../GAGS/json_configs/maid/maid_costume.json | 16 +++++ .../GAGS/json_configs/maid/maid_headband.json | 10 +++ .../json_configs/maid/maid_neck_cover.json | 16 +++++ .../GAGS/json_configs/neck/face_scarf.json | 18 +++++ .../GAGS/json_configs/neck/long_cape.json | 56 +++++++++++++++ .../GAGS/json_configs/neck/robe_cape.json | 10 +++ .../GAGS/json_configs/neck/wide_cape.json | 22 ++++++ .../modular_cosmetics/code/neck/neck.dm | 68 ++++++++++++++++++ tgstation.dme | 1 + 15 files changed, 264 insertions(+), 9 deletions(-) create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_arm_covers.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_costume.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_headband.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_neck_cover.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/neck/face_scarf.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/neck/long_cape.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/neck/robe_cape.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/neck/wide_cape.json create mode 100644 modular_doppler/modular_cosmetics/code/neck/neck.dm diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm index 9b207650ddcf9..25fbba65fdb76 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm @@ -10,16 +10,46 @@ ＼二) */ +///////// +//CAPES// +///////// + +/datum/greyscale_config/robe_cape + name = "Robe Cape" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/robe_cape.json' + +/datum/greyscale_config/robe_cape/worn + name = "Robe Cape (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi' + +/datum/greyscale_config/long_cape + name = "Long Cape" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/long_cape.json' + +/datum/greyscale_config/long_cape/worn + name = "Long Cape (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi' + +/datum/greyscale_config/wide_cape + name = "Wide Cape" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/wide_cape.json' + +/datum/greyscale_config/wide_cape/worn + name = "Wide Cape (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi' /////////// //COLLARS// /////////// + /datum/greyscale_config/collar name = "Collar" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/collar.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/bell.json' -// Bell /datum/greyscale_config/collar/bell name = "Bell Collar" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/bell.json' @@ -28,7 +58,6 @@ name = "Bell Collar (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/bell_worn.json' -// Choker /datum/greyscale_config/collar/choker name = "Choker" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/choker.json' @@ -37,7 +66,6 @@ name = "Choker (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/choker_worn.json' -// Thin Choker /datum/greyscale_config/collar/thinchoker name = "Thin Choker" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/thinchoker.json' @@ -46,7 +74,6 @@ name = "Thin Choker (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/thinchoker_worn.json' -// Cow /datum/greyscale_config/collar/cow name = "Cowbell Collar" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/cow.json' @@ -55,7 +82,6 @@ name = "Cowbell Collar (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/cow_worn.json' -// Cross /datum/greyscale_config/collar/cross name = "Cross Collar" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/cross.json' @@ -64,7 +90,6 @@ name = "Cross Collar (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/cross_worn.json' -// Holo /datum/greyscale_config/collar/holo name = "Holo Collar" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/holo.json' @@ -73,7 +98,6 @@ name = "Holo Collar (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/holo_worn.json' -// Leather /datum/greyscale_config/collar/leather name = "Leather Collar" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/leather.json' @@ -82,7 +106,6 @@ name = "Leather Collar (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/leather_worn.json' -// Pet /datum/greyscale_config/collar/pet name = "Pet Collar" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/pet.json' @@ -91,7 +114,6 @@ name = "Pet Collar (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/pet_worn.json' -// Spiked /datum/greyscale_config/collar/spike name = "Spiked Collar" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/spike.json' diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi new file mode 100644 index 0000000000000000000000000000000000000000..96434a04eb2d1e22783365cdcaadd641fa4cca90 GIT binary patch literal 1150 zcmV-^1cCdBP)S?=ml9IVs5+mL zkROhHe8I*SgkTuvyAZYCF)g09L6D~<4)#q5)9YRRKZZCZ4Ptz8m~$X$6mq+pijY`u zE)HILeXM`fi)RrONtj~1EFgQ8eG?m-7oB!*jhD<$IWQ!}lMaMAXKzK(Ygb&qU=KlJ zA<;urfxWJdO)fV4%*BsC?e}5lXAXE1G0jMA>wNs&ME(H>n??w$@SyPzEV=po!FYLT04{2Tmxz zNTQ(}1dZD#w;)wgxCFv0gjwRW7ibL@y@SC=|~PS{<^o!enAAuyYo#*g|{}hfBMoj z^ksS}-su}HF^TV>9J2B50_ToLzh#tlyO2c~WYoca$i{D(I?wUqOv4k}K*JrpBcq{{ zpG9wF-^EM{m@h7(&Cto&$?pQ1xS%E2F|T*h#D|kS>TxAS zJ?Fu`q@F;~ImKH1rlswJBNvIo8ALtL9h?)~jZRZMQI?PID;S1hnE##w8ARCYbNXRO zCsYagqyM)UID~pF?W*u?ahU4Wv^Su1 zL_f?y($;^smP_?&x+am@_Gs|9-a&ipMzmC~rfZYZ4(rtz@`q}MVHk#C7^WxKbD7!m zUy2N;TsjMUu5u8J<BMFUQIbxyCtJ6b=y-yvP|hX(%uHMAw< zjqXp^6NfQfXCSOY$U=A%!EN*#4xuKw39gRp^WB_w$vcl|(d7v^ho{ESGe<#|0fMUx z!!VyDHq)BE%SZP0W+^M&`J-Cs6t^N5ZWQXY`Hbu49bDWF&KG8(AU!VCx?3*mP|LE= z^xgjcv=X#G$5(g-&ERK{w*Nn{)oW4SF)o{NKv|xHg_y5)z%UHMFbo6y1+OMx$lp?y Qw*UYD07*qoM6N<$f<;y(%m4rY literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4216ab384ad7dd808b9b055b23ef5a74c2490a1f GIT binary patch literal 5055 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 ZMaHsDpNeDZE<17nZFP)VwaSBte*u9OD^~yj literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi new file mode 100644 index 0000000000000000000000000000000000000000..61e3abcf91fb93a582bb13f251b6ab713d1bf4b1 GIT binary patch literal 757 zcmVA}82S-Y!QBq=1TzP`a+70hjB`G#4T)*k!Q zFxu`sz>{N=CD?=Auhw8*Lh7>FZNWH}o6};FqH>mvN1T|4Rg(?>UxVtK}<7F#3{7wR}a1W26fP`bD?4AG^;EZ!+I`t(ie^6#xJM=Sf6C zR9J=WmqBx@AQXj>;66I(9+}I&Gi~=i%H3PS{r`WZh`whquL6rMI?b8rOqla|E)i~& zv4?(>n)N8wFavV?{+t8&daOD{;HA7IJ6+jn@?$Z;?0c$9dV81u=EK=Y+Js-uq^zqp3e$sZ$$5Z~VLu%^9)uett15B)5e?wmJm5{A6$ zx?;Q4L<&fK8PZPMIS7MY5s@1Tfi|=?nzcmmY47KNVXXB=t^-!;2rLnr7-oPljYyan z;la^9L>S3oOh!UcegTFa3{E+KSt7dt`lIjEp12pc)~YxMuAS{v7GPl10t8msOQzQb zHA?-xbDY3Dq z8h_Y~iYf^7^M)@cgr6H@AjU#~#{_3}=@XA|Mrnu6lt%E_ssW)iLeTuH5)?;>cwuyC zNR~y!>xuxVvV>JgyZ)V%;2x>~#!bz7ngRIk1O~FskF}4_wSb^%;P^G@PKdd;lDmL9 nAgrZIKzLpUgjFu_fPSsLsi=9N!QmrkuH)O_^RBMzX z_N}y~wvw9C+B+>uM3`!&Jnygf{&???d%x#=&$;KGb3gaobF&=mEKWnkp#T7!wz5S3 zdZPG~@ZmXilIaNvRwwc_!PzYueIv?0GAKMc=yn(Y#65Cy4Ufcr+j9zM?yn)Om5}3a zCY%~wRHoFIRum^}69dl>XsH>J zU1+njDrCJnvpl)?a+^2)8r*Ifo7KA=M~#kkiM@u!V!Pq#73dl>< z0K8oO zYLtFTp7M2!rFoU3Z&~fFMYcQ%cjIU#8L^n=eWsxBQ+6SXluz|BklU+gbeDGD;h7nb zt?D~?SZgDviFl?lX3a?kasB){owin5r!4Bt`n+iI8jh3FgQcFXhD_q;&Vc$T=zP&Q zaZfF`o-gd9GMRIIKqOOuaAtLoh^G>~LyQmO92xOWC0m?r8I?K8TA zoZPLINAf9O4_#vlwiD)Fvni*2Q2S<~Ux; z>-1I2Oo%?Q4{g@<0SS+rtG8PWVm=xkjxTDt)Dq}TDkP}pE>MDB(wb_OPWsH?73E)) z7_N3lNm*JDO=OAwyDD;sky-)>X+o#^oN#+p*7sk;&i{Xy=bxn((b|8i1o*~Zd~%RJ z0&bM5Ja_iDH5lyg2{!-dlzAiVsGiN46vznQE?Z0i# zlfLdRd1`-h?1bQ_EUE-^G#Pb7%JAJ~-|)hr;)>Cn#NGuvQ^C||utwh&(HDynJ}^zl z9A-Xs|9ytzxnSiv8H<;(&HfcIGV78TdCcRnEtNaa-|-Ix#6nY`pOC{Lb@1hUqL2v_ zY@Q5=vW~i+MI?1hq=3Xo4231|E*LQ(l)l3CL<#y-qB2aV#{^oV4tVhXTKWG@AUVzUUg2koklE3Aa*~lQ$hyvl&j{VEa z%g&r}ABE?Nd8X_?G=DNfPcNW1u)0qmz?jLxxJc-#jHjmv2tU=%gWmwDs9tdkYIPDF z5y3s@_I20Qc#s7o=<(h1pXSNLYk?^HdpEP2D0NLzR<>0&35SY(F*LUd7=orn(Zx&} zx6sDT3uX7lId(3GB?_ZtUYTli&AC6}C{qs}buson++jIc5boR0ZhU#l9WJJ6C*#l! ziU)gmp)@YQK>OPf`Z~Dap47MY|L`h~RTYC9*N+%%b-RNoAmIV)gT#&_7>z&HGTZm5 z)hpcH#Lm+(<J7!tyWd{5LSdl zfoU$J!RfVr2(kgUK)>-4U@uUkFVMql76lR*<88jCsfZ4jFehP zK5mYVSk8ERCGoKL5W9hvfq3>GdEV~O`;t# zl%=+wAKL9lL$mH(aBNC;ur%GU+U&Gv(!#9}vC8k<&9al#Mt=2+#!LY@l&~RGGPE8; z4!)wom9hP?gXDRIz*;<%b?Ee{KcK? z2dt@5qz+8YDRAUy(oF$jL$UhtpDm@hNw8aY*UBvq@y8i6OynHTJybu@I?RvV%HqcW z%562J!d@fuUf1ig1B2O`EPhu&RMs!f!U7hbC%97RR6g5NFJf z`k`bc2lAJYKB>w@x6yGb7efs?hdq)3I2`&iUwV5l+E7DdLJwMZ8GC2}gE<#C)2}vn zg6}aSyFqCD?fOOE51C2dtoL;|aJkWbNm05=0Lr|&wNX*25+<-(F6a!$XX6>iX%J!> vaUl}kRvT;U00!dCe;J&uW7*=DijG0be|QKJ6xvcxo(jOq%nsdP;zRfs+kpLg literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_arm_covers.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_arm_covers.json new file mode 100644 index 0000000000000..5d7320becb78d --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_arm_covers.json @@ -0,0 +1,16 @@ +{ + "maid_arm_covers": [ + { + "type": "icon_state", + "icon_state": "maid_arm_covers", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "maid_arm_covers_trim", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_costume.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_costume.json new file mode 100644 index 0000000000000..b24c236a25b14 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_costume.json @@ -0,0 +1,16 @@ +{ + "maid_costume": [ + { + "type": "icon_state", + "icon_state": "maid_costume", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "maid_costume_trim", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_headband.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_headband.json new file mode 100644 index 0000000000000..84d4c120ef68b --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_headband.json @@ -0,0 +1,10 @@ +{ + "maid_headband": [ + { + "type": "icon_state", + "icon_state": "maid_headband", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_neck_cover.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_neck_cover.json new file mode 100644 index 0000000000000..5e21c138ec1c5 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_neck_cover.json @@ -0,0 +1,16 @@ +{ + "maid_neck_cover": [ + { + "type": "icon_state", + "icon_state": "maid_neck_cover", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "maid_neck_cover_trim", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/face_scarf.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/face_scarf.json new file mode 100644 index 0000000000000..7d8628a309720 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/face_scarf.json @@ -0,0 +1,18 @@ +{ + "face_scarf": [ + { + "type": "icon_state", + "icon_state": "face_scarf", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ], + "face_scarf_t": [ + { + "type": "icon_state", + "icon_state": "face_scarf_t", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/long_cape.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/long_cape.json new file mode 100644 index 0000000000000..b931ef9368e45 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/long_cape.json @@ -0,0 +1,56 @@ +{ + "long_cape": [ + { + "type": "icon_state", + "icon_state": "long_cape", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "long_cape_top", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "long_cape_trim", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "long_cape_side", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } + + ], + "long_cape_t": [ + { + "type": "icon_state", + "icon_state": "long_cape_t", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "long_cape_top", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "long_cape_trim_t", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "long_cape_side", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } + + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/robe_cape.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/robe_cape.json new file mode 100644 index 0000000000000..c8d015889f9f3 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/robe_cape.json @@ -0,0 +1,10 @@ +{ + "robe_cape": [ + { + "type": "icon_state", + "icon_state": "robe_cape", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/wide_cape.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/wide_cape.json new file mode 100644 index 0000000000000..6e14585d207f9 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/wide_cape.json @@ -0,0 +1,22 @@ +{ + "wide_cape": [ + { + "type": "icon_state", + "icon_state": "wide_cape", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "wide_cape_top", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "wide_cape_trim", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/code/neck/neck.dm b/modular_doppler/modular_cosmetics/code/neck/neck.dm new file mode 100644 index 0000000000000..c7a022d562a4b --- /dev/null +++ b/modular_doppler/modular_cosmetics/code/neck/neck.dm @@ -0,0 +1,68 @@ +////////////////// +//CAPES & CLOAKS// +////////////////// + +/obj/item/clothing/neck/robe_cape + name = "robe cape" + desc = "A comfortable northern-style cape, draped down your back and held around your neck with a brooch. Reminds you of a sort of robe." + icon_state = "robe_cape" + greyscale_config = /datum/greyscale_config/robe_cape + greyscale_config_worn = /datum/greyscale_config/robe_cape/worn + greyscale_colors = "#867361" + flags_1 = IS_PLAYER_COLORABLE_1 + body_parts_covered = CHEST|ARMS + +/obj/item/clothing/neck/long_cape + name = "long cape" + desc = "A graceful cloak that carefully surrounds your body." + icon_state = "long_cape" + greyscale_config = /datum/greyscale_config/long_cape + greyscale_config_worn = /datum/greyscale_config/long_cape/worn + greyscale_colors = "#867361#4d433d#b2a69c#b2a69c" + flags_1 = IS_PLAYER_COLORABLE_1 + body_parts_covered = CHEST|ARMS + +/obj/item/clothing/neck/long_cape/Initialize(mapload) + . = ..() + AddComponent(/datum/component/toggle_clothes, "long_cape_t") + +/obj/item/clothing/neck/wide_cape + name = "wide cape" + desc = "A proud, broad-shouldered cloak with which you can protect the honor of your back." + icon_state = "wide_cape" + greyscale_config = /datum/greyscale_config/wide_cape + greyscale_config_worn = /datum/greyscale_config/wide_cape/worn + greyscale_colors = "#867361#4d433d#b2a69c" + flags_1 = IS_PLAYER_COLORABLE_1 + body_parts_covered = CHEST|ARMS + +/////////// +//SCARVES// +/////////// + +/obj/item/clothing/neck/face_scarf + name = "face scarf" + desc = "A warm looking scarf that you can easily put around your face." + icon_state = "face_scarf" + greyscale_config = /datum/greyscale_config/face_scarf + greyscale_config_worn = /datum/greyscale_config/face_scarf/worn + greyscale_colors = "#a52424" + flags_1 = IS_PLAYER_COLORABLE_1 + flags_inv = HIDEFACIALHAIR + +/obj/item/clothing/neck/face_scarf/Initialize(mapload) + . = ..() + AddComponent(/datum/component/toggle_clothes, "face_scarf_t") + +/////////////// +//MISCELLANIA// +/////////////// + +/obj/item/clothing/neck/maid_neck_cover + name = "maid neck cover" + desc = "A neckpiece for a maid costume, it smells faintly of disappointment." + icon_state = "maid_neck_cover" + greyscale_config = /datum/greyscale_config/maid_neck_cover + greyscale_config_worn = /datum/greyscale_config/maid_neck_cover/worn + greyscale_colors = "#7b9ab5#edf9ff" + flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/tgstation.dme b/tgstation.dme index 68246d851194b..05d76d84c5d70 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6367,6 +6367,7 @@ #include "modular_doppler\languages\language_datums.dm" #include "modular_doppler\modular_cosmetics\code\jacket_pockets.dm" #include "modular_doppler\modular_cosmetics\code\neck\collar.dm" +#include "modular_doppler\modular_cosmetics\code\neck\neck.dm" #include "modular_doppler\modular_cosmetics\code\suits\jacket.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_neck.dm" #include "modular_doppler\sprite_accessories\code\hair.dm" From 24615c2f3441b46580ede8c4045046ce2cf584f7 Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Mon, 2 Sep 2024 09:58:12 -0700 Subject: [PATCH 2/8] more --- .../GAGS/greyscale_configs_neck.dm | 27 +++++++++- .../GAGS/greyscale_configs_sets.dm | 50 ++++++++++++++++++ .../GAGS/greyscale_configs_suit.dm | 17 ++++++ .../GAGS/icons/mob/jacket.dmi | Bin 0 -> 2549 bytes .../modular_cosmetics/GAGS/icons/mob/neck.dmi | Bin 5055 -> 6469 bytes .../GAGS/icons/obj/jacket.dmi | Bin 0 -> 1595 bytes .../modular_cosmetics/GAGS/icons/obj/neck.dmi | Bin 2178 -> 2725 bytes .../GAGS/json_configs/neck/ranger_poncho.json | 30 +++++++++++ .../json_configs/neck/ranger_poncho_worn.json | 30 +++++++++++ .../GAGS/json_configs/suit/chokha.json | 33 ++++++++++++ .../GAGS/json_configs/suit/chokha_worn.json | 33 ++++++++++++ .../modular_cosmetics/code/neck/neck.dm | 4 +- .../modular_cosmetics/code/suits/jacket.dm | 9 ++++ tgstation.dme | 2 + 14 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.dm create mode 100644 modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/neck/ranger_poncho.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/neck/ranger_poncho_worn.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha_worn.json diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm index 25fbba65fdb76..b4c5def04815f 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm @@ -1,5 +1,5 @@ /* - ／＞　 フ meow! this dm file contains greyscale configs for any clothes we add. please name + ／＞　 フ meow! this dm file contains greyscale datums for any clothes we add. please name | 　_　_| / them in obvious, easy to search ways that are consistent with your item paths <3 ／` ミ＿xノ /　　　　 | @@ -41,6 +41,31 @@ name = "Wide Cape (Worn)" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi' +/datum/greyscale_config/ranger_poncho + name = "Ranger Poncho" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi' + json_config = 'modular_nova/modules/GAGS/json_configs/ranger_poncho/ranger_poncho.json' + +/datum/greyscale_config/ranger_poncho/worn + name = "Ranger Poncho (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi' + json_config = 'modular_nova/modules/GAGS/json_configs/ranger_poncho/ranger_poncho_worn.json' + +/////////// +//SCARVES// +/////////// + +/datum/greyscale_config/face_scarf + name = "Face Scarf" + icon_file = 'modular_skyrat/modules/GAGS/icons/face_scarf.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/neck/face_scarf.json' + +/datum/greyscale_config/face_scarf/worn + name = "Face Scarf (Worn)" + icon_file = 'modular_skyrat/modules/GAGS/icons/face_scarf_worn.dmi' + + + /////////// //COLLARS// /////////// diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.dm new file mode 100644 index 0000000000000..16d81ba5f9e94 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.dm @@ -0,0 +1,50 @@ +/* + _..---...,""-._ ,/}/) + .'' , ``..'(/-< ( This dm file contains greyscale datums for ensembles or 'sets' of items, so + / _ { ) \ / that they can be found all together in one place! To qualify as a set or + ; _ `. `. < a( / ensemble the items in question should explicitly be intended to be worn together, + ,' ( \ ) `. \ __.._ .: y such as the combination of maid dress, head piece, gloves, and neck piece below. ) + ( <\_-) )'-.____...\ `._ //-' + `. `-' /-._))) `-._))) + `...' +*/ + +//////////////// +//MAID COSTUME// +//////////////// + +/datum/greyscale_config/maid_neck_cover + name = "Maid Neck Cover" + icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_neck_cover.json' + +/datum/greyscale_config/maid_neck_cover/worn + name = "Maid Neck Cover (Worn)" + icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi' + +/datum/greyscale_config/maid_arm_covers + name = "Maid Arm Covers" + icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_arm_covers.json' + +/datum/greyscale_config/maid_arm_covers/worn + name = "Maid Arm Covers (Worn)" + icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi' + +/datum/greyscale_config/maid_costume + name = "Maid Costume" + icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_costume.json' + +/datum/greyscale_config/maid_costume/worn + name = "Maid Costume (Worn)" + icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi' + +/datum/greyscale_config/maid_headband + name = "Maid Headband" + icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_headband.json' + +/datum/greyscale_config/maid_headband/worn + name = "Maid Headband (Worn)" + icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi' diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm new file mode 100644 index 0000000000000..27521b9cf4b09 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm @@ -0,0 +1,17 @@ +/* ( *snores* this dm file contains greyscale datums for suit slot clothes! ) + / + |\ _,,,---,,_ / + /,`.-'`' -. ;-;;,_ + |,4- ) )-,_..;\ ( `'-' +'---''(_/--' `-'\_) +*/ + +/datum/greyscale_config/chokha + name = "Chokha" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha.json' + +/datum/greyscale_config/chokha/worn + name = "Chokha (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha_worn.json' diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ce0a84afc0b8e8c6982d83ada24983c59fa95fc4 GIT binary patch literal 2549 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 WzfFrV^K%D(9Kal54JR16C;uCShR$OE literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi index 4216ab384ad7dd808b9b055b23ef5a74c2490a1f..fc49441368b6f964f8356731409e712d42255036 100644 GIT binary patch literal 6469 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 IX;{7d56{0GJpcdz literal 5055 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 ZMaHsDpNeDZE<17nZFP)VwaSBte*u9OD^~yj diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ff30d2df68ad1dc8c9c809c69e099e12ff6e4fca GIT binary patch literal 1595 zcmV-B2E_S^P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLErQJ0meZKPgLzi!&v&s2C_{$i0}>8g_e00n1BL_t(|ob8)! zXdFct$DhPXu9t1ot7)|+freHwAd*rL1c`z~KNKo{XwgtLm0BqZ`C=8(_`w*8_Jf3$ zilJzf5~X6%QiU3XG!+DGv6MoJwWQdTP;+u#b4l;0-kJZL&vvtyy?wct+1<_$!t5@) znVbKAW}atXre<_>loax)mHh*5b(8^;S>pA=R4SIcd})%}?ys*Y=MTEo@MHkQf2gC4 z@OSvLkzC8#X415TGQtBjZiDcZ%eA@o4UMF&Y!>^P77^vV5hU9PbPQSbkDr^(d6^Ad z836Hj@9v_({hv~7bpti8zgHap@rN_i{$PH4;=)x?R$GWwYwpX*svo*EwPZcj=XeTY z@#`WH+WE@!!i4LyXX(PlBz1Idq%%MNMh`#MPRT@))~;`+#9t%?sfG{`UsnBIdp_gH z0Eqv~k$xe5CY{zz=zZ%WTHdfsKQA>ir*FsZ$RDq!5i;t}w?FIodRqe^{)wSC#rBgM z*3mb=UKA#boH!+pjg6ev&()Si#Z-je$e>q3n6Z(`iU;dr^-oVFDpKdQF!;~pSC4P|LzX^%bv;N$}v+r;*kr#kc#ARaIqfg7IId+rp| z4DJH}$AH3>b)tNvyFZlTgHrB-fo=dFurh)lKY;7AXbzf-3FSYlB zf)N0rz+y%uu1ts$!4$l>tGj57z~~68_~k+bVTdz+Zc>Z_vk^o$jfge1iftHypbE^v znz{7*q!Ql&1!*WxM^+;O`*y)P%;J}0+A(7JINHvLV!?Xf{;!ny4zYb7;Kc}-@X64@ zP>EkDY@dd*<90Cu`-2C+rJXxADe+z4_=Sv}5!lD}@E3=a_%3k$QofiGVVm=-f#=Us z%tk2jz2VsaMhRaU>dQFEC<7#;43La6Kr+ez$tVLPqYRLYS|1=8&m#aIRpnpg+ za8Jookc<(qs&RE_Ob=WPz_&{i=cnlQS}hbNl>98Hnm~Nx`h-Y*U2e(Je*ztY0y6@> z9@vvJe`yzV@j)O)z;Iu$m~M>g6TQfMe#~k4eto=Zs4PeYh1j&R@7{IU*K{6pQkE5NyxqeW@2ca?m`1OX%iqIJl tG?W37Q3gmx86X*DfMk>bl2Hao=0937^n|NX;1&P?002ovPDHLkV1m^2`&j@0 literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi index 176e021d25cc93cfc5ba390f78101aa9da024337..bc0bbc46fc6dcf6269a219365268b20335ada8dd 100644 GIT binary patch literal 2725 zcmai0S6GvY68#AwCLu`GM3E|j>k48-qJSZkfOJsWQUnx*NY{i!h!UeH2oj2Gp-WJs z5yhp44$`DZwFIO?AoM0g+Opr?*L&~7%sk9|=jEL5%!#(OHWh>KhXVj0W_H&2+|H!^ zQ&7lGuf=*b?~IBtduO8YD$iGw?Z9P)moD)I)QRgIBx6juE)dPlXzs$yAoLqE@(J6atGFubt3{y zi)Lp}A#aOi!`f-w-9l9?AuWPU2fQ9lXmnT!EXNXD?j3ncZKgO|~8LkBO?I&Q1ivTaW+&sXEtD_8X}(n!Lsd{7m#9w|(c&6?ckg~Y~O za*;M}WkjDn#l-@TOv|m_BoK7#akfZH**d@v8bSO>3?J4ELhXJAhjF zm-L>$G}GYPi@;ObAjYmpDY>okH%~ok5Gv`45J^$a3jWM8uBld$(U<~r& zejwrh5cWT~{AV>SmjAKfPqpy9)<=I8=s(W|{O4>|Vd%x*mrPZ$wI%x6+G=e@X`PHa z0W&tMk!kCU;hUd7PwNy_7Lhk@g@$UoYt!Ha@& z8=GJsQ*Bro2&%7$!s*=JKlrmLS4RLVV{(6YwZZ5at7nwb?y1GE)w#pa?OsK&)WCx{4AJmb3{%>o9&F1TBITTcy{A zMc%5z)l2n%sOq^O!6h3%%wMQR=>c=X!L`C9m8xo1rnygic&_pQvyt>gm2RSB>AzWe zPVoY8@5SBy9+`-VO{QuRv~f@ce1Kq|TTpOvuTZ~JnsDR%MCg@=)2$4T?RQMx1ScTsw|$d1ELkhdgibCd_efN zvDBSJZfbUo_y6pws~O)*sy z@$A|hSPz$2-~r3>yb{bH6C4F(IN?`3UnZCfRye^0UtZFiXKjjL3ZUV1_j-P$L~(){ zf-hbBX8w7aR01&-vLr`sbj_Ze>a(Bs{nBY(kzag}tzG+#AM@%x=hWR&LH-h_GN)lz z@CW@LySh(r=DWOm@Ud=WuR%rn*RuUi$-uNIL`w>f-mGb=~WD zf5^R~$&O~x8S6&k6q)H@BvoXL{xy~VrqM`nX1I#~uf}3HrQ2<^EZ*k1kC1bGZZH*V z?fOs$gF!M1AM}=%%FLH37>+Qq7f>7|zW+=VK{zrUve*hc@-Cvkhsd*&4LvNl`$hP0 zfqI@NL9j5^SY0WXYJ z2Ks7u-+&K}j2No{hUK5kBWEO za-aD(%NDoj7r`z*Ek~|9)LYggQ*R;osIKw(?ga={G`5q;X?Wc=z`ye zsVCxje}%qU^kc_CC>|Gy;`Na%jSH>4Mo&ccY%CUKm_DhjNSt0}wgow=XLIl8vu>Mu zpheZYytn$_!n7tC-}vPATTmHAxPnMrp@X_D38NVRcdraN!J$s3jP5@Wqb*DtpKDFV zJvf)uOAovxPrr(Cn|wyLRx5yu>=P3uI&owt*TD&)n_m@%Znw;+Jva$9DWasqLl2*=emGETjF_94 zP!>mn`j>Wp{i$z5*Y8^=Yidxg`UPm4kw)io06s|MK?S65p+eLr>H5{`(ms(Hod`*q z&|%N%1`ihw>U{4scb+shz>ii8%V%SU>ns&A_StW@ajc(a_gK^vOWs(vSUD}cEj#&f zZ9Lxvpv9gI@VelFJ*HTXsbymUq!45K4lJqFE2t#q`K0^Ep8zg7p>BSRa8p{b82^9N z`id@jT32048{Zwe$!ywj@00MHT{tBLY$Z{)ch|e{V(%#JJieW{*4&=aP66G=O4hQOA)!YkFqH8s-*-PK2=NML6&putGL&hJca&`3j47Y*8do$aR^eb}E2 zYWBx2)UDxk5u@cna%GULXjbXLd)OM5^!|=uyJQ+QU!JyFk!P%V=1khMc4n!&Wp>l$AC~;|Cz;JJ(D_Uv_fPSsLsi=9N!QmrkuH)O_^RBMzX z_N}y~wvw9C+B+>uM3`!&Jnygf{&???d%x#=&$;KGb3gaobF&=mEKWnkp#T7!wz5S3 zdZPG~@ZmXilIaNvRwwc_!PzYueIv?0GAKMc=yn(Y#65Cy4Ufcr+j9zM?yn)Om5}3a zCY%~wRHoFIRum^}69dl>XsH>J zU1+njDrCJnvpl)?a+^2)8r*Ifo7KA=M~#kkiM@u!V!Pq#73dl>< z0K8oO zYLtFTp7M2!rFoU3Z&~fFMYcQ%cjIU#8L^n=eWsxBQ+6SXluz|BklU+gbeDGD;h7nb zt?D~?SZgDviFl?lX3a?kasB){owin5r!4Bt`n+iI8jh3FgQcFXhD_q;&Vc$T=zP&Q zaZfF`o-gd9GMRIIKqOOuaAtLoh^G>~LyQmO92xOWC0m?r8I?K8TA zoZPLINAf9O4_#vlwiD)Fvni*2Q2S<~Ux; z>-1I2Oo%?Q4{g@<0SS+rtG8PWVm=xkjxTDt)Dq}TDkP}pE>MDB(wb_OPWsH?73E)) z7_N3lNm*JDO=OAwyDD;sky-)>X+o#^oN#+p*7sk;&i{Xy=bxn((b|8i1o*~Zd~%RJ z0&bM5Ja_iDH5lyg2{!-dlzAiVsGiN46vznQE?Z0i# zlfLdRd1`-h?1bQ_EUE-^G#Pb7%JAJ~-|)hr;)>Cn#NGuvQ^C||utwh&(HDynJ}^zl z9A-Xs|9ytzxnSiv8H<;(&HfcIGV78TdCcRnEtNaa-|-Ix#6nY`pOC{Lb@1hUqL2v_ zY@Q5=vW~i+MI?1hq=3Xo4231|E*LQ(l)l3CL<#y-qB2aV#{^oV4tVhXTKWG@AUVzUUg2koklE3Aa*~lQ$hyvl&j{VEa z%g&r}ABE?Nd8X_?G=DNfPcNW1u)0qmz?jLxxJc-#jHjmv2tU=%gWmwDs9tdkYIPDF z5y3s@_I20Qc#s7o=<(h1pXSNLYk?^HdpEP2D0NLzR<>0&35SY(F*LUd7=orn(Zx&} zx6sDT3uX7lId(3GB?_ZtUYTli&AC6}C{qs}buson++jIc5boR0ZhU#l9WJJ6C*#l! ziU)gmp)@YQK>OPf`Z~Dap47MY|L`h~RTYC9*N+%%b-RNoAmIV)gT#&_7>z&HGTZm5 z)hpcH#Lm+(<J7!tyWd{5LSdl zfoU$J!RfVr2(kgUK)>-4U@uUkFVMql76lR*<88jCsfZ4jFehP zK5mYVSk8ERCGoKL5W9hvfq3>GdEV~O`;t# zl%=+wAKL9lL$mH(aBNC;ur%GU+U&Gv(!#9}vC8k<&9al#Mt=2+#!LY@l&~RGGPE8; z4!)wom9hP?gXDRIz*;<%b?Ee{KcK? z2dt@5qz+8YDRAUy(oF$jL$UhtpDm@hNw8aY*UBvq@y8i6OynHTJybu@I?RvV%HqcW z%562J!d@fuUf1ig1B2O`EPhu&RMs!f!U7hbC%97RR6g5NFJf z`k`bc2lAJYKB>w@x6yGb7efs?hdq)3I2`&iUwV5l+E7DdLJwMZ8GC2}gE<#C)2}vn zg6}aSyFqCD?fOOE51C2dtoL;|aJkWbNm05=0Lr|&wNX*25+<-(F6a!$XX6>iX%J!> vaUl}kRvT;U00!dCe;J&uW7*=DijG0be|QKJ6xvcxo(jOq%nsdP;zRfs+kpLg diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/ranger_poncho.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/ranger_poncho.json new file mode 100644 index 0000000000000..9dcd4115e0787 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/ranger_poncho.json @@ -0,0 +1,30 @@ +{ + "ranger_poncho": [ + { + "type": "icon_state", + "icon_state": "ranger_obj", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "trim_obj", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ], + "ranger_poncho_t": [ + { + "type": "icon_state", + "icon_state": "ranger_obj_t", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "trim_obj_t", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/ranger_poncho_worn.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/ranger_poncho_worn.json new file mode 100644 index 0000000000000..f35c691008fca --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/ranger_poncho_worn.json @@ -0,0 +1,30 @@ +{ + "ranger_poncho": [ + { + "type": "icon_state", + "icon_state": "ranger", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "trim", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ], + "ranger_poncho_t": [ + { + "type": "icon_state", + "icon_state": "ranger_t", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "trim_t", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha.json new file mode 100644 index 0000000000000..b997fbe1ae1c7 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha.json @@ -0,0 +1,33 @@ +{ + "chokha": [ + { + "type": "icon_state", + "icon_state": "chokha_obj", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "chokha_shirt_obj", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "chokha_collar_obj", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "chokha_paulets_obj", + "blend_mode": "overlay", + "color_ids": [ 4 ] + }, + { + "type": "icon_state", + "icon_state": "chokha_misc_obj", + "blend_mode": "overlay" + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha_worn.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha_worn.json new file mode 100644 index 0000000000000..9d13a2ec30c29 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha_worn.json @@ -0,0 +1,33 @@ +{ + "chokha": [ + { + "type": "icon_state", + "icon_state": "chokha", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "chokha_shirt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "chokha_collar", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "chokha_paulets", + "blend_mode": "overlay", + "color_ids": [ 4 ] + }, + { + "type": "icon_state", + "icon_state": "chokha_misc", + "blend_mode": "overlay" + } + ] +} diff --git a/modular_doppler/modular_cosmetics/code/neck/neck.dm b/modular_doppler/modular_cosmetics/code/neck/neck.dm index c7a022d562a4b..0cf0e2507490d 100644 --- a/modular_doppler/modular_cosmetics/code/neck/neck.dm +++ b/modular_doppler/modular_cosmetics/code/neck/neck.dm @@ -24,7 +24,7 @@ /obj/item/clothing/neck/long_cape/Initialize(mapload) . = ..() - AddComponent(/datum/component/toggle_clothes, "long_cape_t") + AddComponent(/datum/component/toggle_icon) /obj/item/clothing/neck/wide_cape name = "wide cape" @@ -52,7 +52,7 @@ /obj/item/clothing/neck/face_scarf/Initialize(mapload) . = ..() - AddComponent(/datum/component/toggle_clothes, "face_scarf_t") + AddComponent(/datum/component/toggle_icon) /////////////// //MISCELLANIA// diff --git a/modular_doppler/modular_cosmetics/code/suits/jacket.dm b/modular_doppler/modular_cosmetics/code/suits/jacket.dm index fe950fa515b0c..0d233f6a787df 100644 --- a/modular_doppler/modular_cosmetics/code/suits/jacket.dm +++ b/modular_doppler/modular_cosmetics/code/suits/jacket.dm @@ -213,6 +213,15 @@ //COATS// ///////// +/obj/item/clothing/suit/jacket/doppler/chokha + name = "\improper Iseurian chokha" + desc = "A ceremonial woolen coat sporting a high neck and decorative gunpowder cases on the breast. The label on this one bears the Iseurian Revolutionary flag." + icon_state = "chokha" + greyscale_config = /datum/greyscale_config/chokha + greyscale_config_worn = /datum/greyscale_config/chokha/worn + greyscale_colors = "#1c1c1c#491618#1c1c1c#491618" + flags_1 = IS_PLAYER_COLORABLE_1 + /obj/item/clothing/suit/jacket/doppler/fur_coat name = "rugged fur coat" desc = "Even in an age where any large mammal can be grown in situ at industrial levels some insist on having \ diff --git a/tgstation.dme b/tgstation.dme index 05d76d84c5d70..752706be122a4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6370,6 +6370,8 @@ #include "modular_doppler\modular_cosmetics\code\neck\neck.dm" #include "modular_doppler\modular_cosmetics\code\suits\jacket.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_neck.dm" +#include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_sets.dm" +#include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_suit.dm" #include "modular_doppler\sprite_accessories\code\hair.dm" #include "modular_doppler\tableflip\tableflip.dm" #include "modular_doppler\wargaming\code\game_kit.dm" From 039ed2a8f9596aa54e3ba4e206b8ad899f759790 Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Sat, 7 Sep 2024 13:35:46 -0700 Subject: [PATCH 3/8] why do they have all those beret sprites in modulars that are already in tg icons anyway --- .../GAGS/greyscale_configs_suit.dm | 14 ++- .../modular_cosmetics/GAGS/icons/mob/head.dmi | Bin 0 -> 2013 bytes .../GAGS/icons/mob/jacket.dmi | Bin 2549 -> 4326 bytes .../modular_cosmetics/GAGS/icons/obj/head.dmi | Bin 0 -> 2302 bytes .../GAGS/icons/obj/jacket.dmi | Bin 1595 -> 2383 bytes .../GAGS/json_configs/suit/crop_jacket.json | 82 ++++++++++++++++++ .../json_configs/suit/crop_jacket_none.json | 58 +++++++++++++ .../json_configs/suit/crop_jacket_short.json | 82 ++++++++++++++++++ .../modular_cosmetics/code/head/hats.dm | 0 9 files changed, 234 insertions(+), 2 deletions(-) create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_none.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_short.json create mode 100644 modular_doppler/modular_cosmetics/code/head/hats.dm diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm index 27521b9cf4b09..6a1c0176c319b 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm @@ -8,10 +8,20 @@ /datum/greyscale_config/chokha name = "Chokha" - icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha.json' /datum/greyscale_config/chokha/worn name = "Chokha (Worn)" - icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha_worn.json' + + +/datum/greyscale_config/crop_jacket + name = "Tailored Jacket" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket.json' + +/datum/greyscale_config/crop_jacket/worn + name = "Tailored Jacket (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b4dd07094203915bda4a44b2736e8d863ff1545b GIT binary patch literal 2013 zcmb_dX*Ao37XK$zl%upm$1=ited)(H^FG}BJLleW?mc(;-J9)!a#T^$ zRssM(#n}mYX&<})6h--ceQ6q_un*)!FW(qsNHqFJ_%AWxxF`UKFDcDGeK^BR4H+p> zKelx-1zV(e)997P2gcQIrOEppcM7Kl@{W7!e-0&WS53a_qmq};tG5)vKPW7aTeCK! zhObx@-S$E`zL&Rp!3kq&*-R>wRrbg)(~c2AyFfw{Ake}b@bXCcmwCI$fcRcGWm zulN!!vnwaiL9>6I04=2S-G6m$JssH_(FX-#N9kF4rn!5!eEofMQg0n&97HM?kM$$$ zd+U%7x?S$5-@g^iSV+btEv?d-t3!`%qCC+>3%kK*i)@mvARC%r2^6 zWAlVv=@~gYaq{mHUrYenzR`^izB00+AXzyptJLU|&ur2J-70n2 zmc9OFkKNOSN}l#f3*yZLxoM@#N@oQbYf@EwrB4M(Bls@PzRuDrE#vdbgXxGZfnnE$ z_~O;*_=|zc8BG0a^+){m<-|LKra!X&};5m!{g?I>Bq`2(QdNA z-*k0A#O8mpAb^=67zmdGMil|l5x~g+$U6_{=K=_A5Ygg)b~In?I46-d#5n@p*hcj`2iSSGV-DoTy@W>7+w4 zn5b|05`{up;ugFK(}uIN z?*Fp%fwx&*Z{a*&x@J84P0M2JYkDR;MtO^~-sBnf(-xm%sU^i0KOi)8mPl>gyy0R8 zvx2?0`x8IkjXs3A6c}TaT^zBYx}w@*Et5Uk!KA4T4X0_MP8Jj6GHJtn=5w2HY0mN1 z+@GalQ<@!jq_1yR{kqON;qOlPi=FU?Kp=Nz1JJ}*69IZ$*Q+2hj4Fs6Hh-jf`Qy~J z18C^M?nD~FJudQYQ3w*${%}m#xegV-^~`A-IOQk}fE9p)brb5K)C;{Sd|}O%AD@O( ztF3bvPtrEF2&2PTUSZ>wpwX|5*5TX$nr^|TEZeomHgS+8l~vEi!fGKRW0tm0-GqVH zMkL_6@Xc2v5f3|8Cd>S~=$58>=^NBZ|l!#2w zPPL#glZJ# zn5mlTBo()qxZ*jZ($8#OCj1{A%dT-D_1t~qpcts~Die)MM%b@nUmHwC5^E$Majx*4 z0GBca59KMDN(+&lZ1Sn_Oi$u_TbMiS9NSu{CeHIJzet?#CfuEUu|Cd9hCemEJPsJ8 zoMMsUJ0zLkF*bwTcS#y~dKneQonNg*f4lqZ>ftn?+@@1tE_`&uNeP7T#PD$iGxt~& zM?&hV>H$ipJWv&im&`x@loGnN13R}hF(@Pe3_Ck+YC(S40J3zQtB`p*`)L_2t2G~F wu%K#;bQ)r+UCv&IeE^}orvd)U_f_(>$1`Isn8lI#{eKNOJD`yD_QC0Y025iBtN;K2 literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi index ce0a84afc0b8e8c6982d83ada24983c59fa95fc4..5221132465df983d0629d993f67d4fc6a269db15 100644 GIT binary patch literal 4326 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 literal 2549 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 WzfFrV^K%D(9Kal54JR16C;uCShR$OE diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi new file mode 100644 index 0000000000000000000000000000000000000000..1f8cee72c9da6ff00f2ad2af9a7c2d372ac681ff GIT binary patch literal 2302 zcmb_eX*3&H8%~f~+aR>)XwXtJsGH=h}dIkX@#O%ZKsMb zrBoBOFST{5i5h#0jy0_%5#m$xo$udw&iCW{aqn~9`@HYH&vWlN_q?eN_LmQfDTo08 zfWy{S2*-Ua-5&&zL;G_E%J=v_jKm;aBM|<#P~kT)5jVm@0RU{#FUq- zPk03NHC%FoD{Ul}5Wi1pXGJF-jUUjl{@BrsatrWjzrn9SJW&FIM$6@{sO2gyY^ug7 z&6C761I*Ds%!o01*a-j#f3`-LA+bfv#in7`EMz*E zDPpOu6{R)m4w?vZO^QrmgjP!SU-wnGLRN7g6W~L$8OSM6M2>^wBW*ob8w7$ZDFw1I zOMr-`MzW(nCohgh;{zs)P=j3Sk5!ZOtrhJ2QZXa8`K5bxQYl;PHQ-_Bsf%V70y4<| z246<*q_4)shV2eatTdurwkF4HV8fuav+qX>YmcI3@n4o3;GVJHc+lrw_}HeV=m->C zxn?#!E<@VerGxwz9+T@Kw8T*{O{7kdO?R8=;X_{RTW_<@&iP~msJ-}{+u3d{mxY<` zgO_#hL7;e%#@Tf4f+DC3w#V)%|M*?iL_2vvBE^Imw7R41M?c3?{y90m&hpXa8>I9O zinhxRt;od4V->yXz$<>IW1Cv6cUZ9UTY^6{!@Pi~IN3rCqi6!B1bKd|OBYz4CUE!P zi+9=hEhS*2elTrLu8Yq3_8ono!f8zJV)!9C;+Yug(p_6}OZ4_5Xr8lqQa1^HQUoSlTB-sR`~O1Eit7yiopO4}aAZ!m+C|;m zq&(TaXA`|Gl7y&E-$p;0DL@9_;&@KCud_FEiW0Di-i+f)V|1%i!zxAUHh?)B_eQ}j zwVCqJu(%ift4KVe5hV&!0Ez!EG7GL7ytDYi;h`d>o~jFq!FmZG_WB?mzNxlM=eob& ztUAAPA0k>KsdQ(}bU2X*wpRdV%4UjIFF$yk;vk@zF+W&R!W$RTL#C9iwetEi2VY%6 zXaSG*dJXbJBe8hw#`xTpiE_Q@Y8RPNxdvuTvT*U6I%KyvtBSh-aS$;9L+Ae;`JMNq zWIX7^C1r)OwWX$CLlw1PCM7r7)8~1Bh_wA<s9Q-sdo)& zY66c6(Ond;Ye0(qjr(xj8Toc-A#^o2*msKxk-+VcyJp z)8(-JNo1&>wa7^Al~6Y6xu$w`>YzAyYL&xT+qQ%{c-fwwH8@#n-bODLCh7oZ8m}%y zMd4j}vmPoWrSM83r-DftivP(we&`;DpyO@k>d)<6m;I_+R_$PXSs2Q6+mpP1HnRGs zT}I91d|e2q;SbTlY=F4HT@reZ!o8xopwKg;uNO}if7}FND!qRSK0&?S-2f z+O=ZYZroC~h_ScDUbU}1*q({KrfA0i!`?ja$=sN2O$~fKQ0v1Ccl}L%O>XRJqT#(z znu(XqpAYN^XtwfZ@yLZB`Op*NtX49B;MU^4AGrIK(GX-pof2#iR+iRm>D*{M5EpSPVh;h1PlP8~c z?g@t=G%ygp*Kq%&y~pejcnSmlO~vqxlrA2!+=5DZwn| z9UL@%2X}9Fp}MMbd<&r6dAc%;cQoNEJGXnc$^8gCrA^QjxwqQS?6)a|kXo;K_E|%eM!Gq)}nzcs|DCA4(}5;IuQn?aiB|&3Z*%?;~8=o&Hqizr7za5w!rP z-D!z>(-TIx7k+~T)b6zL!R`vy(%wh#uOttc5L-{to-g2I6M0`LU0Gfy^K`uJ@rK|r zC`FNBX(@iL!L*3He841v3=2%Ji5xKSm@PqbZ2rcQa2+3;*CrKOWx!g=o1p}-E_C9a zk>wd`?)x%d{}Rq^d)ZM>cdDF`GRh!Vj=-aYJ0tj`>|hmGi!vXBd#TjG+1_C{S<;-U z-;(Cfg0O)}&*WLZ$_D|p`Lhc9M#GN3=Z)1|eDkMTi6%U6ras!4q8e`|M3*5X2EYW z3@8UC#XAg7wp(p9yk1~3FAfXH6hMD`!+QdY&yZzIC&9J-h6Z45VUMUX_a^=eS;S4+ literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi index ff30d2df68ad1dc8c9c809c69e099e12ff6e4fca..d29fb48a61c5c9ce9a328d518f5e9d79645b4fe6 100644 GIT binary patch literal 2383 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 diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket.json new file mode 100644 index 0000000000000..c9210a17a1bfd --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket.json @@ -0,0 +1,82 @@ +{ + "crop_jacket": [ + { + "type": "icon_state", + "icon_state": "crop_jacket", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_sleeve", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "crop_jacket_t": [ + { + "type": "icon_state", + "icon_state": "crop_jacket_open", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_open_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_sleeve", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "jacket": [ + { + "type": "icon_state", + "icon_state": "jacket", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_sleeve", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "jacket_t": [ + { + "type": "icon_state", + "icon_state": "jacket_open", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_open_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_sleeve", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_none.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_none.json new file mode 100644 index 0000000000000..3830a4dc5e837 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_none.json @@ -0,0 +1,58 @@ +{ + "crop_jacket_sleeveless": [ + { + "type": "icon_state", + "icon_state": "crop_jacket", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ], + "crop_jacket_sleeveless_t": [ + { + "type": "icon_state", + "icon_state": "crop_jacket_open", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_open_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ], + "jacket_sleeveless": [ + { + "type": "icon_state", + "icon_state": "jacket", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ], + "jacket_sleeveless_t": [ + { + "type": "icon_state", + "icon_state": "jacket_open", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_open_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_short.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_short.json new file mode 100644 index 0000000000000..c01dedff7d7ea --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_short.json @@ -0,0 +1,82 @@ +{ + "crop_jacket_short": [ + { + "type": "icon_state", + "icon_state": "crop_jacket", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_sleeve_short", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "crop_jacket_short_t": [ + { + "type": "icon_state", + "icon_state": "crop_jacket_open", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_open_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_sleeve_short", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "jacket_short": [ + { + "type": "icon_state", + "icon_state": "jacket", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_sleeve_short", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "jacket_short_t": [ + { + "type": "icon_state", + "icon_state": "jacket_open", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_open_collar", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "crop_jacket_sleeve_short", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/code/head/hats.dm b/modular_doppler/modular_cosmetics/code/head/hats.dm new file mode 100644 index 0000000000000..e69de29bb2d1d From 5a8be83124903f3388ee94864829d4801bf5e1b7 Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Sat, 7 Sep 2024 14:53:05 -0700 Subject: [PATCH 4/8] pause --- .../GAGS/greyscale_configs_suit.dm | 19 ++++- .../GAGS/greyscale_configs_under.dm | 8 ++ .../GAGS/icons/mob/glasses.dmi | Bin 0 -> 506 bytes .../GAGS/icons/mob/under.dmi | Bin 0 -> 809 bytes .../GAGS/icons/obj/glasses.dmi | Bin 0 -> 456 bytes .../GAGS/icons/obj/under.dmi | Bin 0 -> 415 bytes .../GAGS/json_configs/suit/big_jacket.json | 22 +++++ .../json_configs/suit/big_jacket_worn.json | 22 +++++ .../GAGS/json_configs/under/big_pants.json | 10 +++ .../json_configs/under/big_pants_worn.json | 10 +++ .../modular_cosmetics/code/head/hats.dm | 80 ++++++++++++++++++ tgstation.dme | 2 + 12 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/mob/glasses.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/obj/glasses.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket_worn.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants_worn.json diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm index 6a1c0176c319b..c61c02e25e63c 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm @@ -16,7 +16,6 @@ icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha_worn.json' - /datum/greyscale_config/crop_jacket name = "Tailored Jacket" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' @@ -25,3 +24,21 @@ /datum/greyscale_config/crop_jacket/worn name = "Tailored Jacket (Worn)" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' + +/datum/greyscale_config/shortsleeve_crop_jacket + name = "Tailored Jacket (Short-Sleeved)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_short.json' + +/datum/greyscale_config/shortsleeve_crop_jacket/worn + name = "Tailored Jacket (Short-Sleeved, Worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' + +/datum/greyscale_config/sleeveless_crop_jacket + name = "Tailored Jacket (Sleeveless)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_none.json' + +/datum/greyscale_config/sleeveless_crop_jacket/worn + name = "Tailored Jacket (Sleeveless, Worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm new file mode 100644 index 0000000000000..71f9642e9d231 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm @@ -0,0 +1,8 @@ +/datum/greyscale_config/big_pants + name = "'JUNCO' megacargo pants" + icon_file = 'modular_nova/modules/GAGS/icons/big_pants.dmi' + json_config = 'modular_nova/modules/GAGS/json_configs/big_pants/big_pants.json' + +/datum/greyscale_config/big_pants/worn + name = "'JUNCO' megacargo pants (Worn)" + json_config = 'modular_nova/modules/GAGS/json_configs/big_pants/big_pants_worn.json' diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/glasses.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/glasses.dmi new file mode 100644 index 0000000000000000000000000000000000000000..665cc96a6a29e8d9fcc0e661ec53e2c2bc37cbb5 GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#Z@5@B`&GO$wiq3C7Jno3=9=> zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5 zQiwvZrlz{FzN)Uhx~iqU`hJhjZe!KWDSi#p~#@YM~IU2IJ zXI~4v!oa}js}wSFJ8o&A<`hWAdum`_^f4-w$JaMyZJeBcS>leV&7xa z^PhkJwCFo{?(N@Q>lSa1wzIK6y=lU-%o}#~^PU^{27j=#|MZWS@9>6wLKMgBxQ8qZI1`nAyY%%-a5zy@t8^PR!+px9b`bm5Ux1`s977t$)$6N9Xi% z?^_x7HhkQ3aogH#_k`a&>$!f!(eefmj7nOy#iolGI+ZBxvX zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5 zQiwvZrlzs&J_W<|OCmbEja4_VkXSOY+jy;pp}FW0vnN4e1z(F9rFj|lFiIbl-Fr-) zfq|*a)5S5QV$R!Hj(LX+L|mM&vZ^~UDNd7V;1znrp%Yo)BBo=>zjDFtRAEVd0-(G^J>g~6+Yc;mJw0%B{`u$kZ$~8ChsB$6DCO>aKEbNs`lh+uFCMGB|Nfi5)^eTd z%XEY9ob9ic{ovqBu#q$G+fl^xwn*XEqNmxXqgJnf$GCs#-O&7uX!{JF1I!&fRz>q2 zKUD1v<5|GF?oj&dO=sDaDjBNk$`}7DwvN~@9xQ7&|NPUWjX$IcQ*CFT-DJzywe0p@ z!DD&bwXeM{efmmSq<8uXh9ei=mT9{!4*WK`+%#4C7LyG}l>SA=KjLx!_B&z;BAg+) z%B0QHv;LA`@U@8S^yJ`z^p3wT-&^(juBdL9vmqy0PtJQ?SAgsVq1gNV-*zv`YkXM} zmDKq&hcD>QiseTy9yOcoyHw($YvPh~>|I7oT&lOW{$n68~yay`+p4c?j&Vu1llfG7xw8iUA)%t6;u3(5MloSqI9hz?6e4*(5&nevt>iBNF|DNh)yD#@oIolTTN6cA^Jal(H Sao7(``wX70elF{r5}E)`L}N?< literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/obj/glasses.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/obj/glasses.dmi new file mode 100644 index 0000000000000000000000000000000000000000..38ac19e4f4ec579f1b9c83a117ea0ec39c21da6b GIT binary patch literal 456 zcmV;(0XP1MP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DJds2FC{HMCnY&QC%;IEi!&v&s2C_=$i zvP6PU^2wYMVn-p@_)7>&p!@H>%@NP@9EH>^sJj9vfCB8gb6+&ZJg~0oI{qsFm={HH z2~5mA3CD4CrdgInX`0%)ZQGX+2>A(+4L}$5g(mblCN>PiDFhn;+kiVqK?10zY3zMn z*Jzq1TjzOxngDwUQLs3Lpr#atI~yVZh|?DUfVtH8D}W?P?48EC@A}YpXq5y)1c1}u z_q{U(CV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DJe5Oz92ELq&Pl5DNBiqGbOXA7$|PY#hF%=n41b=D=WDAxqyua z07Xk3T>TMvK>z>%=}AOERCt{2mca^yAP|Og*@I6I2+>1$6d%5Wc=RD8I`|T9vtU?M zG`73$VSbRBn)<({(PG0eG&S|8>P`RzKmY_l0RI5+#3Y9hV&C^m?7eTcaoe^Gb5C>y zz%Y%y7%Mb@5Ml+hcl;{=obz~OmdAPCM**z0jn?`!2hKwtMyMt<#w_m}8V;0i(>_MG zreTTUR+lT#b=_&V|7;c!>)pwxiS2gz_8#}xqNKqcm!cy&QyCBNm)xu}$S zcYNAPDN!q6Qc)9v8JJGfbjuusnuc45d6ZthsQTBC00^Kuzzdv%Sd$GWEj$1K002ov JPDHLkV1i4#s{Q}~ literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket.json new file mode 100644 index 0000000000000..94553234ec720 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket.json @@ -0,0 +1,22 @@ +{ + "big_jacket": [ + { + "type": "icon_state", + "icon_state": "big_jacket_obj", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "big_jacket_cuffs_obj", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "big_jacket_drive_obj", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket_worn.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket_worn.json new file mode 100644 index 0000000000000..51fea96cb1c00 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket_worn.json @@ -0,0 +1,22 @@ +{ + "big_jacket": [ + { + "type": "icon_state", + "icon_state": "big_jacket", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "big_jacket_cuffs", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "big_jacket_drive", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants.json new file mode 100644 index 0000000000000..bb184787029d3 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants.json @@ -0,0 +1,10 @@ +{ + "big_pants": [ + { + "type": "icon_state", + "icon_state": "big_pants_obj", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants_worn.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants_worn.json new file mode 100644 index 0000000000000..32bd6dad647f8 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants_worn.json @@ -0,0 +1,10 @@ +{ + "big_pants": [ + { + "type": "icon_state", + "icon_state": "big_pants", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/code/head/hats.dm b/modular_doppler/modular_cosmetics/code/head/hats.dm index e69de29bb2d1d..8c4d8396175de 100644 --- a/modular_doppler/modular_cosmetics/code/head/hats.dm +++ b/modular_doppler/modular_cosmetics/code/head/hats.dm @@ -0,0 +1,80 @@ +////////// +//BERETS// +////////// + +/obj/item/clothing/head/beret/medical/chemist + name = "chemist beret" + desc = "Not acid-proof!" + greyscale_colors = "#FFFFFF#D15B1B" + +/obj/item/clothing/head/beret/medical/virologist + name = "virologist beret" + desc = "Sneezing in this expensive beret would be a waste of a good beret." + greyscale_colors = "#FFFFFF#198019" + +/obj/item/clothing/head/beret/atmos + name = "atmospheric beret" + desc = "While \"pipes\" and \"style\" might not rhyme, this beret sure makes you feel like they should!" + icon_state = "beret_badge" + greyscale_config = /datum/greyscale_config/beret_badge + greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_colors = "#59D7FF#ffe12f" + flags_1 = NONE + +/obj/item/clothing/head/beret/engi/ce + name = "chief engineer's beret" + desc = "A fancy beret designed exactly to the Chief Engineer's tastes, minus the LEDs." + greyscale_colors = "#FFFFFF#2E992E" + +/obj/item/clothing/head/beret/medical/cmo/alt + name = "chief medical officer's beret" + desc = "A beret custom-fit to the Chief Medical Officer, repaired once or twice after Runtime got a hold of it. This one is made out of white fabric. Fancy." + greyscale_colors = "#FFFFFF#199393" + +/obj/item/clothing/head/beret/science/fancy + desc = "A science-themed beret for our hardworking scientists. This one comes with a fancy badge!" + icon_state = "beret_badge" + greyscale_config = /datum/greyscale_config/beret_badge + greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_colors = "#7E1980#FFFFFF" + +/obj/item/clothing/head/beret/science/fancy/robo + name = "robotics beret" + desc = "A sleek black beret designed with high-durability nano-mesh fiber - or so the roboticists claim." + greyscale_colors = "#3E3E48#88242D" + +/obj/item/clothing/head/beret/science/rd/alt + name = "research director's beret" + desc = "A custom-tailored beret for the Research Director. Lamarr thinks it looks great. This one is made out of white fabric. Fancy." + greyscale_colors = "#FFFFFF#7E1980" + +/obj/item/clothing/head/beret/cargo/qm + name = "quartermaster's beret" + desc = "A beret that helps the QM keep telling themselves that they're an official head of staff." + greyscale_config = /datum/greyscale_config/beret_badge + greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + icon_state = "beret_badge" + greyscale_colors = "#cf932f#FFCE5B" + +/obj/item/clothing/head/beret/cargo/qm/alt + name = "quartermaster's beret" + desc = "A beret that helps the QM keep telling themselves that they're an official head of staff. This one is made out of white fabric. Fancy" + greyscale_colors = "#FFFFFF#FFCE5B" + +/obj/item/clothing/head/caphat/beret/alt + name = "captain's beret" + desc = "For the Captains known for their sense of fashion. This one is made out of white fabric. Fancy" + greyscale_colors = "#FFFFFF#FFCE5B" + +/obj/item/clothing/head/hopcap/beret + name = "head of personnel's beret" + desc = "A fancy beret designed by NT's Personnel division for their favorite head's head." + greyscale_config = /datum/greyscale_config/beret_badge + greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + icon_state = "beret_badge" + greyscale_colors = "#3e5c88#88242D" + +/obj/item/clothing/head/hopcap/beret/alt + name = "head of personnel's beret" + desc = "A fancy beret designed by NT's Personnel division for their favorite head's head. This one is made out of white fabric. Fancy" + greyscale_colors = "#FFFFFF#88242D" diff --git a/tgstation.dme b/tgstation.dme index 752706be122a4..7e170ad0a8598 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6366,12 +6366,14 @@ #include "modular_doppler\icspawn\spell.dm" #include "modular_doppler\languages\language_datums.dm" #include "modular_doppler\modular_cosmetics\code\jacket_pockets.dm" +#include "modular_doppler\modular_cosmetics\code\head\hats.dm" #include "modular_doppler\modular_cosmetics\code\neck\collar.dm" #include "modular_doppler\modular_cosmetics\code\neck\neck.dm" #include "modular_doppler\modular_cosmetics\code\suits\jacket.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_neck.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_sets.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_suit.dm" +#include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_under.dm" #include "modular_doppler\sprite_accessories\code\hair.dm" #include "modular_doppler\tableflip\tableflip.dm" #include "modular_doppler\wargaming\code\game_kit.dm" From 7a8f807359496f1234cea660589b6d1b2293c179 Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:39:39 -0700 Subject: [PATCH 5/8] :3 --- .../GAGS/greyscale_configs_neck.dm | 4 ++-- .../GAGS/greyscale_configs_sets.dm | 24 +++++++++---------- .../GAGS/greyscale_configs_under.dm | 4 ++-- .../modular_cosmetics/code/head/hats.dm | 2 +- .../code/under/miscellania.dm | 13 +++++++++- tgstation.dme | 1 + 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm index e1670ecf0bc4f..732d80b8c2379 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm @@ -58,12 +58,12 @@ /datum/greyscale_config/face_scarf name = "Face Scarf" - icon_file = 'modular_skyrat/modules/GAGS/icons/face_scarf.dmi' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi' json_config = 'modular_skyrat/modules/GAGS/json_configs/neck/face_scarf.json' /datum/greyscale_config/face_scarf/worn name = "Face Scarf (Worn)" - icon_file = 'modular_skyrat/modules/GAGS/icons/face_scarf_worn.dmi' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi' diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.dm index 16d81ba5f9e94..dcb84786c32ce 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.dm @@ -15,36 +15,36 @@ /datum/greyscale_config/maid_neck_cover name = "Maid Neck Cover" - icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi' - json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_neck_cover.json' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_neck_cover.json' /datum/greyscale_config/maid_neck_cover/worn name = "Maid Neck Cover (Worn)" - icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi' /datum/greyscale_config/maid_arm_covers name = "Maid Arm Covers" - icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi' - json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_arm_covers.json' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_arm_covers.json' /datum/greyscale_config/maid_arm_covers/worn name = "Maid Arm Covers (Worn)" - icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi' /datum/greyscale_config/maid_costume name = "Maid Costume" - icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi' - json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_costume.json' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_costume.json' /datum/greyscale_config/maid_costume/worn name = "Maid Costume (Worn)" - icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi' /datum/greyscale_config/maid_headband name = "Maid Headband" - icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume.dmi' - json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/maid_headband.json' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_headband.json' /datum/greyscale_config/maid_headband/worn name = "Maid Headband (Worn)" - icon_file = 'modular_skyrat/modules/GAGS/icons/maid_costume_worn.dmi' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi' diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm index 71f9642e9d231..39030effddcb1 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm @@ -1,8 +1,8 @@ /datum/greyscale_config/big_pants name = "'JUNCO' megacargo pants" - icon_file = 'modular_nova/modules/GAGS/icons/big_pants.dmi' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi' json_config = 'modular_nova/modules/GAGS/json_configs/big_pants/big_pants.json' /datum/greyscale_config/big_pants/worn name = "'JUNCO' megacargo pants (Worn)" - json_config = 'modular_nova/modules/GAGS/json_configs/big_pants/big_pants_worn.json' + json_config = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi' diff --git a/modular_doppler/modular_cosmetics/code/head/hats.dm b/modular_doppler/modular_cosmetics/code/head/hats.dm index 8c4d8396175de..0983720bbee97 100644 --- a/modular_doppler/modular_cosmetics/code/head/hats.dm +++ b/modular_doppler/modular_cosmetics/code/head/hats.dm @@ -9,7 +9,7 @@ /obj/item/clothing/head/beret/medical/virologist name = "virologist beret" - desc = "Sneezing in this expensive beret would be a waste of a good beret." + desc = "Sneezing in this expensive hat would be a waste of a good beret." greyscale_colors = "#FFFFFF#198019" /obj/item/clothing/head/beret/atmos diff --git a/modular_doppler/modular_cosmetics/code/under/miscellania.dm b/modular_doppler/modular_cosmetics/code/under/miscellania.dm index d6a9e386e97d0..b991c1d4d1f95 100644 --- a/modular_doppler/modular_cosmetics/code/under/miscellania.dm +++ b/modular_doppler/modular_cosmetics/code/under/miscellania.dm @@ -18,7 +18,7 @@ female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS can_adjust = FALSE -/obj/item/clothing/under/moto_leggings +/obj/item/clothing/under/pants/moto_leggings name = "'Naka' moto leggings" desc = "Lab grown lambskin has been adhered to a spandex underlayer to produce a leather with considerable \ four way stretch, allowing for a closer fit in leather pants than ever before. This style features integrated \ @@ -28,3 +28,14 @@ worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi' body_parts_covered = GROIN|LEGS can_adjust = FALSE + +/obj/item/clothing/under/pants/big_pants + name = "\improper JUNCO megacargo pants" + desc = "De riguer for techno classicists, these extreme wide leg pants come back into style every \ + now and then. This pair has generous onboard storage." + icon_state = "big_pants" + greyscale_config = /datum/greyscale_config/big_pants + greyscale_config_worn = /datum/greyscale_config/big_pants/worn + greyscale_colors = "#874f16" + flags_1 = IS_PLAYER_COLORABLE_1 + alternate_worn_layer = LOW_FACEMASK_LAYER diff --git a/tgstation.dme b/tgstation.dme index af7deb1492723..1b6b944fb446c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6547,3 +6547,4 @@ #include "modular_doppler\xenoarch\code\modules\research\xenoarch\xenoarch_machine.dm" #include "modular_doppler\xenoarch\code\modules\research\xenoarch\xenoarch_reward.dm" #include "modular_doppler\xenoarch\code\modules\research\xenoarch\xenoarch_tool.dm" +// END_INCLUDE From 12bb4d4052f6867eb2b214c147d058e4e892b3e5 Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:36:09 -0700 Subject: [PATCH 6/8] hurghhh --- .../GAGS/greyscale_configs_neck.dm | 6 +++--- .../GAGS/greyscale_configs_suit.dm | 20 ++++++++++++++++++ .../GAGS/greyscale_configs_under.dm | 5 +++-- .../GAGS/icons/mob/jacket.dmi | Bin 4326 -> 5374 bytes .../GAGS/icons/mob/shirt.dmi | Bin 0 -> 761 bytes .../GAGS/icons/obj/jacket.dmi | Bin 2383 -> 2739 bytes .../GAGS/icons/obj/shirt.dmi | Bin 0 -> 379 bytes .../GAGS/json_configs/suit/dagger_mantle.json | 10 +++++++++ .../json_configs/suit/dagger_mantle_worn.json | 10 +++++++++ .../modular_cosmetics/code/neck/neck.dm | 18 ++++++++++++++-- .../modular_cosmetics/code/suits/jacket.dm | 15 +++++++++++++ .../modular_cosmetics/code/suits/shirts.dm | 11 ++++++++++ tgstation.dme | 1 + 13 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/mob/shirt.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/icons/obj/shirt.dmi create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/suit/dagger_mantle.json create mode 100644 modular_doppler/modular_cosmetics/GAGS/json_configs/suit/dagger_mantle_worn.json create mode 100644 modular_doppler/modular_cosmetics/code/suits/shirts.dm diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm index 732d80b8c2379..73798620e9fd6 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm @@ -45,12 +45,12 @@ /datum/greyscale_config/ranger_poncho name = "Ranger Poncho" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi' - json_config = 'modular_nova/modules/GAGS/json_configs/ranger_poncho/ranger_poncho.json' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/ranger_poncho.json' /datum/greyscale_config/ranger_poncho/worn name = "Ranger Poncho (Worn)" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi' - json_config = 'modular_nova/modules/GAGS/json_configs/ranger_poncho/ranger_poncho_worn.json' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/ranger_poncho_worn.json' /////////// //SCARVES// @@ -59,7 +59,7 @@ /datum/greyscale_config/face_scarf name = "Face Scarf" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi' - json_config = 'modular_skyrat/modules/GAGS/json_configs/neck/face_scarf.json' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/face_scarf.json' /datum/greyscale_config/face_scarf/worn name = "Face Scarf (Worn)" diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm index c61c02e25e63c..2d64c61ad7235 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm @@ -42,3 +42,23 @@ /datum/greyscale_config/sleeveless_crop_jacket/worn name = "Tailored Jacket (Sleeveless, Worn)" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' + +/datum/greyscale_config/big_jacket + name = "Alpha Atelier pilot jacket" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket.json' + +/datum/greyscale_config/big_jacket/worn + name = "Alpha Atelier pilot jacket (worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket_worn.json' + +/datum/greyscale_config/dagger_mantle + name = "'dagger' designer mantle" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/shirt.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/dagger_mantle.json' + +/datum/greyscale_config/dagger_mantle/worn + name = "'dagger' designer mantle (worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/shirt.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/dagger_mantle_worn.json' diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm index 39030effddcb1..7c8643b503f4f 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm @@ -1,8 +1,9 @@ /datum/greyscale_config/big_pants name = "'JUNCO' megacargo pants" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi' - json_config = 'modular_nova/modules/GAGS/json_configs/big_pants/big_pants.json' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants.json' /datum/greyscale_config/big_pants/worn name = "'JUNCO' megacargo pants (Worn)" - json_config = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi' + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants_worn.json' diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi index 5221132465df983d0629d993f67d4fc6a269db15..31e62bd66247b270e27fdc3a1c1c77ca3eef4319 100644 GIT binary patch literal 5374 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 diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/shirt.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/shirt.dmi new file mode 100644 index 0000000000000000000000000000000000000000..9ee9108931d7012f3dae825829ab0126463dce91 GIT binary patch literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MO7gYB`&GO$wiq3C7Jno3=9=> zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5 zQiwvZrmCT>?N$vtbHnv2>Y<(8#;TiFNGzGzZM;^)&|LJ0*^{8Kg0IDl()^eqiGXwB;qD2R;t!C}|f|5W$~hu#wJ zg$j2$dN1^zbt_2r{{C!Q3`g>;nX`S04&32)n&fHq{LING%g>agZN3>e+tN+iVKL(Z z-USyKF0ft5V8~$3h>}0RdCMVkkw(?4vfa~n-+gDy(e!)MR||HBrag1jGpysL=KS53 zEL6Lk!9yWR@4k_1{h1lZYugfDu`j;3RsV0_+x-mP`P**i>%IP7mHw>qS)tKOXkS|H_Q~n#&A&#!9`P^S z^nHoG&)-#bE{s=7ODFzX`(J+ns?SUqwlJDVG2CL1;$_HX=w)j#Yj9(BKn{Q{b_^eP zILI7dzeSFR&HUfnDd}6Iax-mZ_^Kz}k8D5g%jX-CQFSI^W5k-zr_?8(Y+WK3$bW(_ z{IbNI8oT;spGsz&dcCAWX~jqRz%Tzc->kV<_voqF$4^DK-p^Oxo$bl-C|V(Z&Ad~W zB&D{tCz#oJN108#qF%>wY3lQbSuZz~%3iqo+%(@?fPI7fQs3zz5@Jl|Gj`eNU$Tn& zFZD&JA@`A!>=OPxr$V?I@|*u2X<>WL8^d~VhS)8=%WpS#>}UQb{fh_1H{j@mdwN#< Y-h_|!0`1uXz_iTZ>FVdQ&MBb@0B!-}t zK3fV!n((Ev#F&_g!S$Vc?sD$A?|J@umvi3pKF@j1J94Pua25(2i*|4h!(P7Tebp}{ z%r7_y03wS^ZvQEifD|^HTsw?q+PF^#Nfz~*?QkXN@ZItPR#xx6e}r~(2svr`QzB>q zc6({%-W62TgGi3R#Kr!k;)odXz4FFSa+R{?aO}`ZvADGgRo%^`w!3lgt3GRP?R(yFQSBE>B8vC3ZoPn9~xosA!g4NoByxUu9}pqk>({MpBOG6LVofF)#4M<0isr73}Q;b6x^E6-{83 zquRglz;61QSll!>iRH)0W;-NE1~}Y8-4a8kzE912G$Cx=<`o61T(JhUcjm{v>Uz_k}eOu26PVZ|KK z24W?9!=AT$Iq0WG{3dLy2V^@3BSUv*B23QQ#}%Vp+b2Z*xR6rq*#a}a2kh2A#SbuE z-*Rg1ALLeqEaD`J+fZ>bU}7!>ZH|Uw+bW*=8TBTeVrPgEd@!jgGc5~ zQ$LJtf6%*ukDY6M5tK9SLz^zpGGu{~+jr;g=u@({@c|rx^jC3#<;_7?tSGZjW&+#C zxi!^lHJ0c0e5y1Z5J-1x!;Spo{(v~5ppv88<;EcrIYqGwb;$RaqtRa0hcMM>LC*Tg zQJRsWwUPxY){1Py#@vaOaTCm<^zt~c>~9LP05iLKNY zY-GN#{3UrQ+Ry(f`Ct~23?b{qcYCq5_bev>yY;UO^OT6C)hZiq5}kAbDjrf0^;WmO zuulg-(maORS_T5&=9c3@igZRV&u`ZueGDIP)A)#>-JV2#Qk{2S${apBb7V)LIZfs5X*EHPS~&CDZezV~-#MS2IM zBR0kk+7keAK4;!CW=q9YejgzNR*30E1f+$2QIuU<$iAM&V+lg*rg1uR-K{-t*_r>)bK^RPKLe zQ@BcXFYta@9@CJ$rYO%x6$2K8;5+nuoj8+tGht5Ga8A$I@Ho;wm%Xq1_tt|Uu-;I? z(MHc2&wD?*dov9)2&9@PPW_9Q+z?3c=|Q83nwS}C^_D#@CNNxMcSa>9ox!=gsNIg#+Q@q$k!53vjjQlsbG~R|0hc6$Iqk#3AI-Z5|DX=<0Wuo4y z9I-DA+xFZmiM%!|c+^!vxGj19)XW`bs{~*2)-yACyYg3MtC`STKp6jr!#vocbfc9_ zqx{mp&e4E2AkFJ&*9@|JsI+qnSz8df!r@uU%9`4xW2;KUJoP!I^3ES;krOHJd_U4YEp8y|Vu-bK zJOmZ*mQ`+RMCVzkGoo|2;2dxDWXO!*q)T)6B0crU@@a=C2_rkRD=n+Zjb}@h5_|8u zi-0@2$Q05uL*wU|Ql5!gWn+q`FBbYyFY}Dj`<`=V3+F?Ix#N2iLG`&e{nb)SoSkLe zTflW2&ZCBs)GZYxF1k>Q0FGo~mN+BB#b!Ke7X|}Mg$zkF{Kg&!v}w|KiIaLbema-~ zJ(bifj_e-aL7tu+q(9+Q6)){S&nC`W0*M!(LD;OJ(`D-Mzg<-|X$F5u{t^z!V#xsU ziC@eQu+N83SzDl`xNh1@L*uZuog(8)2;{}J(`El9z`vz-92oM1s0(!e2V^1YZlr7w zW4=PHgGSvtZm|5Dj+|k$T(eYnaIf=#HC?T^G+Q~62IO1lsqc?*q88W8}5Z~Pl!zdMjQ23+|rXYKYy9?YL_`bj+&S6m z>T0a5ZKhT;Uq=4l#u~X90X1v}OKsNxS+0s`JnPEIb#JyD0aI^(FcCH>bWWJBXo#=CbnwB1kaS{%J^(9AIj zo`3Zv-_q6`;!!TWEd5n}iplZ1&S&IULWxNXe1qeYxX8Qg9cM+phxdJh zgYQ0UZEwGHEO@#((A60}FS+|&a-3uFTE2q}TKN6=c%CRyfSgkk?|ojB5NQ;$WR2}- zzHxzsUB6zwC8naHGM0b&@?|c^UImK-P%y>&Q_40Su9k&9h%j7!QzfdZB(vY_;V|Mq zoxa^h7RrI4sai3c0jEbWI*CrJBR(b(882f+QaxvpDd1zR+w{<{{q+eRkE@*fJnjEO|8!Z@-!}VimHQ5Z XhPUWN1CHM>0{dZUb{1P};t~H3Hgg*6 literal 2383 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 Date: Sun, 8 Sep 2024 13:46:42 -0700 Subject: [PATCH 7/8] Update tgstation.dme Signed-off-by: kittysmooch <105110468+kittysmooch@users.noreply.github.com> --- tgstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 466e763e9fcea..8c148868168af 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6465,7 +6465,6 @@ #include "modular_doppler\modular_cosmetics\code\hats\doppler_command_hats.dm" #include "modular_doppler\modular_cosmetics\code\head\hats.dm" #include "modular_doppler\modular_cosmetics\code\neck\collar.dm" -#include "modular_doppler\modular_cosmetics\code\neck\collar.dm" #include "modular_doppler\modular_cosmetics\code\neck\doppler_command_mantles.dm" #include "modular_doppler\modular_cosmetics\code\neck\neck.dm" #include "modular_doppler\modular_cosmetics\code\shoes\baseshoes.dm" From 15287c2802baf51e5e9214907d02569e9cb81ab7 Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Sun, 8 Sep 2024 15:16:04 -0700 Subject: [PATCH 8/8] stop right there --- .../loadout_categories/categories/clothing.dm | 102 ++++++++++++++++++ .../modular_cosmetics/code/head/hats.dm | 50 +-------- 2 files changed, 106 insertions(+), 46 deletions(-) diff --git a/modular_doppler/loadout_categories/categories/clothing.dm b/modular_doppler/loadout_categories/categories/clothing.dm index a0b9f22f3f0c0..da06fa88ce0bc 100644 --- a/modular_doppler/loadout_categories/categories/clothing.dm +++ b/modular_doppler/loadout_categories/categories/clothing.dm @@ -35,6 +35,18 @@ name = "Greyscale Winter Coat" item_path = /obj/item/clothing/suit/hooded/wintercoat/custom +/datum/loadout_item/suit/fur_coat + name = "Rugged Fur Coat" + item_path = /obj/item/clothing/suit/jacket/doppler/fur_coat + +/datum/loadout_item/suit/wrap_coat + name = "Wrap Coat" + item_path = /obj/item/clothing/suit/jacket/doppler/wrap_coat + +/datum/loadout_item/suit/red_coat + name = "Marsian PLA Trenchcoat" + item_path = /obj/item/clothing/suit/jacket/doppler/red_trench + /* * SUITS / SUIT JACKETS */ @@ -55,6 +67,14 @@ name = "Purple Formal Suit Jacket" item_path = /obj/item/clothing/suit/toggle/lawyer/purple +/datum/loadout_item/suit/long_suit_jacket + name = "Long Suit Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/long_suit_jacket + +/datum/loadout_item/suit/short_suit_jacket + name = "Short Suit Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/short_suit_jacket + /* * SUSPENDERS */ @@ -143,6 +163,26 @@ name = "Ethereal Raincoat" item_path = /obj/item/clothing/suit/hooded/ethereal_raincoat +/datum/loadout_item/suit/big_jacket + name = "Alpha Atelier Pilot Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/big_jacket + +/datum/loadout_item/suit/chokha + name = "Chokha Coat" + item_path = /obj/item/clothing/suit/jacket/doppler/chokha + +/datum/loadout_item/suit/field_jacket + name = "Field Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/field_jacket + +/datum/loadout_item/suit/tan_field_jacket + name = "Tan Field Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/field_jacket/tan + +/datum/loadout_item/suit/leather_hoodie + name = "Leather Jacket with Hoodie" + item_path = /obj/item/clothing/suit/hooded/doppler/leather_hoodie + /* * COSTUMES */ @@ -302,6 +342,68 @@ item_path = /obj/item/clothing/suit/jacket/quartermaster restricted_roles = list(JOB_QUARTERMASTER) +/datum/loadout_item/suit/departmental_jacket + name = "Work Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket + +/datum/loadout_item/suit/engi_dep_jacket + name = "Engineering Department Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/engi + restricted_roles = list( + JOB_CHIEF_ENGINEER, + JOB_STATION_ENGINEER, + JOB_ATMOSPHERIC_TECHNICIAN, + ) + +/datum/loadout_item/suit/med_dep_jacket + name = "Medical Department Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/med + restricted_roles = list( + JOB_CHIEF_MEDICAL_OFFICER, + JOB_MEDICAL_DOCTOR, + JOB_CHEMIST, + JOB_PSYCHOLOGIST, + ) + +/datum/loadout_item/suit/cargo_dep_jacket + name = "Cargo Department Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/supply + restricted_roles = list( + JOB_QUARTERMASTER, + JOB_CARGO_TECHNICIAN, + JOB_SHAFT_MINER, + ) + +/datum/loadout_item/suit/sec_dep_jacket_blu + name = "Blue Security Department Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/sec + restricted_roles = list( + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + JOB_DETECTIVE, + ) + +/datum/loadout_item/suit/sec_dep_jacket_red + name = "Red Security Department Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/sec/red + restricted_roles = list( + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + JOB_DETECTIVE, + ) + +/datum/loadout_item/suit/sec_dep_jacket_red + name = "Security Medic Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/sec_medic + restricted_roles = list( + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + JOB_DETECTIVE, + ) + /* * FAMILIES */ diff --git a/modular_doppler/modular_cosmetics/code/head/hats.dm b/modular_doppler/modular_cosmetics/code/head/hats.dm index 0983720bbee97..639da7bdae03a 100644 --- a/modular_doppler/modular_cosmetics/code/head/hats.dm +++ b/modular_doppler/modular_cosmetics/code/head/hats.dm @@ -5,11 +5,15 @@ /obj/item/clothing/head/beret/medical/chemist name = "chemist beret" desc = "Not acid-proof!" + greyscale_config = /datum/greyscale_config/beret_badge + greyscale_config_worn = /datum/greyscale_config/beret_badge/worn greyscale_colors = "#FFFFFF#D15B1B" /obj/item/clothing/head/beret/medical/virologist name = "virologist beret" desc = "Sneezing in this expensive hat would be a waste of a good beret." + greyscale_config = /datum/greyscale_config/beret_badge + greyscale_config_worn = /datum/greyscale_config/beret_badge/worn greyscale_colors = "#FFFFFF#198019" /obj/item/clothing/head/beret/atmos @@ -21,16 +25,6 @@ greyscale_colors = "#59D7FF#ffe12f" flags_1 = NONE -/obj/item/clothing/head/beret/engi/ce - name = "chief engineer's beret" - desc = "A fancy beret designed exactly to the Chief Engineer's tastes, minus the LEDs." - greyscale_colors = "#FFFFFF#2E992E" - -/obj/item/clothing/head/beret/medical/cmo/alt - name = "chief medical officer's beret" - desc = "A beret custom-fit to the Chief Medical Officer, repaired once or twice after Runtime got a hold of it. This one is made out of white fabric. Fancy." - greyscale_colors = "#FFFFFF#199393" - /obj/item/clothing/head/beret/science/fancy desc = "A science-themed beret for our hardworking scientists. This one comes with a fancy badge!" icon_state = "beret_badge" @@ -42,39 +36,3 @@ name = "robotics beret" desc = "A sleek black beret designed with high-durability nano-mesh fiber - or so the roboticists claim." greyscale_colors = "#3E3E48#88242D" - -/obj/item/clothing/head/beret/science/rd/alt - name = "research director's beret" - desc = "A custom-tailored beret for the Research Director. Lamarr thinks it looks great. This one is made out of white fabric. Fancy." - greyscale_colors = "#FFFFFF#7E1980" - -/obj/item/clothing/head/beret/cargo/qm - name = "quartermaster's beret" - desc = "A beret that helps the QM keep telling themselves that they're an official head of staff." - greyscale_config = /datum/greyscale_config/beret_badge - greyscale_config_worn = /datum/greyscale_config/beret_badge/worn - icon_state = "beret_badge" - greyscale_colors = "#cf932f#FFCE5B" - -/obj/item/clothing/head/beret/cargo/qm/alt - name = "quartermaster's beret" - desc = "A beret that helps the QM keep telling themselves that they're an official head of staff. This one is made out of white fabric. Fancy" - greyscale_colors = "#FFFFFF#FFCE5B" - -/obj/item/clothing/head/caphat/beret/alt - name = "captain's beret" - desc = "For the Captains known for their sense of fashion. This one is made out of white fabric. Fancy" - greyscale_colors = "#FFFFFF#FFCE5B" - -/obj/item/clothing/head/hopcap/beret - name = "head of personnel's beret" - desc = "A fancy beret designed by NT's Personnel division for their favorite head's head." - greyscale_config = /datum/greyscale_config/beret_badge - greyscale_config_worn = /datum/greyscale_config/beret_badge/worn - icon_state = "beret_badge" - greyscale_colors = "#3e5c88#88242D" - -/obj/item/clothing/head/hopcap/beret/alt - name = "head of personnel's beret" - desc = "A fancy beret designed by NT's Personnel division for their favorite head's head. This one is made out of white fabric. Fancy" - greyscale_colors = "#FFFFFF#88242D"