diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 35f43aed2ae..36b3b741e8f 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -75,6 +75,12 @@ icon = 'custom_items.dmi' icon_state = "fancypen" +/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_state = "fountainpen" + /obj/item/fluff/victor_kaminsky_1 //chinsky: Victor Kaminski name = "golden detective's badge" desc = "NanoTrasen Security Department detective's badge, made from gold. Badge number is 564." @@ -177,6 +183,13 @@ 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_state = "lithiumflask" + volume = 50 + /obj/item/weapon/storage/pill_bottle/fluff/listermedbottle //compactninja: Lister Black name = "Pill bottle (anti-depressants)" desc = "Contains pills used to deal with depression. They appear to be prescribed to Lister Black" diff --git a/config/custom_items.txt b/config/custom_items.txt index c5a4c37f99a..14bdf620bb2 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -26,12 +26,14 @@ lexusjjss: Lexus Langg: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/we lexusjjss: Zachary Tomlinson: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask madmalicemccrea: Alice McCrea: /obj/item/clothing/head/welding/fluff/alice_mccrea_1 mangled: Li Matsuda: /obj/item/weapon/lighter/zippo/fluff/li_matsuda_1 +mcgulliver: Wox Derax: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/lithiumflask misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran morrinn: Maye Day: /obj/item/weapon/storage/fluff/maye_daye_1 nerezza: Asher Spock: /obj/item/weapon/reagent_containers/hypospray/fluff/asher_spock_1 nerezza: Asher Spock: /obj/item/weapon/card/id/fluff/asher_spock_2 orangebottle: Lillian Levett: /obj/item/weapon/pen/fluff/fancypen 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 @@ -53,5 +55,4 @@ 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 - +roaper: Ian Colm: /obj/item/weapon/card/id/fluff/ian_colmid \ No newline at end of file diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 68f2fb1bfc8..774061a4b69 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ