From 7157cc1748ed9f3ce42360d8a9c105d2d7f5ed89 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 26 Jul 2015 14:57:49 -0400 Subject: [PATCH] Fixes #9326 --- .../clothing/under/accessories/accessory.dm | 19 +++++++++--------- .../mob/living/carbon/human/update_icons.dm | 2 +- code/modules/mob/update_icons.dm | 9 --------- code/setup.dm | 8 ++++++++ icons/obj/clothing/ties_overlay.dmi | Bin 3478 -> 0 bytes 5 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 icons/obj/clothing/ties_overlay.dmi diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index feef7d06b1a..395c9939f57 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -9,30 +9,31 @@ var/slot = "decor" var/obj/item/clothing/under/has_suit = null //the suit the tie may be attached to var/image/inv_overlay = null //overlay used when attached to clothing. - var/image/inv_overlay_mob = null + var/image/mob_overlay = null var/overlay_state = null /obj/item/clothing/accessory/proc/get_inv_overlay() if(!inv_overlay) + if(!mob_overlay) + get_mob_overlay() + var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]" if(icon_override) if("[tmp_icon_state]_tie" in icon_states(icon_override)) tmp_icon_state = "[tmp_icon_state]_tie" - inv_overlay = image("icon" = icon_override, "icon_state" = "[tmp_icon_state]") - else - inv_overlay = image("icon" = 'icons/obj/clothing/ties_overlay.dmi', "icon_state" = "[tmp_icon_state]") + inv_overlay = image(icon = mob_overlay.icon, icon_state = tmp_icon_state, dir = SOUTH) return inv_overlay -/obj/item/clothing/accessory/proc/get_inv_mob_overlay() - if(!inv_overlay_mob) +/obj/item/clothing/accessory/proc/get_mob_overlay() + if(!mob_overlay) var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]" if(icon_override) if("[tmp_icon_state]_mob" in icon_states(icon_override)) tmp_icon_state = "[tmp_icon_state]_mob" - inv_overlay_mob = image("icon" = icon_override, "icon_state" = "[tmp_icon_state]") + mob_overlay = image("icon" = icon_override, "icon_state" = "[tmp_icon_state]") else - inv_overlay_mob = image("icon" = 'icons/obj/clothing/ties_overlay.dmi', "icon_state" = "[tmp_icon_state]") - return inv_overlay_mob + mob_overlay = image("icon" = INV_ACCESSORIES_DEF_ICON, "icon_state" = "[tmp_icon_state]") + return mob_overlay //when user attached an accessory to S /obj/item/clothing/accessory/proc/on_attached(obj/item/clothing/under/S, mob/user as mob) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index dd118b4947e..a88bb65c24b 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -497,7 +497,7 @@ var/global/list/damage_icon_parts = list() var/obj/item/clothing/under/under = w_uniform if(under.accessories.len) for(var/obj/item/clothing/accessory/A in under.accessories) - standing.overlays |= A.get_inv_mob_overlay() + standing.overlays |= A.get_mob_overlay() overlays_standing[UNIFORM_LAYER] = standing else diff --git a/code/modules/mob/update_icons.dm b/code/modules/mob/update_icons.dm index 627fb1dc53f..a6ae6dc4a09 100644 --- a/code/modules/mob/update_icons.dm +++ b/code/modules/mob/update_icons.dm @@ -1,15 +1,6 @@ //Most of these are defined at this level to reduce on checks elsewhere in the code. //Having them here also makes for a nice reference list of the various overlay-updating procs available -//default item on-mob icons -#define INV_HEAD_DEF_ICON 'icons/mob/head.dmi' -#define INV_BACK_DEF_ICON 'icons/mob/back.dmi' -#define INV_L_HAND_DEF_ICON 'icons/mob/items/lefthand.dmi' -#define INV_R_HAND_DEF_ICON 'icons/mob/items/righthand.dmi' -#define INV_W_UNIFORM_DEF_ICON 'icons/mob/uniform.dmi' -#define INV_ACCESSORIES_DEF_ICON 'icons/mob/ties.dmi' - - /mob/proc/regenerate_icons() //TODO: phase this out completely if possible return diff --git a/code/setup.dm b/code/setup.dm index 6d49d591b34..35bc11db2e6 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -974,6 +974,14 @@ var/list/be_special_flags = list( #define CUSTOM_ITEM_MOB 'icons/mob/custom_items_mob.dmi' #endif +//default item on-mob icons +#define INV_HEAD_DEF_ICON 'icons/mob/head.dmi' +#define INV_BACK_DEF_ICON 'icons/mob/back.dmi' +#define INV_L_HAND_DEF_ICON 'icons/mob/items/lefthand.dmi' +#define INV_R_HAND_DEF_ICON 'icons/mob/items/righthand.dmi' +#define INV_W_UNIFORM_DEF_ICON 'icons/mob/uniform.dmi' +#define INV_ACCESSORIES_DEF_ICON 'icons/mob/ties.dmi' + #define SHARD_SHARD "shard" #define SHARD_SHRAPNEL "shrapnel" #define SHARD_STONE_PIECE "piece" diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi deleted file mode 100644 index c69dff3940cbb4d5bac81df84a56a8d834100ce8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3478 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 T>J=gGe+z(`T0<%?--`SP7rk>V