From aa76c671d314a7372964a50e3728ea676d8e7cfc Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:47:32 +0200 Subject: [PATCH] Highvis pants (#18774) * h5 * 4 * t * tredh * c * Update code/modules/clothing/suits/miscellaneous.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Signed-off-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> * Update code/modules/clothing/under/pants.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Signed-off-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> --------- Signed-off-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Co-authored-by: DreamySkrell <> Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --- .../preference_setup/loadout/items/uniform.dm | 2 ++ code/modules/clothing/suits/miscellaneous.dm | 16 ++++++++-------- code/modules/clothing/under/pants.dm | 14 ++++++++++++++ html/changelogs/DreamySkrell-highvis-pants.yml | 8 ++++++++ icons/clothing/kit/highvis.dmi | Bin 0 -> 2059 bytes icons/clothing/suits/highvis.dmi | Bin 1427 -> 0 bytes 6 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 html/changelogs/DreamySkrell-highvis-pants.yml create mode 100644 icons/clothing/kit/highvis.dmi delete mode 100644 icons/clothing/suits/highvis.dmi diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm index 2a597e0241d..7ed5f721b60 100644 --- a/code/modules/client/preference_setup/loadout/items/uniform.dm +++ b/code/modules/client/preference_setup/loadout/items/uniform.dm @@ -177,6 +177,8 @@ pants["red pants"] = /obj/item/clothing/under/pants/red pants["tan pants"] = /obj/item/clothing/under/pants/tan pants["khaki pants"] = /obj/item/clothing/under/pants/khaki + pants["high visibility pants"] = /obj/item/clothing/under/pants/highvis + pants["high visibility pants, alt"] = /obj/item/clothing/under/pants/highvis_alt pants["track pants"] = /obj/item/clothing/under/pants/track pants["blue track pants"] = /obj/item/clothing/under/pants/track/blue pants["green track pants"] = /obj/item/clothing/under/pants/track/green diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index c55c7fa0d59..3b7f0456ce7 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -397,19 +397,19 @@ /obj/item/clothing/suit/storage/toggle/highvis name = "high visibility jacket" - desc = "A loose-fitting, high visibility jacket to help crew be recognizable in high traffic areas with large industrial equipment." - icon = 'icons/clothing/suits/highvis.dmi' - icon_state = "highvis" - item_state = "highvis" + desc = "A loose-fitting, high visibility jacket to help the wearer be recognizable in high traffic areas with large industrial equipment." + icon = 'icons/clothing/kit/highvis.dmi' + icon_state = "jacket_highvis" + item_state = "jacket_highvis" body_parts_covered = UPPER_TORSO|ARMS contained_sprite = TRUE /obj/item/clothing/suit/storage/toggle/highvis_alt name = "high visibility jacket" - desc = "A bright yellow jacket with reflective stripes. For use in operations, engineering, and sometimes even law enforcement in cold and poor weather or when visibility is low." - icon = 'icons/clothing/suits/highvis.dmi' - icon_state = "highvis_alt" - item_state = "highvis_alt" + desc = "A bright yellow jacket with reflective stripes. For use in operations, engineering, and sometimes even law enforcement, in cold and poor weather or when visibility is low." + icon = 'icons/clothing/kit/highvis.dmi' + icon_state = "jacket_highvis_alt" + item_state = "jacket_highvis_alt" body_parts_covered = UPPER_TORSO|ARMS contained_sprite = TRUE diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 3d90cf98ce9..a2825775483 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -42,6 +42,20 @@ icon_state = "khaki" item_state = "khaki" +/obj/item/clothing/under/pants/highvis + name = "high visibility pants" + desc = "A pair of loose-fitting, high visibility pants to help the wearer be recognizable in high traffic areas with large industrial equipment." + icon = 'icons/clothing/kit/highvis.dmi' + icon_state = "pants_highvis" + item_state = "pants_highvis" + +/obj/item/clothing/under/pants/highvis_alt + name = "high visibility pants" + desc = "A pair of bright yellow pants with reflective stripes. For use in operations, engineering, and sometimes even law enforcement, in cold and poor weather or when visibility is low." + icon = 'icons/clothing/kit/highvis.dmi' + icon_state = "pants_highvis_alt" + item_state = "pants_highvis_alt" + /obj/item/clothing/under/pants/camo name = "camouflage pants" desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." diff --git a/html/changelogs/DreamySkrell-highvis-pants.yml b/html/changelogs/DreamySkrell-highvis-pants.yml new file mode 100644 index 00000000000..784fa3b084b --- /dev/null +++ b/html/changelogs/DreamySkrell-highvis-pants.yml @@ -0,0 +1,8 @@ + + +author: DreamySkrell + +delete-after: True + +changes: + - rscadd: "Adds highvis pants to match the two highvis jackets." diff --git a/icons/clothing/kit/highvis.dmi b/icons/clothing/kit/highvis.dmi new file mode 100644 index 0000000000000000000000000000000000000000..1ab2a871fea88ee7c3410d86594e5d3e10464baf GIT binary patch literal 2059 zcmYjSdpOe%7yoY9*pJ+LRVe%>p+pfv=Gxrn#hP-hT=I5tEw^93!z#B}6DkT3B?*<* zFWOuu*KVSeX@pH~*=EM}ebw{6&-?yy&gVJjJkR-@^PF>@lj-S!l|!kb005A4c5?9A zK>CK1NlR?#v;6$X4G8db^Kqop>6zIXiOC5m#Eba_l)P)X%F0Ry%uMVZ?L573uNwgL zPVM>|Kv#FC;r{)Zg_4agfzoQg&p$XaCb|CuOjlPoF$qjf&#|zuz+$mzGE+}O+by|IgC35(J}@zM0w+r96gntmL*{`g z>=`*+@u)bBjqd76>u9E&xLYCPc>b@59T8p1|A^UYvFKY-JIBB_WVaDo^d#7Rb$DpFvE~fEfFM|jTs})6=#gCU@t>ssu6sCJrHz#Csz1X~ z?Q??md=42kYnm^cuYn

r&2~l!$!TD-~qQC^m-&?2;ndPFa{gi_CYg6LCJ9o|ZS8 z9}THa%U5Y4Wi!8dacznOsk& zC}^wM$b`o3Vt-CSX}-5E`7+HKYZrWz87oXs@^>lzMktO=J^u#g6Kc{^XfO|(>h6!PZ zW!dp0r^yKg`Zd1@z ztWzRp;`Dg`VpOo8f(J##!cxwqev@l=6|Rj5!9~$H7UO2UP~Pz$yWL8*7hu$0Q8HvN zB+o+6WdhW?5=zd|`g?_I148h|+NjA&uLCwwf&E(3=Q?>9TL)00}LFLT1i`Y1XTlY^R11r;3VquB3lb^2AO`4 zS(y5Ex2sZBS!xVf%UhNjm{85%{BM@2J>&;RSdPCFu8y?30ak{bUzJTX+EfJ;{@{+# zHFBf<$ElOkD~Q1VYn%b2@r{Fo?wd^o`gb|DTjB>Atklf|7v*{JgEI^N)CzM*tyEKB zJ^xe*o!tI|2OFS`C+C%MS7t!@0&-9d_I}GQw9Q2@u2#H&HIK2H4tmE#dVx4}#+Gd= z`a~%>_k$)wxP>tbWiPGsV4rDz89gua805Fi*2>am`>S_QKxguFwKc(ly;d>7gWi&x zCxbM2D~T?`oxu#}WCaObi!Gf4e0WO$ji6N1ZHaTjGVM*YS@O9ZhT z7mLfYk$+~73zf(aLNf^>(1av56e6q5>a?sA{KM=n6xzOsQ%sZ9Oe{Ktq=+#VfzTDb z>%)*E2dYO!3qjvLg+?Ky0;TNhMhm6BGIDHg9df8?zneP*O-TQ0rR3z8vCwLV6%Doe z@_184_OH^Pm~O4Ne)X%(SjGb-$G!x_#Dfbt zcxd`C@gtol}aUKz$pc9OZsD)cmxJ^fD6D-s_Ci+; z6pN;Fpy*{%=BRFNYYp_|p+Ys}y0YLJ0beau*N_K#TJTUfmiQjp=@bEvch+)xwXaI= z;SWUR5N((X%6Q$XcmGRz+g#aI`C}6wsTX;mp8H5+D!Yhzj~5Z`UuY6@i~K$#bl01C zve~vrqx5c7s(}*-_%$UiMUX}%`AE%snIkRK;q2P-P)2zCnNL%ln9FizaUA>4|2_09 z`>3a4Xn%(#4!U3iXps!J+emNvQ_usW>b7ajbw3gOgpG^ysjt7E!rqaZ$7B}!=UyPS zRr5U_EpH-kT4imV6a~B=S#-Y@^I&_XnywwZf5O9MDl8{KG4JcyZBRD3nir(!Zf->1 zG7%j0F3=qt55Un0$6n^YbNJHN6B+(pgj1|Xm}dsc5CcNL<42;EbyX#`i2Q=nIggPF zBpIb$+mfI3xx$;T>r9&L=h;zO^>qfyzTauov2{_7QN4LjJ00Iw0t*Z|9YR=Ect`4P n-;7c(u8{`kL`Sk7XM!;Ew)*h}kAo^3e-?0d^l+%N3r_nt+wcV+ literal 0 HcmV?d00001 diff --git a/icons/clothing/suits/highvis.dmi b/icons/clothing/suits/highvis.dmi deleted file mode 100644 index 172d6febed076c55f48fb1d68489ab25c188cac4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1427 zcmV;E1#J3>P)004jp0{{R3ySu9cz%F=la-Q>k&Y7+5;Zq8Lq$SRQcuaT03#(Nu$TbG$i*)*GKrQ1vbzAy)B&HT z09#yOZ*qGmC@6V)e}RLHIyyQ>M@KM)%cB4Q00DGTPE!Ct=GbNc005ABR9JLGWpiV4 zX>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33t zGfE(w;*!LYR3K9+11MIOS**mxnUYyl3=}cs;!G<_%uR)`(bdHlmm-v!;8&VokeWxd zxgf=)7@n9@LbTaHwImu%n%iL-@K~a(;OgfBjvxS0n19(>vIFe^00dV_L_t(|ob8y6 za-%p9gn`%s^J57aVeI^RgN1_6~W3YAKwQvG*S{&swY zS080repJE<__2Fx$`j39ow$k|ugdfJbUv57LyQ&duXCK(3R43b%u$=ycvF3lswT}* zaj8zCMc6x47iM_d)OA&N_|#4N0`D))mo9z!3~k#~5a+)zL>rVPM-T0_ZW_}x^%ejB zG4F@ASuI|gc1SuLhM{e{nr$$yLEW`2%95}hFt+Jnpc~rl96PvaE*JV|QoM*A9EO}h zT12XYrn&arqeESP-At0_U2ke!eSA#cB~9S`dpejdFxPAM>`-^TZVcpj*BMjCOI#cJ zk~#-QViBUj8e@|;A#Shg*&+J!0yi~n!b@!u{84kNXb#?BQ^%qN!y~Nhdt8CG?R)z2 zB5xV~s5zHZz!{|Rv54WgeFifyH_=W$Nc^jaGx){00$M;PtT4-C3vuN5V-l%@{j)G3 zgKdrjsZ=V}|5}<4{tNkFk;w-o{*HXm6h_Pk1^%9V z&`^LQC*MgER_a5cc^g93j~KDZj-^Ff}!DIZ)7@cE#~-;xg&nfx!u z|9Czq<#&7dAI}GiOg<>`H{^q+5c9n}*L+Z=QmIrbl}e>jy)5gj#Yf;ch+y5*0xvS$2^tmQ{Y_Xz;2Z?3Zekr` z^nDzc5yxc7K0dO1-2t@7g)_Kd0gl@wx0$9MLp;v6pK~9Hi$}lZR5H!Z(j1&Yn%ug1 zN{;sT={Db|Wxmh1>Ar12j!%)_=ao;XQ&`O5=_+sr>GF6?p6s9>9acDp84GaZ#sIK? za=$GA$Nqu4JGf0uKnAI`SR~)U39G}ENE);_11?a&2lH=AJWl!K@!L0!eTRF{c}KUY zPwqm@yEcI}xOOMK2ctm`13qbx9*<9sZ{H2rXe&Mkqt&EA@904&?m;}JxF=x~{cTXO_Z8@Es9Qp*02I<$%OMB2e8p}N?=`j$5S3!>dGRTa7Od@n}otrlhJ0uv) z@+g+m!O3^AlMIGs!JA@PxE1c;pP!#Rr&l@cQ>la0es+Z+(At*d{@KaNAj@fcEm$On zVGTIFf8V6&P%8M#{!}WJN~Kb%RH{R=-dZc*QmKBde*i_~iW}E-qpbh{002ovPDHLkV1f