diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 88f4d9fbcd5..f03c8c6737d 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -1190,7 +1190,7 @@ else if(item_icons && (slot_head_str in item_icons)) our_image = image(item_icons[slot_head_str], icon_state) else - our_image = image(INV_W_UNIFORM_DEF_ICON, icon_state) + our_image = image((icon ? icon : INV_W_UNIFORM_DEF_ICON), icon_state) our_image.color = color return our_image diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index b704c5b89b8..ca39d635c4d 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -36,4 +36,4 @@ desc = "A sleek, form-fitting undersuit designed to retain the wearer's mobility. It almost feels like you're wearing nothing at all." icon_state = "ninja" item_state = "ninja" - worn_state = "ninja" \ No newline at end of file + worn_state = "ninja" diff --git a/html/changelogs/fluffyghost-fixhardsuittextchest.yml b/html/changelogs/fluffyghost-fixhardsuittextchest.yml new file mode 100644 index 00000000000..95ed5fe883a --- /dev/null +++ b/html/changelogs/fluffyghost-fixhardsuittextchest.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FluffyGhost + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed chestpieces from showing \"chest\" in the sprite rendering when the jumpsuit icon is not a contained sprite."