diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index e02ed638e2a..546b4b4d2f1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -207,6 +207,7 @@ colorpants["striped pants"] = /obj/item/clothing/under/pants/striped colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans colorpants["mustang jeans"] = /obj/item/clothing/under/pants/musthangcolour + colorpants["shorts"] = /obj/item/clothing/under/shorts/color gear_tweaks += new /datum/gear_tweak/path(colorpants) /datum/gear/uniform/turtleneck diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 73ac4c3a048..03ea357d0d2 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -29,6 +29,10 @@ icon_state = "greyshorts" item_state = "greyshorts" +/obj/item/clothing/under/shorts/color + icon_state = "colshorts" + item_state = "colshorts" + /obj/item/clothing/under/shorts/scc name = "Stellar Corporate Conglomerate shorts" desc = "Shorts displaying the wearer's pride in their assigned corporate entity." diff --git a/html/changelogs/colourshorts.yml b/html/changelogs/colourshorts.yml new file mode 100644 index 00000000000..9a8c6f2487e --- /dev/null +++ b/html/changelogs/colourshorts.yml @@ -0,0 +1,6 @@ +author: Sparky_hotdog + +delete-after: True + +changes: + - rscadd: "Added colourable shorts to the loadout." diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 2ff3368e369..5ed115a66d7 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index b1f991a9544..f805103f909 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ