diff --git a/code/citadel/custom_loadout/custom_items.dm b/code/citadel/custom_loadout/custom_items.dm index 44f672e653..571de55056 100644 --- a/code/citadel/custom_loadout/custom_items.dm +++ b/code/citadel/custom_loadout/custom_items.dm @@ -16,17 +16,20 @@ /obj/item/clothing/neck/cloak/inferno name = "Kiara's Cloak" desc = "The design on this seems a little too familiar." - icon = 'icons/obj/clothing/cloaks.dmi' + icon = 'icons/obj/custom.dmi' icon_state = "infcloak" - item_state = "infcloak" + icon_override = 'icons/obj/custom.dmi' + item_state = "infcloak-w" w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|GROIN|LEGS|ARMS /obj/item/clothing/neck/petcollar/inferno 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" - item_state = "infcollar" + icon_override = 'icons/obj/custom.dmi' + item_state = "infcollar-w" item_color = null tagname = null @@ -43,7 +46,7 @@ /obj/item/lighter/gold name = "\improper Engraved Zippo" desc = "A shiny and relatively expensive zippo lighter. There's a small etched in verse on the bottom that reads, 'No Gods, No Masters, Only Man.'" - icon = 'icons/obj/cigarettes.dmi' + icon = 'icons/obj/custom.dmi' icon_state = "gold_zippo" item_state = "gold_zippo" w_class = WEIGHT_CLASS_TINY @@ -58,16 +61,20 @@ /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" desc = "A fashionable collar" - item_color = "zombscarf" + icon_override = 'icons/obj/custom.dmi' + item_color = "zombscarf-w" dog_fashion = /datum/dog_fashion/head /obj/item/clothing/suit/toggle/labcoat/mad/red name = "\improper The Mad's labcoat" desc = "An oddly special looking coat." + icon = 'icons/obj/custom.dmi' icon_state = "labred" - item_state = "labred" + icon_override = 'icons/obj/custom.dmi' + item_state = "labred-w" /*PLACEHOLDER*/ @@ -86,17 +93,17 @@ /obj/item/clothing/neck/cloak/carrot name = "carrot cloak" desc = "A cloak in the shape and color of a carrot!" - icon = 'icons/obj/clothing/cloaks.dmi' - icon_override = 'icons/mob/citadel/suit.dmi' + icon = 'icons/obj/custom.dmi' + icon_override = 'icons/obj/custom.dmi' icon_state = "carrotcloak" - item_state = "carrotcloak" + item_state = "carrotcloak-w" w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|GROIN|LEGS|ARMS /obj/item/toy/plush/tree name = "christmass tree plushie" desc = "A festive plush that squeeks when you squeeze it!" - icon = 'icons/obj/plushes.dmi' + icon = 'icons/obj/custom.dmi' icon_state = "pine_c" item_state = "pine_c" w_class = WEIGHT_CLASS_SMALL @@ -109,9 +116,10 @@ /obj/item/clothing/mask/luchador/zigfie name = "Alboroto Rosa mask" - icon = 'icons/mob/mask.dmi' + icon = 'icons/obj/custom.dmi' icon_state = "lucharzigfie" - item_state = "lucharzigfie" + icon_override = 'icons/obj/custom.dmi' + item_state = "lucharzigfie-w" /*PLACEHOLDER*/ @@ -149,8 +157,10 @@ /obj/item/clothing/suit/trenchcoat/green 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" - item_state = "hos-g" + icon_override = 'icons/obj/custom.dmi' + item_state = "hos-g-w" body_parts_covered = CHEST|GROIN|ARMS|LEGS @@ -160,13 +170,14 @@ desc = "Every good russian spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go." icon = 'icons/obj/custom.dmi' icon_state = "russianflask" - item_state = "russianflask" volume = 60 /obj/item/clothing/mask/gas/stalker name = "S.T.A.L.K.E.R. mask" desc = "Smells like reactor four." - item_state = "stalker" + icon = 'icons/obj/custom.dmi' + item_state = "stalker-w" + icon_override = 'icons/obj/custom.dmi' icon_state = "stalker" @@ -176,7 +187,8 @@ desc = "It's a collar..." icon = 'icons/obj/custom.dmi' icon_state = "petcollar-stripe" - item_color = "petcollar-stripe" + icon_override = 'icons/obj/custom.dmi' + item_state = "petcollar-stripe-w" tagname = null @@ -184,17 +196,21 @@ /obj/item/clothing/under/singery/custom name = "bluish performer's outfit" desc = "Just looking at this makes you want to sing." - icon_state = "ssing" - item_state = "ssing" - item_color = "ssing" + icon = 'icons/obj/custom.dmi' + icon_state = "singer" + icon_override = 'icons/obj/custom.dmi' + item_state = "singer-w" + item_color = "singer" fitted = NO_FEMALE_UNIFORM alternate_worn_layer = ABOVE_SHOES_LAYER can_adjust = 0 /obj/item/clothing/shoes/sneakers/pink + icon = 'icons/obj/custom.dmi' icon_state = "pink" - item_state = "pink" + icon_override = 'icons/obj/custom.dmi' + item_state = "pink-w" diff --git a/icons/effects/vanguard_target.dmi b/icons/effects/vanguard_target.dmi index 73ba014e2d..5220c325e5 100644 Binary files a/icons/effects/vanguard_target.dmi and b/icons/effects/vanguard_target.dmi differ diff --git a/icons/emoji.dmi b/icons/emoji.dmi index 9d3e0630a7..b0434f431f 100644 Binary files a/icons/emoji.dmi and b/icons/emoji.dmi differ diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi index 0255204f60..3a7b0648fd 100644 Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index de8587dba5..2eab8fa78e 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 89eb9dbcbc..3aa655b574 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 0cdee31ae1..70988dbef5 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 38c89769d2..76adebdc11 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index c14fbb3fb2..a12053ae1d 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 3854f252eb..e83588d5ed 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/neck.dmi b/icons/mob/neck.dmi index 17f9d3ade4..59635b8c7d 100644 Binary files a/icons/mob/neck.dmi and b/icons/mob/neck.dmi differ diff --git a/icons/mob/screen_full.dmi b/icons/mob/screen_full.dmi index 988bf59592..502e9ad3f9 100644 Binary files a/icons/mob/screen_full.dmi and b/icons/mob/screen_full.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index c251b93f2e..241db46d08 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi index 17dc5b8fb2..d492ae52f6 100644 Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.dmi differ diff --git a/icons/obj/bloodpack.dmi b/icons/obj/bloodpack.dmi index 423b5bb641..ac879aa33c 100644 Binary files a/icons/obj/bloodpack.dmi and b/icons/obj/bloodpack.dmi differ diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index ed8f37c4da..76ac7bd0a8 100644 Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index 4c3c0fe5ce..63c036ce14 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/cloaks.dmi b/icons/obj/clothing/cloaks.dmi index 993c037a05..dd1ae7d727 100644 Binary files a/icons/obj/clothing/cloaks.dmi and b/icons/obj/clothing/cloaks.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 48f37887cf..6c193f1044 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 6ec16c836f..2a6d2004b3 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 786a8c7fd0..b1d7a7106d 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index c41db68326..0f3668ce10 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 2cf675c571..77b62691d2 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index d0326b1141..f44fc29f7c 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi index cca6f3fa79..702372fe13 100644 Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 0669549b02..31e700d23d 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 876f747fc1..88aa6f7985 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/flora/_flora.dmi b/icons/obj/flora/_flora.dmi new file mode 100644 index 0000000000..d3e800576e Binary files /dev/null and b/icons/obj/flora/_flora.dmi differ diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi index 7d413895ca..7f4d65e081 100644 Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi index ad5f8bc863..3d125d68c7 100644 Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 636d895450..0f56fcac9a 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 2048725e56..776bf7a9ec 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 75b1241840..866b3f4f92 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/icons/obj/machines/research.dmi b/icons/obj/machines/research.dmi index cd74eed322..a150880d39 100644 Binary files a/icons/obj/machines/research.dmi and b/icons/obj/machines/research.dmi differ diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index 5404b908c6..241bb46b98 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index 7eec51e46e..f0eb817549 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index f563af642f..dadf843041 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 18bbcb3610..d18a1bf262 100755 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index c7b9bbcdc8..8fe7c73683 100644 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ