From 2209d6f9f8bb156540fe73fbcd3d4387bdc02b6d Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Tue, 19 Jul 2022 18:36:28 -0400 Subject: [PATCH] Adds GAGs jumpsuit/jumpskirt and prisoner outfits for Vox Primalis (#14816) * Adds GAGs jumpsuit/jumpskirt and prisoner outfits * Update vox primalis screenshot --- code/game/objects/items.dm | 2 ++ ..._humanoids__datum_species_vox_primalis.png | Bin 1323 -> 1320 bytes .../code/modules/clothing/base_clothes.dm | 2 ++ .../modules/GAGS/greyscale_configs.dm | 16 ++++++++++++---- .../GAGS/icons/jumpsuit_better_vox.dmi | Bin 0 -> 1626 bytes .../modules/better_vox/code/vox_clothing.dm | 5 +++++ tgstation.dme | 1 + 7 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi create mode 100644 modular_skyrat/modules/better_vox/code/vox_clothing.dm diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 5f21cf2f975..b13d7d1a184 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -360,6 +360,8 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons worn_icon_digi = SSgreyscale.GetColoredIconByType(greyscale_config_worn_digi, greyscale_colors) if(greyscale_config_worn_vox) worn_icon_vox = SSgreyscale.GetColoredIconByType(greyscale_config_worn_vox, greyscale_colors) + if(greyscale_config_worn_better_vox) + worn_icon_better_vox = SSgreyscale.GetColoredIconByType(greyscale_config_worn_better_vox, greyscale_colors) if(greyscale_config_worn_teshari) worn_icon_teshari = SSgreyscale.GetColoredIconByType(greyscale_config_worn_teshari, greyscale_colors) if(greyscale_config_worn_taur_snake) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png index ef07c104ce8595c85ddbbcb44211ca24fc73c1c0..6664a8b84c2ff7a5b79719504541f7b8f85e0406 100644 GIT binary patch delta 1079 zcmV-71jzfV3aAQ@Bmu6GB{4ZnBp{DKJ1i_LfPjEJJUnS@aAIO&rlzH2bxKZ7PL!0C zKR-V@IzVb_YR%2fwY9Y?D=Wmr#2pxlV$Rkn05ZP!p#~k2FWm|NpTLNNxQjR_^QT`WeLx zJ1i4mS3(?EanR=M7%n8CA<5$hZI+)%DMiH0QNUFjEjS!gOI22-k|~f3UXV7*Xgrw^ z2>ulqSX`PFJ`6wXnXamJRcXcGE0Pqy&p3aAleH?>rCMtSH!F&^I$`irslfn$PG)Iz z`p8p`q0p*QdSM?xLuCriKkBUE&uS#3Iy*a4{5}!F*1EPV>Y5fSXdA~3@ZMWv(Q*Wx zYugqr=fBx_|J=t%9&g*OX_~HW8GI9MY_quAcG0$u!IPbD7zW^f2yzU5nEhgiB2RxX zE+I=0odVXsgAO6XfIjb_;R~qf@OQ`)Y(TJK2z=9E2`{mPrtxzE@^zYKm&j{B-Ay|9 zwri6Hc=|9qFSeHUH-VM2?WC1yyQJdQb*)h|0^BC{)y3}o_4)4Nm7U)yq@{xf+wB$_ zIH_m*oeE1~+y{Z|>_7~-i_czD%u{t$}J`qbKf*_^_g$5LjWOt0_$+z^|DI_=eDvpgx50_Z08@KyN7Y zeFjfGBnv6yf1Sm}hh)DVIs79`#3qaXAG<3Ss)xaf;%*U-Ii5?dLb0j;AOIp=<|&jab*w%X zLqGtZbX8Uv28C|@=|~7*Ac-Gc#?Bk^juAMqDj(}`B=8N)htVtrik@XNnar-stt z36T6v4C5GqJ|(I3oIq=NoWOrMrA@p(ifN&Qx*^^nU~p`97Xr!Kdl2CMnBIBli1Hba z9Nn`1F?WsS!R)}N4j=t7D({cH>Dc6+Y{=jaDKAr_{5cL4qN5CWI(WB3KqN5k$G?1kj*$B$s~(9$=D&k#p3= z?xK*GgC%%;d?<=Ykll^gAh-?+xnoc4)8pe4PISxdW}^bd>@&-IqtVmnFHb~48D;{r zf&e6IoP-=)+Z_x#t{8&kzws%C9ByM;Oq+>eSf%pL2V}o|1OP%RrNb&80vJ*OSc^P? zNR^;x{h?9_s4WEd$`Dhfu^6&&ui}-^a=AZIpfXu_qe%sT{knjQuXd?^5JPeBjmN(Y xHN*lzDh|GL@b|HX;B6=lelW@J?nkD0_z4qYSmUii250~P002ovPDHLkV1nD$0=57E delta 1081 zcmV-91jhTQ3abi`Bmtk1B{3?Ll$6B8#7rb0k3c&tEG&S4fIK`rVq#+d|NmrlN={Br z&CShKRaLdMwULh%k*6dRYHDg*SXP69fpBeYTwGja{qEY4+kt<{NklgQHt39~hbfVxzp)>u0pgZIB8Shp>Fr2Q~9xI%$OZZy_mldf5b2<3$ zILpKtIu+9NU*fm7cc+s%o$hXL75x76&b&L_EBJr=@x#YE5ZrzIFupJ1_a`AZ-4}85 zr^xfEg#QIGd?@1ok33Wx)59!P^{|O^kJp;3@oMXT;ec~gmnpojiKmZE7vR7rYU-xI z;IT}fF1P>&XE7#t+AV<{8ZW{8g1sSfSLAmqhMg>8f7p`_Y#??O=%gC!^n z0J*g(4CtGAl&YoOK?>TK(PE4DKO8=D*+%JAa@j|&XXE%8?M)+yQrcAluK7_TK-t@Y0 znt8dZY}z1reEd>XOi;{5BnZkuWuyAWK0Q7@;f)@&Y@T95IjHQa@14ax{r&aHxfHd| z62Oq0?eQj*;J*6?L7GfKv2STY2*rmI-T`oUjuW+IhL&o1P8c4_9sm%9n%c4pE%9ZT zg(1(B35-mF7*G^@M2UMh2+GYHHNiyI*r=-vPl~xvOzOXhS-AOs-@wiHjq!j*hJznE z{$rjYHV9-m_^H7^&ohKB^KkG>X?_pC3d6%cTn1EE$;iqW00000NkvXXu0mjf{ihap diff --git a/modular_skyrat/master_files/code/modules/clothing/base_clothes.dm b/modular_skyrat/master_files/code/modules/clothing/base_clothes.dm index f212447aa47..445fef86dd1 100644 --- a/modular_skyrat/master_files/code/modules/clothing/base_clothes.dm +++ b/modular_skyrat/master_files/code/modules/clothing/base_clothes.dm @@ -14,6 +14,8 @@ var/greyscale_config_worn_teshari /// The config type to use for greyscaled worn sprites for vox characters. Both this and greyscale_colors must be assigned to work. var/greyscale_config_worn_vox + /// The config type to use for greyscaled worn sprites for vox primalis characters. Both this and greyscale_colors must be assigned to work. + var/greyscale_config_worn_better_vox var/worn_icon_taur_snake var/worn_icon_taur_paw diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index c60e438a220..7df8a6fcf15 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -351,6 +351,18 @@ name = "Worn Jumpsuit - Vox" icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi' +/datum/greyscale_config/jumpsuit_prison_worn/vox + name = "Worn Prison Jumpsuit - Vox" + icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi' + +/datum/greyscale_config/jumpsuit_worn/better_vox + name = "Worn Jumpsuit - Better Vox" + icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi' + +/datum/greyscale_config/jumpsuit_prison_worn/better_vox + name = "Worn Prison Jumpsuit - Better Vox" + icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi' + /datum/greyscale_config/jumpsuit_worn/taur/snake name = "Worn Jumpsuit - Naga" icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_snake.dmi' @@ -359,10 +371,6 @@ name = "Worn Prison Jumpsuit - Naga" icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_snake.dmi' -/datum/greyscale_config/jumpsuit_prison_worn/vox - name = "Worn Prison Jumpsuit - Vox" - icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi' - /datum/greyscale_config/jumpsuit_worn/teshari name = "Worn Jumpsuit - Teshari" icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_teshari.dmi' diff --git a/modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi b/modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi new file mode 100644 index 0000000000000000000000000000000000000000..219995affaf54c01d6c8f0e69c0fc66230335401 GIT binary patch literal 1626 zcmV-g2BrClP)P)t-sgYJNp znV;?L>rzr%Dk>_Jl$48$i$6aV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pS zoZ^zil2jm5DXTQMptv-%M2U+tC9|j)q>qa;ttc@!6~s2gR2ZK^ywb$vAVFbsraY_B6_85xAV|C`R1owVz65(Bc(?0#DKRynrLas))+ zH4Pzz5JCvaxWv6J7Nm@gJxG?_Zl`$YoocQ`KXn|Wcz*+mN8>(gTFb%9=40L$X)?3UkIfulxs5&N`;p+M(W6FB(>oJfBY z`>xnQqL4<~IjEW!r3ft1nHN}u@5)3d0`(-L2@D?|f!!gyPR{OLBIwIMKHz_|gG`_P zYzdS`^Oyo%=|p{+37T~haHD-}giOY<-ZyeXjr^`WOX)Kd0*vsqL~pc@&2BPD|K0}| zJaW+2BxfuE50`+iSrpHpZnp#&jeI`KlRS@3vMC3k4&c;`4Qhf>1gdsvp%0OkDem3{ zmm?UEz#s}8j&NE5T8b9`16E+!YlxK*n)+lvZwh67=AU_c@bXd-*;52zdN1~TY@R02 zC|QafO<{Sht>+Qt)pm+t$RdzE_z^S#1#NKu_AoaB z+FxH^_vv@mel3T4oO}R_kH40{Hb*5z?~s0TwAwj)jo_Sp#42BW@(9-J-kQi&1&$F! zycVE6)XEkT`0eEoyLfo{hU|wIxgmQ+nWKL*efZk_Cdf6mEen+D&xQq>HMSK=Px3kW zr~COdGyWafGg4kNOWmKCAZ7CH>XQoMme0UOK5VmXfvm6*LI@#*5JLVxzL&~S{Jydu zOL6SukM!^(_Q$ndS%ld4eSG)0J>oGbi%H)J>Z>(4boF0McNO23C7%1td7JUe97UjZ z2A252>!!u}tN}~{a|qAdOfkaolmwo1fp!ER?$+ao=Tkgw_!NvIYdf+OaTxk^8@4Ji zcD)GfyNxQ0Llp=^xZk&Jt7j3dN&V=?UG=*=h+S8gXt&W2CWT32lDAQP|3MZdgb+dq zA%u|Cu-|Mw_1iIf|IjGq4cvp&KH{@}Uhz2XABwIGJGu6ci&L@K*V_VCC0_cG3y_cn zI;=2O^OFjEQ;77H?QzeVz_YT0?)uafX4FUZ2rl5(1F`FCO%|w~gO7IUu_S>PQ{ee0 z7Wnh59va`>ufnmvTrLYnaD9Q7j1@smpcTP#)0$lILIJffk2J3g*9gEc^?Hb;?@sGK zM*VrVwwk{-pSxDaH|uN3jt+ef?4ZhnwF5JYPg655@MEh#8d&wU+`yDLz~hs;E|wqE zeF2W2F&r3_C1};xYJiOa@EV9ik=O$Va%?l$!8ll_s7wLs->R=k08;~P06Bg>1W{ba z{mb$d2jTcbIy`ExLy|FtXMjt@sINtlsIAg$?K?b!YX8@ap9jzcW;+`Hn);emelwD= z(f_sMTLWPK2qA_kq187{a z`{Z8ReRAwXGc$rqa_|13g7W30N9`YquRO24J_sS0{Jq2Jc7r`<7xVj%gb+dqA%qY@ z2qA=!zvIbwE+jUL;AaQ_$BTpz@(^l?4b<$N Y3vQt{VhmJl%>V!Z07*qoM6N<$g7c9N<^TWy literal 0 HcmV?d00001 diff --git a/modular_skyrat/modules/better_vox/code/vox_clothing.dm b/modular_skyrat/modules/better_vox/code/vox_clothing.dm new file mode 100644 index 00000000000..f0b5fab80f2 --- /dev/null +++ b/modular_skyrat/modules/better_vox/code/vox_clothing.dm @@ -0,0 +1,5 @@ +/obj/item/clothing/under/color + greyscale_config_worn_better_vox = /datum/greyscale_config/jumpsuit_worn/better_vox + +/obj/item/clothing/under/rank/prisoner + greyscale_config_worn_better_vox = /datum/greyscale_config/jumpsuit_prison_worn/better_vox diff --git a/tgstation.dme b/tgstation.dme index fb63ea10942..eee1ab5228e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5036,6 +5036,7 @@ #include "modular_skyrat\modules\barsigns\code\barsigns.dm" #include "modular_skyrat\modules\better_vox\code\vox_bodycolor.dm" #include "modular_skyrat\modules\better_vox\code\vox_bodyparts.dm" +#include "modular_skyrat\modules\better_vox\code\vox_clothing.dm" #include "modular_skyrat\modules\better_vox\code\vox_species.dm" #include "modular_skyrat\modules\better_vox\code\vox_sprite_accessories.dm" #include "modular_skyrat\modules\biohazard_blob\code\_biohazard_blob_defines.dm"