From 06ddbf725c185b3207eaa85609b8e5aaa57f803a Mon Sep 17 00:00:00 2001 From: feartheblackout <59633984+feartheblackout@users.noreply.github.com> Date: Mon, 10 Jun 2024 11:49:11 -0500 Subject: [PATCH] Adds accessory versions of tank tops for the loadout (#19389) ![image](https://github.com/Aurorastation/Aurora.3/assets/59633984/fb19c9c7-4ce2-46f7-a478-8b8a73d345ca) --- .../loadout/items/accessories.dm | 2 + .../clothing/under/accessories/shirts.dm | 12 ++++ html/changelogs/SimpleMaroon-tanktops.yml | 58 ++++++++++++++++++ .../obj/item/clothing/accessory/tank_top.dmi | Bin 0 -> 562 bytes 4 files changed, 72 insertions(+) create mode 100644 html/changelogs/SimpleMaroon-tanktops.yml create mode 100644 icons/obj/item/clothing/accessory/tank_top.dmi diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index ed829f410a9..08c9bf2469d 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -289,6 +289,8 @@ shirt["long-sleeved blouse"] = /obj/item/clothing/accessory/longblouse shirt["puffy blouse"] = /obj/item/clothing/accessory/puffyblouse shirt["halter top"] = /obj/item/clothing/accessory/haltertop + shirt["tank top"] = /obj/item/clothing/accessory/tanktop + shirt["tank top, feminine"] = /obj/item/clothing/accessory/tanktop/feminine gear_tweaks += new /datum/gear_tweak/path(shirt) /datum/gear/accessory/silversun diff --git a/code/modules/clothing/under/accessories/shirts.dm b/code/modules/clothing/under/accessories/shirts.dm index 6bffacdbdf0..e0bf3b270f3 100644 --- a/code/modules/clothing/under/accessories/shirts.dm +++ b/code/modules/clothing/under/accessories/shirts.dm @@ -277,6 +277,18 @@ item_state = "haltertop" contained_sprite = TRUE +/obj/item/clothing/accessory/tanktop + name = "tank top" + desc = "A simple, cheap tank top." + icon = 'icons/obj/item/clothing/accessory/tank_top.dmi' + icon_state = "tanktop" + item_state = "tanktop" + contained_sprite = TRUE + +/obj/item/clothing/accessory/tanktop/feminine + icon_state = "tanktop_fem" + item_state = "tanktop_fem" + /obj/item/clothing/accessory/silversun name = "silversun floral shirt" desc = "A stylish Solarian shirt of Silversun design. It bears a floral design. This one is cyan." diff --git a/html/changelogs/SimpleMaroon-tanktops.yml b/html/changelogs/SimpleMaroon-tanktops.yml new file mode 100644 index 00000000000..2affe83737f --- /dev/null +++ b/html/changelogs/SimpleMaroon-tanktops.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Added accessory versions of tank tops to the loadout." diff --git a/icons/obj/item/clothing/accessory/tank_top.dmi b/icons/obj/item/clothing/accessory/tank_top.dmi new file mode 100644 index 0000000000000000000000000000000000000000..bb595075ca51bff0384fd78a56a2891ccad9e572 GIT binary patch literal 562 zcmV-20?qx2P)fd>8C3Fa4ARUjc9PlwLHsxuJ9Yt*V>P|f9otSw%nw8QcA z-HSK}D=czxdCTK>Yte@=axh&kJ{`EHn{>|*YEPOHB!V1A#ag`sO?9bq$Ecmqk1D7b= zim&`&FATWgfFIxl^aDZ&`9EBwAJ7lz2ZStvFWd10ssI207*qoM6N<$f>s{= A