From 0fc1837c3a30c632048c63abc6ebffe880faf811 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 4 Dec 2017 20:23:15 -0500 Subject: [PATCH] standardizes wearable donor icon names, fixes recent donor items not rendering properly --- code/citadel/custom_loadout/custom_items.dm | 36 ++++++++++---------- icons/obj/custom.dmi | Bin 23648 -> 23647 bytes 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/code/citadel/custom_loadout/custom_items.dm b/code/citadel/custom_loadout/custom_items.dm index b0a881c433..2c18198344 100644 --- a/code/citadel/custom_loadout/custom_items.dm +++ b/code/citadel/custom_loadout/custom_items.dm @@ -17,7 +17,7 @@ name = "Kiara's Cloak" desc = "The design on this seems a little too familiar." icon = 'icons/obj/custom.dmi' - icon_state = "infcloak" + icon_state = "infcloak-i" icon_override = 'icons/obj/custom.dmi' item_state = "infcloak-w" w_class = WEIGHT_CLASS_SMALL @@ -27,7 +27,7 @@ name = "Kiara's Collar" desc = "A soft black collar that seems to stretch to fit whoever wears it." icon = 'icons/obj/custom.dmi' - icon_state = "infcollar" + icon_state = "infcollar-i" icon_override = 'icons/obj/custom.dmi' item_state = "infcollar-w" item_color = null @@ -62,7 +62,7 @@ /obj/item/clothing/neck/scarf/zomb //Default white color, same functionality as beanies. name = "A special scarf" icon = 'icons/obj/custom.dmi' - icon_state = "zombscarf" + icon_state = "zombscarf-i" desc = "A fashionable collar" icon_override = 'icons/obj/custom.dmi' item_color = "zombscarf-w" @@ -72,7 +72,7 @@ name = "\improper The Mad's labcoat" desc = "An oddly special looking coat." icon = 'icons/obj/custom.dmi' - icon_state = "labred" + icon_state = "labred-i" icon_override = 'icons/obj/custom.dmi' item_state = "labred-w" @@ -95,7 +95,7 @@ desc = "A cloak in the shape and color of a carrot!" icon = 'icons/obj/custom.dmi' icon_override = 'icons/obj/custom.dmi' - icon_state = "carrotcloak" + icon_state = "carrotcloak-i" item_state = "carrotcloak-w" w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|GROIN|LEGS|ARMS @@ -115,9 +115,9 @@ name = "Celebratory Cloak of Morozko" desc = " It probably will protect from snow, charcoal or elves." icon = 'icons/obj/custom.dmi' - icon_state = "festive-w" - item_state = "festive-i" - icon = 'icons/obj/custom.dmi' + icon_state = "festive-i" + item_state = "festive-w" + icon_override = 'icons/obj/custom.dmi' w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|GROIN|LEGS|ARMS @@ -127,7 +127,7 @@ /obj/item/clothing/mask/luchador/zigfie name = "Alboroto Rosa mask" icon = 'icons/obj/custom.dmi' - icon_state = "lucharzigfie" + icon_state = "lucharzigfie-i" icon_override = 'icons/obj/custom.dmi' item_state = "lucharzigfie-w" @@ -168,7 +168,7 @@ name = "Reece's Great Coat" desc = "You would swear this was in your nightmares after eating too many veggies." icon = 'icons/obj/custom.dmi' - icon_state = "hos-g" + icon_state = "hos-g-i" icon_override = 'icons/obj/custom.dmi' item_state = "hos-g-w" body_parts_covered = CHEST|GROIN|ARMS|LEGS @@ -188,7 +188,7 @@ icon = 'icons/obj/custom.dmi' item_state = "stalker-w" icon_override = 'icons/obj/custom.dmi' - icon_state = "stalker" + icon_state = "stalker-i" /*Sylas*/ @@ -196,7 +196,7 @@ name = "collar" desc = "It's a collar..." icon = 'icons/obj/custom.dmi' - icon_state = "petcollar-stripe" + icon_state = "petcollar-stripe-i" icon_override = 'icons/obj/custom.dmi' item_state = "petcollar-stripe-w" tagname = null @@ -207,10 +207,10 @@ name = "bluish performer's outfit" desc = "Just looking at this makes you want to sing." icon = 'icons/obj/custom.dmi' - icon_state = "singer" + icon_state = "singer-i" icon_override = 'icons/obj/custom.dmi' item_state = "singer-w" - item_color = "singer" + item_color = "singer-i" fitted = NO_FEMALE_UNIFORM alternate_worn_layer = ABOVE_SHOES_LAYER can_adjust = 0 @@ -218,7 +218,7 @@ /obj/item/clothing/shoes/sneakers/pink icon = 'icons/obj/custom.dmi' - icon_state = "pink" + icon_state = "pink-i" icon_override = 'icons/obj/custom.dmi' item_state = "pink-w" @@ -228,10 +228,10 @@ /obj/item/clothing/suit/vermillion name = "vermillion clothing" desc = "Some clothing." - icon_state = "vermillion-w" - item_state = "vermillion-i" + icon_state = "vermillion-i" + item_state = "vermillion-w" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS - icon = 'icons/obj/custom.dmi' + icon_override = 'icons/obj/custom.dmi' diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi index 0dbaa4c9809e906d0376d6bcfad725491b51c932..6c1dabef232d21ea0c2a6966235a2bda43aba8ba 100644 GIT binary patch delta 343 zcmV-d0jU1qxB=g|0gxnrK6+GGbVOxyV{&P5bZKvH004NLmD9m)!Y~X5;B)g77F;P> zH?F-*pos&#LKRZCwHlJj39ZJ{?@%$A1d4ZSr7wSNr(VM6?rVR9?P0G*O2gojQ@zv5yXShNvKp=ah7yWZu_{(iTTNf!eS|V=z3v6{ae`@W zFQ(IcrM4l-AN_|(rw8BpkhfwdSSWI$ru2!i&ZjCSzkH)oD5?=FlV0C>DbslkhDf7i p+Bccb9FfmtEqN!1eZVi1m#{l-VSCuCAGDOTHh2!SJhN;8^jhG$rEmZM delta 344 zcmV-e0jK`oxB=j}0gxnrKYCPHbVOxyV{&P5bZKvH004NLmD9~`!Y~X6@N@GN7F_AH zZd`krKobXeh03IEYc(X56F}qXcR+j`nBv`9=@-ZTE1tvG`g^m3)plb}B$0!M8kTSG zrZ{t(2B_il!xRH?KcwqVOqd92m|5B%XQpUbBGgcsq7yvO_4|&0H!ZXc^r|qN&KfS3&ljbpb~uy$+VQmvGoei_$5q zMUjxST}-JwTOo0rQXeDZ8w7 zM?0WgxbHasil4DcBJLr?ve&x&3b9v=gL|R2JU1zO>y0X*rax+IeqGu3immP_CO&CW qzDds3JdqsOISyV?_6h%4c@FE{3Rc^V`2{jyt;7ijbHKA}0rXlJho!;*