From 235e09d2b99cf7d7cbb6c1e9df36fca98f26c06d Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sun, 1 Sep 2013 13:24:38 +0100 Subject: [PATCH] Changed icon path for custom items due to compile times. --- code/game/mecha/equipment/tools/tools.dm | 2 +- code/modules/customitems/item_defines.dm | 160 +++++++++++------------ 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index a7936f1564..fd34b65baa 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -1064,7 +1064,7 @@ /obj/item/weapon/paintkit //Please don't use this for anything, it's a base type for custom mech paintjobs. name = "mecha customisation kit" desc = "A generic kit containing all the needed tools and parts to turn a mech into another mech." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "royce_kit" var/new_name = "mech" //What is the variant called? diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 42307b1708..94979fecd5 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1,9 +1,9 @@ // Add custom items you give to people here, and put their icons in custom_items.dmi -// Remember to change 'icon = 'custom_items.dmi'' for items not using /obj/item/fluff as a base +// Remember to change 'icon = 'icons/obj/custom_items.dmi'' for items not using /obj/item/fluff as a base // Clothing item_state doesn't use custom_items.dmi. Just add them to the normal clothing files. /obj/item/fluff // so that they don't spam up the object tree - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' w_class = 1.0 ////////////////////////////////// @@ -88,7 +88,7 @@ /obj/item/weapon/book/fluff/johnathan_falcian_1 name = "sketchbook" desc = "A small, well-used sketchbook." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "johnathan_notebook" dat = "In the notebook there are numerous drawings of various crew-mates, locations, and scenes on the ship. They are of fairly good quality." author = "Johnathan Falcian" @@ -101,7 +101,7 @@ /obj/item/weapon/folder/blue/fluff/matthew_riebhardt //Matthew Riebhardt - ZekeSulastin name = "academic journal" desc = "An academic journal, seemingly pertaining to medical genetics. This issue is for the second quarter of 2557. Paper flags demarcate some articles the owner finds interesting." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "matthewriebhardt" /obj/item/weapon/pen/fluff/multi //spaceman96: Trenna Seber @@ -111,19 +111,19 @@ /obj/item/weapon/pen/fluff/fancypen //orangebottle: Lillian Levett, Lilliana Reade name = "fancy pen" desc = "A fancy metal pen. It uses blue ink. An inscription on one side reads,\"L.L. - L.R.\"" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "fancypen" /obj/item/weapon/pen/fluff/eugene_bissegger_1 //metamorp: eugene bisseger name = "Gilded Pen" desc = "A golden pen that is gilded with a meager amount of gold material. The word 'NanoTrasen' is etched on the clip of the pen." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "eugene_pen" /obj/item/weapon/pen/fluff/fountainpen //paththegreat: Eli Stevens name = "Engraved Fountain Pen" desc = "An expensive looking pen with the initials E.S. engraved into the side." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "fountainpen" /obj/item/fluff/victor_kaminsky_1 //chinsky: Victor Kaminski @@ -154,46 +154,46 @@ /obj/item/weapon/soap/fluff/azare_siraj_1 //mister fox: Azare Siraj name = "S'randarr's Tongue Leaf" desc = "A waxy, scentless leaf." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "siraj_tongueleaf" item_state = "siraj_tongueleaf" /obj/item/weapon/clipboard/fluff/smallnote //lexusjjss: Lexus Langg, Zachary Tomlinson name = "small notebook" desc = "A generic small spiral notebook that flips upwards." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "smallnotetext" item_state = "smallnotetext" /obj/item/weapon/storage/fluff/maye_daye_1 //morrinn: Maye Day name = "pristine lunchbox" desc = "A pristine stainless steel lunch box. The initials M.D. are engraved on the inside of the lid." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "maye_daye_1" /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/william_hackett name = "handmade flask" desc = "A wooden flask with a silver lid and bottom. It has a matte, dark blue paint on it with the initials \"W.H.\" etched in black." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "williamhackett" /obj/item/weapon/storage/firstaid/fluff/asus_rose //Kerbal22 - Asus Rose name = "rugged medkit" desc = "A dinged up medkit, it seems to have seen quite a bit of use." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "asusrose" /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1 //leonheart11: Johann Erzatz name = "vintage thermos" desc = "An older thermos with a faint shine." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "johann_erzatz_1" volume = 50 /obj/item/weapon/lighter/zippo/fluff/li_matsuda_1 //mangled: Li Matsuda name = "blue zippo lighter" desc = "A zippo lighter made of some blue metal." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "bluezippo" icon_on = "bluezippoon" icon_off = "bluezippo" @@ -201,7 +201,7 @@ /obj/item/weapon/lighter/zippo/fluff/michael_guess_1 //Dragor23: Michael Guess name = "engraved lighter" desc = "A golden lighter, engraved with some ornaments and a G." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "guessip" icon_on = "guessipon" icon_off = "guessip" @@ -209,7 +209,7 @@ /obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1 //rawrtaicho: Riley Rohtin name = "Riley's black zippo" desc = "A black zippo lighter, which holds some form of sentimental value." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "blackzippo" icon_on = "blackzippoon" icon_off = "blackzippo" @@ -217,7 +217,7 @@ /obj/item/weapon/lighter/zippo/fluff/fay_sullivan_1 //furohman: Fay Sullivan name = "Graduation Lighter" desc = "A silver engraved lighter with 41 on one side and Tharsis University on the other. The lid reads Fay Sullivan, Cybernetic Engineering, 2541" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "gradzippo" icon_on = "gradzippoon" icon_off = "gradzippo" @@ -225,7 +225,7 @@ /obj/item/weapon/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke name = "Gonzo Fist zippo" desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "gonzozippo" icon_on = "gonzozippoon" icon_off = "gonzozippo" @@ -233,7 +233,7 @@ /obj/item/weapon/lighter/zippo/fluff/naples_1 //naples: Russell Vierson name = "Engraved zippo" desc = "A intricately engraved Zippo lighter." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "engravedzippo" icon_on = "engravedzippoon" icon_off = "engravedzippo" @@ -242,7 +242,7 @@ name = "purple comb" desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side." w_class = 1.0 - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "purplecomb" item_state = "purplecomb" @@ -255,12 +255,12 @@ /obj/item/weapon/fluff/hugo_cinderbacth_1 //thatoneguy: Hugo Cinderbatch name = "Old Cane" desc = "An old brown cane made from wood. It has a a large, itallicized H on it's handle." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "special_cane" /obj/item/device/camera/fluff/orange //chinsky: Summer Springfield name = "orange camera" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' desc = "A modified detective's camera, painted in bright orange. On the back you see \"Have fun\" written in small accurate letters with something black." icon_state = "orangecamera" icon_on = "orangecamera" @@ -269,7 +269,7 @@ /obj/item/device/camera/fluff/oldcamera //magmaram: Maria Crash name = "Old Camera" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' desc = "An old, slightly beat-up digital camera, with a cheap photo printer taped on. It's a nice shade of blue." icon_state = "oldcamera" icon_on = "oldcamera" @@ -280,26 +280,26 @@ name = "ID wallet" desc = "A wallet made of black leather, holding an ID and a gold badge that reads 'NT.' The ID has a small picture of a man, with the caption Reese James MacKenzie, with other pieces of information to the right of the picture." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "reesemackenzie" /obj/item/weapon/card/id/fluff/lifetime //fastler: Fastler Greay; it seemed like something multiple people would have name = "Lifetime ID Card" desc = "A modified ID card given only to those people who have devoted their lives to the better interests of NanoTrasen. It sparkles blue." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "lifetimeid" /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask //lexusjjss: Lexus Langg & Zachary Tomlinson name = "shiny flask" desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "shinyflask" volume = 50 /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/lithiumflask //mcgulliver: Wox Derax name = "Lithium Flask" desc = "A flask with a Lithium Atom symbol on it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "lithiumflask" volume = 50 @@ -314,7 +314,7 @@ /obj/item/weapon/reagent_containers/glass/beaker/fluff/eleanor_stone //Rkf45: Eleanor Stone name = "teapot" desc = "An elegant teapot. The engraving on the bottom reads 'ENS'" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "eleanorstone" item_state = "eleanorstone" @@ -348,7 +348,7 @@ /obj/item/clothing/mask/fluff/electriccig //CubeJackal: Barry Sharke name = "Electronic cigarette" desc = "An electronic cigarette. Most of the relief of a real cigarette with none of the side effects. Often used by smokers who are trying to quit the habit." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "cigon" throw_speed = 0.5 item_state = "ciglit" @@ -361,7 +361,7 @@ /obj/item/weapon/reagent_containers/hypospray/fluff/asher_spock_1 name = "strange penlight" desc = "Besides the coloring, this penlight looks rather normal and innocent. However, you get a nagging feeling whenever you see it..." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "asher_spock_1" amount_per_transfer_from_this = 5 volume = 15 @@ -414,27 +414,27 @@ /obj/item/weapon/card/id/fluff/asher_spock_2 //Nerezza: Asher Spock name = "Odysses Specialist ID card" desc = "A special identification card with a red cross signifying an emergency physician has specialised in Odysseus operations and maintenance.\nIt grants the owner recharge bay access." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "odysseus_spec_id" /obj/item/weapon/clipboard/fluff/mcreary_journal //sirribbot: James McReary name = "McReary's journal" desc = "A journal with a warning sticker on the front cover. The initials \"J.M.\" are written on the back." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "mcreary_journal" item_state = "mcreary_journal" /obj/item/device/flashlight/fluff/thejesster14_1 //thejesster14: Rosa Wolff name = "old red flashlight" desc = "A very old, childlike flashlight." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "wolfflight" item_state = "wolfflight" /obj/item/weapon/crowbar/fluff/zelda_creedy_1 //daaneesh: Zelda Creedy name = "Zelda's Crowbar" desc = "A pink crow bar that has an engraving that reads, 'To Zelda. Love always, Dawn'" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "zeldacrowbar" item_state = "crowbar" @@ -443,7 +443,7 @@ /obj/item/weapon/paintkit/fluff/butcher_royce_1 name = "Ripley customisation kit" desc = "A kit containing all the needed tools and parts to turn an APLU Ripley into a Titan's Fist worker mech." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "royce_kit" new_name = "APLU \"Titan's Fist\"" @@ -456,7 +456,7 @@ /obj/item/weapon/paintkit/fluff/sven_fjeltson_1 name = "Mercenary APLU kit" desc = "A kit containing all the needed tools and parts to turn an APLU Ripley into an old Mercenaries APLU." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "sven_kit" new_name = "APLU \"Strike the Earth!\"" @@ -482,7 +482,7 @@ /obj/item/clothing/gloves/fluff/walter_brooks_1 //botanistpower: Walter Brooks name = "mittens" desc = "A pair of well worn, blue mittens." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "walter_brooks_1" item_state = "bluegloves" color="blue" @@ -490,13 +490,13 @@ /obj/item/clothing/gloves/fluff/chal_appara_1 //furlucis: Chal Appara name = "Left Black Glove" desc = "The left one of a pair of black gloves. Wonder where the other one went..." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "chal_appara_1" /obj/item/clothing/gloves/fluff/ashley_rifler_1 //Vinceluk: Ashley Rifler name = "Purple Glove" desc = "A single, purple glove. Initials A.R. are written on the inside of it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "ashley_rifler_1" //////////// Eye Wear //////////// @@ -504,13 +504,13 @@ /obj/item/clothing/glasses/meson/fluff/book_berner_1 //asanadas: Book Berner name = "bespectacled mesonic surveyors" desc = "One of the older meson scanner models retrofitted to perform like its modern counterparts." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "book_berner_1" /obj/item/clothing/glasses/fluff/uzenwa_sissra_1 //sparklysheep: Uzenwa Sissra name = "Scanning Goggles" desc = "A very oddly shaped pair of goggles with bits of wire poking out the sides. A soft humming sound emanates from it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "uzenwa_sissra_1" ////// Medical eyepatch - Thysse Ezinwa - Jadepython @@ -522,7 +522,7 @@ /obj/item/clothing/glasses/fluff/arjun_chopra_1 name = "safety goggles" desc = "A used pair of leather safety goggles." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "arjun_chopra" item_state = "arjun_chopra" @@ -531,49 +531,49 @@ /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard name = "\improper SWAT hat" desc = "A black hat. The inside has the words, \"Lieutenant James Girard, LPD SWAT Team Four.\"" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "swatcap" /obj/item/clothing/head/welding/fluff/alice_mccrea_1 //madmalicemccrea: Alice McCrea name = "flame decal welding helmet" desc = "A welding helmet adorned with flame decals, and several cryptic slogans of varying degrees of legibility. \"Fly the Friendly Skies\" is clearly visible, written above the visor, for some reason." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "alice_mccrea_1" /obj/item/clothing/head/welding/fluff/yuki_matsuda_1 //searif: Yuki Matsuda name = "white decal welding helmet" desc = "A white welding helmet with a character written across it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "yuki_matsuda_1" /obj/item/clothing/head/welding/fluff/norah_briggs_1 //bountylord13: Norah Briggs name = "blue flame decal welding helmet" desc = "A welding helmet with blue flame decals on it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "norah_briggs_1" /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1 //themij: Taryn Kifer name = "orange bandana" desc = "Hey, I think we're missing a hazard vest..." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "taryn_kifer_1" /obj/item/clothing/head/fluff/edvin_telephosphor_1 //foolamancer: Edvin Telephosphor name = "Edvin's Hat" desc = "A hat specially tailored for Skrellian anatomy. It has a yellow badge on the front, with a large red 'T' inscribed on it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "edvin_telephosphor_1" /obj/item/clothing/head/fluff/krinnhat //Shirotyrant: Krinn Seeskale name = "saucepan hat" desc = "This hat is the shiniest shiny Krinn has ever owned." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "krinn_hat" /obj/item/clothing/head/fluff/bruce_hachert //Stup1dg33kz: Bruce Hachert name = "worn hat" desc = "A worn-looking hat. It is slightly faded in color." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "brucehachert" //////////// Suits //////////// @@ -581,19 +581,19 @@ /obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil //Robotics Labcoat - Aeneas Rinil [APPR] name = "Robotics labcoat" desc = "A labcoat with a few markings denoting it as the labcoat of roboticist." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "aeneasrinil_open" /obj/item/clothing/suit/storage/labcoat/fluff/pink //spaceman96: Trenna Seber name = "pink labcoat" desc = "A suit that protects against minor chemical spills. Has a pink stripe down from the shoulders." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_pink_open" /obj/item/clothing/suit/storage/det_suit/fluff/graycoat //vinceluk: Seth Sealis name = "gray coat" desc = "Old, worn out coat. It's seen better days." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "graycoat" item_state = "graycoat" color = "graycoat" @@ -601,7 +601,7 @@ /obj/item/clothing/suit/storage/det_suit/fluff/leatherjack //atomicdog92: Seth Sealis name = "leather jacket" desc = "A black leather coat, popular amongst punks, greasers, and other galactic scum." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "leatherjack" item_state = "leatherjack" color = "leatherjack" @@ -609,7 +609,7 @@ /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield //deusdactyl name = "blue shield security armor" desc = "An armored vest with the badge of a Blue Shield Security lieutenant." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "deus_blueshield" item_state = "deus_blueshield" @@ -626,7 +626,7 @@ /obj/item/clothing/under/fluff/milo_hachert //Field Dress Uniform - Milo Hachert - Commissar_Drew name = "field dress uniform" desc = "A uniform jacket, its buttons polished to a shine, coupled with a dark pair of trousers. 'Hachert' is embroidered upon the jacket’s shoulder bar." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "milohachert" item_state = "milohachert" color = "milohachert" @@ -634,7 +634,7 @@ /obj/item/clothing/under/fluff/jumpsuitdown //searif: Yuki Matsuda name = "rolled down jumpsuit" desc = "A rolled down jumpsuit. Great for mechanics." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "jumpsuitdown" item_state = "jumpsuitdown" color = "jumpsuitdown" @@ -642,7 +642,7 @@ /obj/item/clothing/under/fluff/lilith_vinous_1 //slyhidden: Lilith Vinous name = "casual security uniform" desc = "A less formal version of the traditional dark red Security uniform. It has the top button undone, rolled up sleeves and different belt." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "lilith_uniform" item_state = "lilith_uniform" color = "lilith_uniform" @@ -650,7 +650,7 @@ /obj/item/clothing/under/fluff/ana_issek_1 //suethecake: Ana Issek name = "retired uniform" desc = "A silken blouse paired with dark-colored slacks. It has the words 'Chief Investigator' embroidered into the shoulder bar." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "ana_uniform" item_state = "ana_uniform" color = "ana_uniform" @@ -658,7 +658,7 @@ /obj/item/clothing/under/fluff/olddressuniform //desiderium: Momiji Inubashiri name = "retired dress uniform" desc = "A retired Station Head of Staff uniform, phased out twenty years ago for the newer jumpsuit design, but still acceptable dress. Lovingly maintained." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "olddressuniform" item_state = "olddressuniform" color = "olddressuniform" @@ -666,14 +666,14 @@ /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1 //whitewolf41: Jeremy Wolf name = "worn officer's uniform" desc = "An old red security jumpsuit. Seems to have some slight modifications." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "jeremy_wolf_1" color = "jeremy_wolf_1" /obj/item/clothing/under/fluff/tian_dress //phaux: Tian Yinhu name = "purple dress" desc = "A nicely tailored purple dress made for the taller woman." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "tian_dress" item_state = "tian_dress" color = "tian_dress" @@ -681,7 +681,7 @@ /obj/item/clothing/under/rank/bartender/fluff/classy //searif: Ara Al-Jazari name = "classy bartender uniform" desc = "A prim and proper uniform that looks very similar to a bartender's, the only differences being a red tie, waistcoat and a rag hanging out of the back pocket." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "ara_bar_uniform" item_state = "ara_bar_uniform" color = "ara_bar_uniform" @@ -689,7 +689,7 @@ /obj/item/clothing/under/fluff/callum_suit //roaper: Callum Leamus name = "knockoff suit" desc = "A knockoff of a suit commonly worn by the upper class." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "callum_suit" item_state = "callum_suit" color = "callum_suit" @@ -697,7 +697,7 @@ /obj/item/clothing/under/fluff/solara_light_1 //bluefishie: Solara Born-In-Light name = "Elaborate Purple Dress" desc = "An expertly tailored dress, made out of fine fabrics. The interwoven necklace appears to be made out of gold, with three complicated symbols engraved in the front." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "solara_dress" item_state = "solara_dress" color = "solara_dress" @@ -741,7 +741,7 @@ name = "ex-commander jumpsuit" desc = "A standard Central Command Engineering Commander jumpsuit tailored to fight the wearer tightly. It has a Medal of Service pinned onto the left side of it." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "wyatt_uniform" item_state = "wyatt_uniform" color = "wyatt_uniform" @@ -752,7 +752,7 @@ /obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell name = "\improper First Nations facemask" desc = "A simple cloth rag that bears the flag of the first nations." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "flagmask" item_state = "flagmask" flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH @@ -763,7 +763,7 @@ /obj/item/clothing/mask/mara_kilpatrick_1 //staghorn: Mara Kilpatrick name = "shamrock pendant" desc = "A silver and emerald shamrock pendant. It has the initials \"M.K.\" engraved on the back." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "mara_kilpatrick_1" flags = FPRINT|TABLEPASS w_class = 1 @@ -773,7 +773,7 @@ /obj/item/clothing/tie/fluff/altair_locket name = "small locket" desc = "A small golden locket attached to an Ii'rka-reed string. Inside the locket is a holo-picture of a female Tajaran, and an inscription writtin in Siik'mas." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "altair_locket" item_state = "altair_locket" color = "altair_locket" @@ -787,7 +787,7 @@ /obj/item/clothing/tie/fluff/konaa_hirano name = "silver locket" desc = "This oval shaped, argentium sterling silver locket hangs on an incredibly fine, refractive string, almost thin as hair and microweaved from links to a deceptive strength, of similar material. The edges are engraved very delicately with an elegant curving design, but overall the main is unmarked and smooth to the touch, leaving room for either remaining as a stolid piece or future alterations. There is an obvious internal place for a picture or lock of some sort, but even behind that is a very thin compartment unhinged with the pinch of a thumb and forefinger." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "konaahirano" item_state = "konaahirano" color = "konaahirano" @@ -820,7 +820,7 @@ /obj/item/clothing/tie/fluff/nasir_khayyam_1 name = "medallion" desc = "This silvered medallion bears the symbol of the Hadii Clan of the Tajaran." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "nasir_khayyam_1" flags = FPRINT|TABLEPASS w_class = 1 @@ -831,7 +831,7 @@ /obj/item/clothing/mask/mara_kilpatrick_1 name = "emerald necklace" desc = "A brass necklace with a green emerald placed at the end. It has a small inscription on the top of the chain, saying \'Foster\'" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "ty_foster" flags = FPRINT|TABLEPASS w_class = 1 @@ -841,7 +841,7 @@ /obj/item/clothing/shoes/magboots/fluff/susan_harris_1 //sniperyeti: Susan Harris name = "Susan's Magboots" desc = "A colorful pair of magboots with the name Susan Harris clearly written on the back." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "atmosmagboots0" //////////// Sets //////////// @@ -850,7 +850,7 @@ /obj/item/clothing/suit/storage/labcoat/fluff/cdc_labcoat name = "\improper CDC labcoat" desc = "A standard-issue CDC labcoat that protects against minor chemical spills. It has the name \"Wiles\" sewn on to the breast pocket." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_cdc_open" */ ////// Short Sleeve Medical Outfit //erthilo: Farah Lants @@ -858,14 +858,14 @@ /obj/item/clothing/under/rank/medical/fluff/short name = "short sleeve medical jumpsuit" desc = "Made of a special fiber that gives special protection against biohazards. Has a cross on the chest denoting that the wearer is trained medical personnel and short sleeves." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "medical_short" color = "medical_short" /obj/item/clothing/suit/storage/labcoat/fluff/red name = "red labcoat" desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_red_open" ////// Retired Patrol Outfit //desiderium: Rook Maudlin @@ -873,7 +873,7 @@ /obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat name = "retired colony patrolman's coat" desc = "A clean, black nylon windbreaker with the words \"OUTER LIGHT POLICE\" embroidered in gold-dyed thread on the back. \"RETIRED\" is tastefully embroidered below in a smaller font." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "retpolcoat" item_state = "retpolcoat" color = "retpolcoat" @@ -881,13 +881,13 @@ /obj/item/clothing/head/det_hat/fluff/retpolcap name = "retired colony patrolman's cap" desc = "A clean and properly creased colony police cap. The badge is shined and polished, the word \"RETIRED\" engraved professionally under the words \"OUTER LIGHT POLICE.\"" - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "retpolcap" /obj/item/clothing/under/det/fluff/retpoluniform name = "retired colony patrolman's uniform" desc = "A meticulously clean police uniform belonging to Precinct 31, Outer Light Colony. The word \"RETIRED\" is engraved tastefully and professionally in the badge below the number, 501." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "retpoluniform" color = "retpoluniform" @@ -903,7 +903,7 @@ /obj/item/weapon/gun/projectile/detective/fluff/callum_leamas name = "Deckard .44" desc = "A custom built revolver, based off the semi-popular Detective Special model." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "leamas-empty" /obj/item/weapon/gun/projectile/detective/fluff/callum_leamas/update_icon()