diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 33c1aafbb4c..1d50b613606 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -90,6 +90,12 @@ icon = '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_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." @@ -106,6 +112,28 @@ O.show_message(text("[] shows you: \icon[] [].", user, src, src.name), 1) src.add_fingerprint(user) +/obj/item/fluff/ana_issek_2 //suethecake: Ana Issek + name = "Faded Badge" + desc = "A faded badge, backed with leather, that reads 'NT Security Force' across the front. It bears the emblem of the Forensic division." + icon_state = "ana_badge" + item_state = "ana_badge" + color = "ana_badge" + +/obj/item/fluff/ana_issek_2/attack_self(mob/user as mob) + if(isliving(user)) + user.visible_message("\red [user] flashes their golden security badge.\nIt reads: Ana Issek, NT Security.","\red You display the faded bage.\nIt reads: Ana Issek, NT Security.") + +/obj/item/fluff/ana_issek_2/attack(mob/living/carbon/human/M, mob/living/user) + if(isliving(user)) + user.visible_message("\red [user] invades [M]'s personal space, thrusting [src] into their face insistently.","\red You invade [M]'s personal space, thrusting [src] into their face insistently. You are the law.") + +/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_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." @@ -548,6 +576,22 @@ item_state = "jumpsuitdown" color = "jumpsuitdown" +/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_state = "lilith_uniform" + item_state = "lilith_uniform" + color = "lilith_uniform" + +/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_state = "ana_uniform" + item_state = "ana_uniform" + color = "ana_uniform" + /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." @@ -587,6 +631,14 @@ item_state = "callum_suit" color = "callum_suit" +/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_state = "solara_dress" + item_state = "solara_dress" + color = "solara_dress" + /////// NT-SID Suit //Zuhayr: Jane Doe /obj/item/clothing/under/fluff/jane_sidsuit @@ -745,15 +797,6 @@ //////////// Weapons //////////// -///// Colt Peacemaker - Ana Ka'Rimah - SueTheCake - -//obj/item/weapon/gun/energy/stunrevolver/fluff/ana_peacemaker - -/* name = "Peacemaker" - desc = "A nickel-plated revolver with pearl grips. It has a certain Old West flair!" - icon = 'custom_items.dmi' - icon_state = "peacemaker"*/ - ///// Well-used baton - Oen'g Issek - Donofnyc3 /obj/item/weapon/melee/baton/fluff/oeng_baton diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index d42fc73cc1a..7a6ad61e9a9 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index eb0e1b1b551..7ccf50688e3 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ