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 8957676c613..dd828818791 100644 Binary files a/icons/obj/item/clothing/pants/shorts.dmi and b/icons/obj/item/clothing/pants/shorts.dmi differ