From 570f4de0e424dcade063ad5c684861fcfa701a7e Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 27 Sep 2020 01:02:29 +0200 Subject: [PATCH] Armband Fix (#10049) --- code/modules/clothing/under/accessories/accessory.dm | 4 +++- code/modules/customitems/item_defines.dm | 1 - html/changelogs/geeves-armband_fixes.yml | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/geeves-armband_fixes.yml diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 671b16bd36a..138d23c8c12 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -89,7 +89,8 @@ if(flippable) if(!flipped) if(!overlay_state) - icon_state = "[icon_state]_flip" + icon_state = "[initial(icon_state)]_flip" + item_state = "[initial(item_state)]_flip" flipped = 1 else overlay_state = "[overlay_state]_flip" @@ -97,6 +98,7 @@ else if(!overlay_state) icon_state = initial(icon_state) + item_state = initial(item_state) flipped = 0 else overlay_state = initial(overlay_state) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 65832fe379a..e67e102ac9a 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1947,7 +1947,6 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "djikstra_robe" body_parts_covered = UPPER_TORSO|LOWER_TORSO contained_sprite = TRUE - valid_accessory_slots = list("decor") /obj/item/clothing/accessory/fluff/djikstra_blade //Symbolic Khanjbiya - Msizi Djikstra - happyfox name = "symbolic khanjbiya" diff --git a/html/changelogs/geeves-armband_fixes.yml b/html/changelogs/geeves-armband_fixes.yml new file mode 100644 index 00000000000..6f14e3ef06b --- /dev/null +++ b/html/changelogs/geeves-armband_fixes.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed some armbands not flipping correctly on the mob sprite." \ No newline at end of file