diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 1c27b362ad..26fc2faeba 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -301,7 +301,7 @@ icon = 'custom_items.dmi' icon_state = "odysseus_spec_id" -/obj/item/weapon/card/id/fluff/ian_colmid //Roaper: Ian Colm +/obj/item/weapon/card/id/fluff/ian_colm_1 //Roaper: Ian Colm name = "Technician" desc = "An old ID with the words 'Ian Colm's Technician ID' printed on it.." icon = 'custom_items.dmi' @@ -367,11 +367,13 @@ icon = 'custom_items.dmi' icon_state = "book_berner_1" +/* /obj/item/clothing/glasses/fluff/serithi_artalis_1 //serithi: Serithi Artalis name = "extranet HUD" desc = "A heads-up display with limited connectivity to the NanoTrasen Extranet, capable of displaying information from official NanoTrasen records." icon = 'custom_items.dmi' icon_state = "serithi_artalis_1" +*/ /obj/item/clothing/glasses/fluff/uzenwa_sissra_1 //sparklysheep: Uzenwa Sissra name = "Scanning Goggles" @@ -379,6 +381,12 @@ icon = 'custom_items.dmi' icon_state = "uzenwa_sissra_1" +/obj/item/clothing/glasses/welding/fluff/ian_colm_2 //roaper: Ian Colm + name = "Welding Goggles" + desc = "A pair of goggles used in the application of welding." + icon = 'custom_items.dmi' + icon_state = "ian_colm_1" + //////////// Hats //////////// //Removed by request /* @@ -420,11 +428,12 @@ icon = 'custom_items.dmi' icon_state = "taryn_kifer_1" -/obj/item/clothing/head/fluff/enos_adlai_1 //roaper: Enos Adlai +/*/obj/item/clothing/head/fluff/enos_adlai_1 //roaper: Enos Adlai name = "comfy cap" desc = "Because when you're the toughest Mother Hubbard on the station, nobody's criticizing your fashion sense." icon = 'custom_items.dmi' icon_state = "enos_adlai_1" +*/ /obj/item/clothing/head/fluff/edvin_telephosphor_1 //foolamancer: Edvin Telephosphor name = "Edvin's Hat" @@ -534,13 +543,13 @@ //////////// Shoes //////////// -/obj/item/clothing/shoes/fluff/leatherboots //serithi: Serithi Artalis +/*/obj/item/clothing/shoes/fluff/leatherboots //serithi: Serithi Artalis name = "leather boots" desc = "A pair of leather boots. Well-worn, but still kept in good condition. There is a small \"S\" scratched into the back of each boot." icon = 'custom_items.dmi' icon_state = "leatherboots" item_state = "jackboots" - +*/ //////////// Sets //////////// ////// CDC //deusdactyl: Roger Wiles diff --git a/config/custom_items.txt b/config/custom_items.txt index a9f786ea39..220783f37c 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -38,11 +38,11 @@ orangebottle: Lilliana Reade: /obj/item/weapon/pen/fluff/fancypen paththegreat: Eli Stevens: /obj/item/weapon/pen/fluff/fountainpen phaux: Tian Krieger: /obj/item/clothing/under/fluff/tian_dress rawrtaicho: Riley Rohtin: /obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1 -roaper: Enos Adlai: /obj/item/clothing/head/fluff/enos_adlai_1 +roaper: Ian Colm: /obj/item/weapon/card/id/fluff/ian_colm_1 +roaper: Ian Colm: /obj/item/clothing/glasses/welding/fluff/ian_colm_2 rukral: Nashida Bisha'ra: /obj/item/weapon/reagent_containers/glass/beaker/large/fluff/nashida_bishara_1 searif: Yuki Matsuda: /obj/item/clothing/under/fluff/jumpsuitdown, /obj/item/clothing/head/welding/fluff/yuki_matsuda_1 searif: Ara Al-Jazari: /obj/item/clothing/under/rank/bartender/fluff/classy -serithi: Serithi Artalis: /obj/item/clothing/glasses/fluff/serithi_artalis_1, /obj/item/clothing/shoes/fluff/leatherboots sirribbit: /obj/item/weapon/clipboard/fluff/mcreary_journal sicktrigger: David Fanning: /obj/item/fluff/david_fanning_1 silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1 @@ -59,4 +59,3 @@ tzefa: Wes Solari: /obj/item/fluff/wes_solari_1 vinceluk: Seth Sealis: /obj/item/clothing/suit/det_suit/fluff/graycoat whitellama: Ethan Way: /obj/item/fluff/ethan_way_1 whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1 -roaper: Ian Colm: /obj/item/weapon/card/id/fluff/ian_colmid \ No newline at end of file diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index ab229b90ed..1a5f94e5d5 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index a6bebf8a3c..ac4ae28348 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ