From 8ac9666c119b270cdf043a6087f34ea775f627f8 Mon Sep 17 00:00:00 2001 From: Batrachophreno Date: Sun, 26 Apr 2026 06:56:09 -0400 Subject: [PATCH] Fixes invisible black shorts (#22345) Fixes https://github.com/Aurorastation/Aurora.3/issues/22291 changes: - bugfix: "Fixes black shorts being invisible." - bugfix: "Removes old grey jean obj defs (no sprites and not used in server)." - bugfix: "Removes two empty unused sprite icon_states from shorts.dmi" --- .../preference_setup/loadout/items/pants.dm | 2 -- code/modules/clothing/pants/shorts.dm | 9 --------- html/changelogs/Bat-Shorts.yml | 6 ++++++ icons/obj/item/clothing/pants/shorts.dmi | Bin 2796 -> 6872 bytes 4 files changed, 6 insertions(+), 11 deletions(-) create mode 100644 html/changelogs/Bat-Shorts.yml diff --git a/code/modules/client/preference_setup/loadout/items/pants.dm b/code/modules/client/preference_setup/loadout/items/pants.dm index a37fe8eeec3..c30282d3fa9 100644 --- a/code/modules/client/preference_setup/loadout/items/pants.dm +++ b/code/modules/client/preference_setup/loadout/items/pants.dm @@ -41,8 +41,6 @@ ABSTRACT_TYPE(/datum/gear/pants) pants["mustang jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/mustang/short pants["black jeans shorts"] = /obj/item/clothing/pants/shorts/jeans/black pants["black jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/black/short - pants["grey jeans shorts"] = /obj/item/clothing/pants/shorts/jeans/grey - pants["grey jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/grey/short // Athletic Shorts pants["black athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/black diff --git a/code/modules/clothing/pants/shorts.dm b/code/modules/clothing/pants/shorts.dm index 6315c9e33fb..890683172c2 100644 --- a/code/modules/clothing/pants/shorts.dm +++ b/code/modules/clothing/pants/shorts.dm @@ -80,15 +80,6 @@ icon_state = "shorts_s_jeans_black" item_state = "shorts_s_jeans_black" -/obj/item/clothing/pants/shorts/jeans/grey - name = "grey jeans shorts" - icon_state = "shorts_jeans_grey" - item_state = "shorts_jeans_grey" - -/obj/item/clothing/pants/shorts/jeans/grey/short - name = "grey jeans short shorts" - icon_state = "shorts_s_jeans_grey" - item_state = "shorts_s_jeans_grey" /********** Jeans Shorts End **********/ /********** Athletic Shorts Start **********/ diff --git a/html/changelogs/Bat-Shorts.yml b/html/changelogs/Bat-Shorts.yml new file mode 100644 index 00000000000..9c8eb6b1eae --- /dev/null +++ b/html/changelogs/Bat-Shorts.yml @@ -0,0 +1,6 @@ +author: Batrachophrenoboocosmomachia +delete-after: True +changes: + - bugfix: "Fixes black shorts being invisible." + - bugfix: "Removes old grey jean obj defs (no sprites and not used in server)." + - bugfix: "Removes two empty unused sprite icon_states from shorts.dmi" diff --git a/icons/obj/item/clothing/pants/shorts.dmi b/icons/obj/item/clothing/pants/shorts.dmi index 8957676c613b8c52d0f61da5177872e7ee03cfba..dd82881879101cb55d8dbdd9de00b9df770580ed 100644 GIT binary patch literal 6872 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 literal 2796 zcmZXV3pf+%AIC?bzk5-}n0ugW&~Q*M;oOqWEG>NZMNky#{Tm^|8t(6=l?#>`@HY(_j`Zu`+Gm{_j%qMem-tW@>=o$ z06@vZ-T5Q{AmzB#cWje*)_el)N(@6kFN8~9Uti*-tOpO##>OTxGBPPC2@D1w zIB-BqODjJ=-&;W;URAYFUA-O%WWit{Zv~ThRjWevBlW--7A#U(*&tFmOHIupOU+kN zQO8$t-@bjCnwo}&hGu4FwY9any1Gy()Y{rw0pzV}60dGm2s}~`i(#EOaRQ6QwzRZJ z@=++1Bwvz@Kp^%Qni@b|OkF|_`Nz5@6oV}t_B;A(npk~#=CVw8r{`G%_a0O>I6PZs zyL~4KA)zLfc+$ro;5hdVC7GL~Ac7N}&tlJD&LrPY#Z{!6;goNyL2aAJ=Cd+$`->>AoIT)&## z(|xC*6?>v*99nUxGdTZGJlpG~THygFE&9lJ{nIt63>7$A`=#^S3H&_M3E>OZ(JL04 zRA?+IHTgJc@ARi&kHgCB`=?Qhvv%%78S?T~o4n1hzv5!{Jn-bguNv(xX)Abg`k4HU<+cA>ZC0YT5z{(h0gOYM1Wkt6U$o?FpAf-gc+o z`2I%bt_hw?$r_I^{YCmobjaz$kIVtdEpfHUH?_Z{u1Fnh)vgE$6M6%)4HYVl&8;+G*i+t9W%&;G{raF zbO%s?X#lFYuEYAX9@#$i3w;{Z$`NY}jhZQ7n|oZQKqn+*bjbxzbg=IP%U(yUnq-4eOF(QNfVu5QN1Vvl_ldSn`# zi(hVEFZ7hwf(lBM#@V(uRHrK|?t!eqjw49SZ`0#$F?D1Xhd>~KEo)trjYfjHx!a}w zK3X#3-P`-k!*BC=VIkkgI(F&~fvqkrfFPL{js8~vf#_HAn0M($vB&%42}m^YE>XL6 zx+MyOaiSlD)>cJCd2z-vP+95y#!^ZI;fvgF%Y=#u{jO942qqc{Hn$7reKUMA8iZM) z(R@{a3IXMa>2r;;+m+C=a>%OJhfLu;S;s zi{zNM7MUXL2O)N+$_7`x_7})m?W4a-%5Zqr7$GmrnHMOeI7K6=u$+%>?;@mrqyi|h z%?P5;E&MqrB5IHb6@*gAkqldn3KgQKJ?!Epy7^=?f>mLSPMVn&{)s%>8~1M;zgG@{ zxD>1lsU!x+6rJismX`&M4}K^Pnwy&qcs%`clpT@O+tU(2-Ok7M4;&C+emB3(>pZ?k zCEBm5mAjd8ErhDhR~Y@Q@%`Fh2QEYYY4LAVY3Uy^?Y+3!TtQ<5(1dmty_OV9v!LWn zwEiL8j$4V66Q`V-LK|LCBHwfR8Dv1>$UfnbjN=hJ(V9@eJ{09^nEV(sL3l)x3DXv=TcDkWy1^@Gq@W<&fQ(6xbR8zo&C0H z&G;6{`si2(q;6rCW<*>x&rx>CWt~HIySwD6Pqj?P!F}@z7gp+2MLX6ZdjAxK#y^<- zK#J zGi?8nd3=*yEK*zCa>`8Vo!e}V2q%obAtea)+owY-jUV#zFXQ`5`RNC{q31Sm%MkE| z>}Qf)UPJ44$6&jY;SCltZN4M*c`t`!vCXe#Pc5tlV=2b*J`lgY1SAC5_`yZyj6g6! z%xs6#0vpOLF7X=ikfD2qEb9Gq^^x;fS*GmO_@WQ8W)|dY3p3~)yb0}ze~45=!5baI zWWj(NXbZ?_38}pby&+=N!A(w&+a* zY8ADw$_(^Vanm+1H!co|7Oiwc-Dbk>L1Va4_ZHWgx*2zuUcKYyJbOMUof1!9uJJzG zPq7E_t*K{psvqA>i%=xf&cnt}WX`N0W z)*J5qtlPrQt?Sz@b=614;lc^n9H_hessXZ3V`B@C2pSU>t9|r7N!mW1zI&p&r$=M> zxlG!oK`%a>Fw+j_ZzwVbrc|dXc2D4c>&S6K$S2bq=n)oTZ3&;0