From c70c41ea18c597f65a0213dae4e3fa5a08dae1d3 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Mon, 17 Feb 2025 02:18:43 +0800 Subject: [PATCH] Sweater stuff (#20474) - bugfix: "Sweaters can be worn in the shirt slot now. Fixes sweaters not layering when worn as an accessory." --- .../clothing/under/accessories/shirts.dm | 1 + html/changelogs/wezzy-sweater-fixes.yml | 58 ++++++++++++++++++ .../obj/item/clothing/accessory/sweaters.dmi | Bin 1590 -> 1976 bytes 3 files changed, 59 insertions(+) create mode 100644 html/changelogs/wezzy-sweater-fixes.yml diff --git a/code/modules/clothing/under/accessories/shirts.dm b/code/modules/clothing/under/accessories/shirts.dm index 58152b74400..631ca57a359 100644 --- a/code/modules/clothing/under/accessories/shirts.dm +++ b/code/modules/clothing/under/accessories/shirts.dm @@ -11,6 +11,7 @@ icon_state = "sweater" item_state = "sweater" contained_sprite = TRUE + slot_flags = SLOT_ICLOTHING | SLOT_TIE // Tubeneck Sweater /obj/item/clothing/accessory/sweater/tubeneck diff --git a/html/changelogs/wezzy-sweater-fixes.yml b/html/changelogs/wezzy-sweater-fixes.yml new file mode 100644 index 00000000000..723e628b5a9 --- /dev/null +++ b/html/changelogs/wezzy-sweater-fixes.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: Wowzewow (Wezzy) + +# 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: + - bugfix: "Sweaters can be worn in the shirt slot now. Fixes sweaters not layering when worn as an accessory." diff --git a/icons/obj/item/clothing/accessory/sweaters.dmi b/icons/obj/item/clothing/accessory/sweaters.dmi index 4a73d74e5450c71c0e23ca7baefbea2a544c13a5..0548046e4cd81588a5ee4d6359c7d1942127d9be 100644 GIT binary patch literal 1976 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