diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index 3d86de1a2b1..a0bb84e2e59 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -552,7 +552,7 @@ /datum/greyscale_config/heck_suit name = "H.E.C.K. Suit" - icon_file = 'icons/obj/clothing/suits.dmi' + icon_file = 'icons/obj/clothing/suits/armor.dmi' json_config = 'code/datums/greyscale/json_configs/heck_suit.json' /datum/greyscale_config/heck_suit/worn @@ -732,7 +732,7 @@ /datum/greyscale_config/sweater name = "Sweater" - icon_file = 'icons/obj/clothing/suits.dmi' + icon_file = 'icons/obj/clothing/suits/jacket.dmi' json_config = 'code/datums/greyscale/json_configs/sweater.json' /datum/greyscale_config/sweater_worn @@ -742,7 +742,7 @@ /datum/greyscale_config/jacket_oversized name = "Oversized Jacket" - icon_file = 'icons/obj/clothing/suits.dmi' + icon_file = 'icons/obj/clothing/suits/jacket.dmi' json_config = 'code/datums/greyscale/json_configs/jacket_oversized.json' /datum/greyscale_config/jacket_oversized_worn @@ -782,7 +782,7 @@ /datum/greyscale_config/football_armor name = "Football Armor" - icon_file = 'icons/obj/clothing/suits.dmi' + icon_file = 'icons/obj/clothing/suits/costume.dmi' json_config = 'code/datums/greyscale/json_configs/football_armor.json' /datum/greyscale_config/football_armor_worn @@ -812,7 +812,7 @@ /datum/greyscale_config/fancy_coat name = "Fancy Coat" - icon_file = 'icons/obj/clothing/suits.dmi' + icon_file = 'icons/obj/clothing/suits/jacket.dmi' json_config = 'code/datums/greyscale/json_configs/fancy_coat.json' /datum/greyscale_config/fancy_coat_worn diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 1d5985d1e89..e05ec0fcf06 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -347,6 +347,7 @@ Striking a noncultist, however, will tear their flesh."} name = "ancient cultist robes" desc = "A ragged, dusty set of robes. Strange letters line the inside." icon_state = "cultrobes" + icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "cultrobes" body_parts_covered = CHEST|GROIN|LEGS|ARMS @@ -394,6 +395,7 @@ Striking a noncultist, however, will tear their flesh."} name = "magus robes" desc = "A set of armored robes worn by the followers of Nar'Sie." icon_state = "magusred" + icon = 'icons/obj/clothing/suits/wizard.dmi' worn_icon = 'icons/mob/clothing/suits/wizard.dmi' inhand_icon_state = "magusred" body_parts_covered = CHEST|GROIN|LEGS|ARMS diff --git a/code/modules/antagonists/cult/cult_structure_forge.dm b/code/modules/antagonists/cult/cult_structure_forge.dm index bdc14ed64cf..39ac15da5ee 100644 --- a/code/modules/antagonists/cult/cult_structure_forge.dm +++ b/code/modules/antagonists/cult/cult_structure_forge.dm @@ -16,11 +16,11 @@ /obj/structure/destructible/cult/item_dispenser/forge/setup_options() var/static/list/forge_items = list( NARSIE_ARMOR = list( - PREVIEW_IMAGE = image(icon = 'icons/obj/clothing/suits.dmi', icon_state = "cult_armor"), + PREVIEW_IMAGE = image(icon = 'icons/obj/clothing/suits/armor.dmi', icon_state = "cult_armor"), OUTPUT_ITEMS = list(/obj/item/clothing/suit/hooded/cultrobes/hardened), ), FLAGELLANT_ARMOR = list( - PREVIEW_IMAGE = image(icon = 'icons/obj/clothing/suits.dmi', icon_state = "cultrobes"), + PREVIEW_IMAGE = image(icon = 'icons/obj/clothing/suits/armor.dmi', icon_state = "cultrobes"), OUTPUT_ITEMS = list(/obj/item/clothing/suit/hooded/cultrobes/berserker), ), ELDRITCH_SWORD = list( diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 2dc205a85f8..67b186c02d7 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -407,6 +407,7 @@ name = "armor" desc = "A slim armored vest that protects against most types of damage." icon_state = "armor" + icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "armor" blood_overlay_type = "armor" diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index fb9b358d09b..7fe69348d99 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -26,6 +26,7 @@ name = "space suit" desc = "A suit that protects against low pressure environments. Has a big 13 on the back." icon_state = "spaceold" + icon = 'icons/obj/clothing/suits/spacesuit.dmi' worn_icon = 'icons/mob/clothing/suits/spacesuit.dmi' inhand_icon_state = "s_suit" w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/clothing/spacesuits/santa.dm b/code/modules/clothing/spacesuits/santa.dm index f824fc530d8..c67b2e5d745 100644 --- a/code/modules/clothing/spacesuits/santa.dm +++ b/code/modules/clothing/spacesuits/santa.dm @@ -10,6 +10,7 @@ name = "Santa's suit" desc = "Festive!" icon_state = "santa" + icon = 'icons/obj/clothing/suits/wizard.dmi' worn_icon = 'icons/mob/clothing/suits/wizard.dmi' inhand_icon_state = "santa" slowdown = 0 diff --git a/code/modules/clothing/spacesuits/specialops.dm b/code/modules/clothing/spacesuits/specialops.dm index 9f1a1455913..bc6e081ff7c 100644 --- a/code/modules/clothing/spacesuits/specialops.dm +++ b/code/modules/clothing/spacesuits/specialops.dm @@ -16,6 +16,7 @@ name = "CentCom officer's coat" desc = "An armored, space-proof coat used in special operations." icon_state = "centcom_coat" + icon = 'icons/obj/clothing/suits/jacket.dmi' worn_icon = 'icons/mob/clothing/suits/jacket.dmi' inhand_icon_state = "centcom" blood_overlay_type = "coat" diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index 5d65dfb19e4..26af272fae2 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -1,5 +1,5 @@ /obj/item/clothing/suit - icon = 'icons/obj/clothing/suits.dmi' + icon = 'icons/obj/clothing/suits/default.dmi' name = "suit" var/fire_resist = T0C+100 allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) diff --git a/code/modules/clothing/suits/ablativecoat.dm b/code/modules/clothing/suits/ablativecoat.dm index 4889291c206..9db23eb3a00 100644 --- a/code/modules/clothing/suits/ablativecoat.dm +++ b/code/modules/clothing/suits/ablativecoat.dm @@ -15,6 +15,7 @@ /obj/item/clothing/suit/hooded/ablative name = "ablative trenchcoat" desc = "Experimental trenchcoat specially crafted to reflect and absorb laser and disabler shots. Don't expect it to do all that much against an axe or a shotgun, however." + icon = 'icons/obj/clothing/suits/armor.dmi' icon_state = "ablativecoat" worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "ablativecoat" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 143c354f892..b1fd9b7a252 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -1,4 +1,5 @@ /obj/item/clothing/suit/armor + icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' allowed = null body_parts_covered = CHEST diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 07b69a48fd4..72d6b7b3446 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -12,6 +12,7 @@ /obj/item/clothing/suit/bio_suit name = "bio suit" desc = "A suit that protects against biological contamination." + icon = 'icons/obj/clothing/suits/bio.dmi' icon_state = "bio" worn_icon = 'icons/mob/clothing/suits/bio.dmi' inhand_icon_state = "bio_suit" @@ -33,7 +34,6 @@ /obj/item/clothing/suit/bio_suit/general icon_state = "bio" - //Virology biosuit, green stripe /obj/item/clothing/head/bio_hood/virology icon_state = "bio_virology" @@ -41,7 +41,6 @@ /obj/item/clothing/suit/bio_suit/virology icon_state = "bio_virology" - //Security biosuit, grey with red stripe across the chest /obj/item/clothing/head/bio_hood/security armor = list(MELEE = 25, BULLET = 15, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 100, FIRE = 30, ACID = 100) diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm index e3f0fd18e9e..c6acf66d02c 100644 --- a/code/modules/clothing/suits/chaplainsuits.dm +++ b/code/modules/clothing/suits/chaplainsuits.dm @@ -2,6 +2,7 @@ //If any new staple chaplain items get added, put them in these lists /obj/item/clothing/suit/chaplainsuit allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + icon = 'icons/obj/clothing/suits/chaplain.dmi' worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' /obj/item/clothing/suit/chaplainsuit/armor @@ -59,6 +60,7 @@ name = "monk's habit" desc = "A few steps above rended sackcloth." icon_state = "monkfrock" + icon = 'icons/obj/clothing/suits/chaplain.dmi' worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' inhand_icon_state = "monkfrock" body_parts_covered = CHEST|GROIN|LEGS|ARMS @@ -198,6 +200,7 @@ name = "follower hoodie" desc = "Hoodie made for acolytes of the chaplain." icon_state = "chaplain_hoodie" + icon = 'icons/obj/clothing/suits/chaplain.dmi' worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' inhand_icon_state = "chaplain_hoodie" body_parts_covered = CHEST|GROIN|LEGS|ARMS diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index b736aee0ca9..279af812448 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -1,10 +1,12 @@ /obj/item/clothing/suit/costume + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' /obj/item/clothing/suit/hooded/flashsuit name = "flashy costume" desc = "What did you expect?" icon_state = "flashsuit" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "armor" body_parts_covered = CHEST|GROIN @@ -90,6 +92,7 @@ /obj/item/clothing/suit/syndicatefake name = "black and red space suit replica" icon_state = "syndicate-black-red" + icon = 'icons/obj/clothing/suits/spacesuit.dmi' worn_icon = 'icons/mob/clothing/suits/spacesuit.dmi' inhand_icon_state = "syndicate-black-red" body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET @@ -136,6 +139,7 @@ name = "owl cloak" desc = "A soft brown cloak made of synthetic feathers. Soft to the touch, stylish, and a 2 meter wing span that will drive the ladies mad." icon_state = "owl_wings" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "owl_wings" toggle_noun = "wings" @@ -228,6 +232,7 @@ name = "carp costume" desc = "A costume made from 'synthetic' carp scales, it smells." icon_state = "carp_casual" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET @@ -300,6 +305,7 @@ name = "corgi costume" desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs." icon_state = "ian" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET @@ -322,6 +328,7 @@ name = "bee costume" desc = "Bee the true Queen!" icon_state = "bee" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS @@ -341,6 +348,7 @@ name = "bloated human suit" desc = "A horribly bloated suit made from human skins." icon_state = "lingspacesuit" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET @@ -437,7 +445,6 @@ /obj/item/clothing/suit/costume/bronze name = "bronze suit" desc = "A big and clanky suit made of bronze that offers no protection and looks very unfashionable. Nice." - icon = 'icons/obj/clothing/suits.dmi' icon_state = "clockwork_cuirass_old" armor = list(MELEE = 5, BULLET = 0, LASER = -5, ENERGY = -15, BOMB = 10, BIO = 0, FIRE = 20, ACID = 20) @@ -445,6 +452,7 @@ name = "mystic's robe" desc = "Wearing this makes you feel more attuned with the nature of the universe... as well as a bit more irresponsible. " icon_state = "mysticrobe" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "mysticrobe" body_parts_covered = CHEST|GROIN|LEGS|ARMS @@ -464,6 +472,7 @@ name = "coordinator jacket" desc = "A jacket for a party ooordinator, stylish!." icon_state = "capformal" + icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "capspacesuit" armor = list(MELEE = 25, BULLET = 15, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50) diff --git a/code/modules/clothing/suits/jacket.dm b/code/modules/clothing/suits/jacket.dm index af22756a06a..f5a910d47c8 100644 --- a/code/modules/clothing/suits/jacket.dm +++ b/code/modules/clothing/suits/jacket.dm @@ -1,4 +1,5 @@ /obj/item/clothing/suit/jacket + icon = 'icons/obj/clothing/suits/jacket.dmi' worn_icon = 'icons/mob/clothing/suits/jacket.dmi' allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio) body_parts_covered = CHEST|GROIN|ARMS @@ -10,6 +11,7 @@ name = "sweater jacket" desc = "A sweater jacket." icon_state = "sweater" + icon = 'icons/obj/clothing/suits/jacket.dmi' worn_icon = 'icons/mob/clothing/suits/jacket.dmi' greyscale_config = /datum/greyscale_config/sweater greyscale_config_worn = /datum/greyscale_config/sweater_worn diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index b467bf17a66..51ccc428996 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -7,6 +7,7 @@ name = "apron" desc = "A basic blue apron." icon_state = "apron" + icon = 'icons/obj/clothing/suits/utility.dmi' worn_icon = 'icons/mob/clothing/suits/utility.dmi' inhand_icon_state = "apron" blood_overlay_type = "armor" @@ -36,6 +37,7 @@ name = "chef's apron" desc = "An apron-jacket used by a high class chef." icon_state = "chef" + icon = 'icons/obj/clothing/suits/jacket.dmi' worn_icon = 'icons/mob/clothing/suits/jacket.dmi' inhand_icon_state = "chef" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, FIRE = 0, ACID = 0) @@ -99,6 +101,7 @@ name = "hazard vest" desc = "A high-visibility vest used in work zones." icon_state = "hazard" + icon = 'icons/obj/clothing/suits/utility.dmi' worn_icon = 'icons/mob/clothing/suits/utility.dmi' inhand_icon_state = "hazard" blood_overlay_type = "armor" @@ -116,6 +119,7 @@ name = "blue suit jacket" desc = "A snappy dress jacket." icon_state = "suitjacket_blue" + icon = 'icons/obj/clothing/suits/jacket.dmi' worn_icon = 'icons/mob/clothing/suits/jacket.dmi' inhand_icon_state = "suitjacket_blue" blood_overlay_type = "coat" @@ -234,6 +238,7 @@ name = "techpriest robes" desc = "For those who REALLY love their toasters." icon_state = "techpriest" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "techpriest" body_parts_covered = CHEST|GROIN|LEGS|ARMS diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 39b5f83c37e..e09686629ed 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -2,6 +2,7 @@ name = "labcoat" desc = "A suit that protects against minor chemical spills." icon_state = "labcoat" + icon = 'icons/obj/clothing/suits/labcoat.dmi' worn_icon = 'icons/mob/clothing/suits/labcoat.dmi' inhand_icon_state = "labcoat" blood_overlay_type = "coat" diff --git a/code/modules/clothing/suits/lasertag.dm b/code/modules/clothing/suits/lasertag.dm index 95b281a776b..9af3e48923e 100644 --- a/code/modules/clothing/suits/lasertag.dm +++ b/code/modules/clothing/suits/lasertag.dm @@ -2,6 +2,7 @@ name = "blue laser tag armor" desc = "A piece of plastic armor. It has sensors that react to red light." //Lasers are concentrated light icon_state = "bluetag" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "bluetag" blood_overlay_type = "armor" @@ -13,6 +14,7 @@ name = "red laser tag armor" desc = "A piece of plastic armor. It has sensors that react to blue light." icon_state = "redtag" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "redtag" blood_overlay_type = "armor" diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index 82b8fd22a2d..157eb996d82 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -2,7 +2,7 @@ name = "reactive armour shell" desc = "An experimental suit of armour, awaiting installation of an anomaly core." icon_state = "reactiveoff" - icon = 'icons/obj/clothing/suits.dmi' + icon = 'icons/obj/clothing/suits/armor.dmi' w_class = WEIGHT_CLASS_BULKY /obj/item/reactive_armour_shell/attackby(obj/item/weapon, mob/user, params) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index ed07d5c0773..ab21f118096 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -10,6 +10,7 @@ */ /obj/item/clothing/suit/utility + icon = 'icons/obj/clothing/suits/utility.dmi' worn_icon = 'icons/mob/clothing/suits/utility.dmi' /obj/item/clothing/suit/utility/fire diff --git a/code/modules/clothing/suits/wetfloor.dm b/code/modules/clothing/suits/wetfloor.dm index 3a04e90cec0..d5448b185be 100644 --- a/code/modules/clothing/suits/wetfloor.dm +++ b/code/modules/clothing/suits/wetfloor.dm @@ -1,6 +1,7 @@ /obj/item/clothing/suit/caution name = "wet floor sign" desc = "Caution! Wet Floor!" + icon = 'icons/obj/clothing/suits/utility.dmi' icon_state = "caution" worn_icon = 'icons/mob/clothing/suits/utility.dmi' lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 5c4095d5ab3..5e8a66fd8d9 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -58,6 +58,7 @@ /obj/item/clothing/suit/wizrobe name = "wizard robe" desc = "A magnificent, gem-lined robe that seems to radiate power." + icon = 'icons/obj/clothing/suits/wizard.dmi' icon_state = "wizard" worn_icon = 'icons/mob/clothing/suits/wizard.dmi' inhand_icon_state = "wizrobe" diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 34b300102e9..e1155650225 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -69,6 +69,7 @@ name = "Easter Bunny Suit" desc = "Hop Hop Hop!" icon_state = "bunnysuit" + icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "bunnysuit" slowdown = -0.3 diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index c1a54a3caba..2610bf8d55a 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -3,6 +3,7 @@ name = "explorer suit" desc = "An armoured suit for exploring harsh environments." icon_state = "explorer" + icon = 'icons/obj/clothing/suits/utility.dmi' worn_icon = 'icons/mob/clothing/suits/utility.dmi' inhand_icon_state = "explorer" body_parts_covered = CHEST|GROIN|LEGS|ARMS @@ -70,6 +71,7 @@ adjustmask() /obj/item/clothing/suit/hooded/cloak + icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' /obj/item/clothing/suit/hooded/cloak/goliath diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index f7926270162..61286e1d539 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -594,6 +594,7 @@ name = "berserker armor" desc = "Voices echo from the armor, driving the user insane. Is not space-proof." icon_state = "berserker" + icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' hoodtype = /obj/item/clothing/head/hooded/berserker armor = list(MELEE = 30, BULLET = 30, LASER = 10, ENERGY = 20, BOMB = 50, BIO = 0, FIRE = 100, ACID = 100) diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index 30b305a7bab..ed92bfed62a 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -129,6 +129,7 @@ Slimecrossing Armor name = "adamantine armor" desc = "A full suit of adamantine plate armor. Impressively resistant to damage, but weighs about as much as you do." icon_state = "adamsuit" + icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "adamsuit" flags_inv = NONE diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi deleted file mode 100644 index 91c3832d317..00000000000 Binary files a/icons/obj/clothing/suits.dmi and /dev/null differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi new file mode 100644 index 00000000000..c865a0f2280 Binary files /dev/null and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/clothing/suits/bio.dmi b/icons/obj/clothing/suits/bio.dmi new file mode 100644 index 00000000000..81d1a85a6fd Binary files /dev/null and b/icons/obj/clothing/suits/bio.dmi differ diff --git a/icons/obj/clothing/suits/chaplain.dmi b/icons/obj/clothing/suits/chaplain.dmi new file mode 100644 index 00000000000..9b049328af3 Binary files /dev/null and b/icons/obj/clothing/suits/chaplain.dmi differ diff --git a/icons/obj/clothing/suits/costume.dmi b/icons/obj/clothing/suits/costume.dmi new file mode 100644 index 00000000000..bb7342f35b3 Binary files /dev/null and b/icons/obj/clothing/suits/costume.dmi differ diff --git a/icons/obj/clothing/suits/default.dmi b/icons/obj/clothing/suits/default.dmi new file mode 100644 index 00000000000..6c781a70ad1 Binary files /dev/null and b/icons/obj/clothing/suits/default.dmi differ diff --git a/icons/obj/clothing/suits/jacket.dmi b/icons/obj/clothing/suits/jacket.dmi new file mode 100644 index 00000000000..6f4a6e01ec2 Binary files /dev/null and b/icons/obj/clothing/suits/jacket.dmi differ diff --git a/icons/obj/clothing/suits/labcoat.dmi b/icons/obj/clothing/suits/labcoat.dmi new file mode 100644 index 00000000000..b2cb4b716f7 Binary files /dev/null and b/icons/obj/clothing/suits/labcoat.dmi differ diff --git a/icons/obj/clothing/suits/spacesuit.dmi b/icons/obj/clothing/suits/spacesuit.dmi new file mode 100644 index 00000000000..43157ee3bd6 Binary files /dev/null and b/icons/obj/clothing/suits/spacesuit.dmi differ diff --git a/icons/obj/clothing/suits/utility.dmi b/icons/obj/clothing/suits/utility.dmi new file mode 100644 index 00000000000..4e465fdd42a Binary files /dev/null and b/icons/obj/clothing/suits/utility.dmi differ diff --git a/icons/obj/clothing/suits/wizard.dmi b/icons/obj/clothing/suits/wizard.dmi new file mode 100644 index 00000000000..9c2b4eee179 Binary files /dev/null and b/icons/obj/clothing/suits/wizard.dmi differ