diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index dbe9382b455..6c186a9b227 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -405,16 +405,16 @@ ZIPPO src.item_state = icon_on if( istype(src,/obj/item/weapon/lighter/zippo) ) for(var/mob/O in viewers(user, null)) - O.show_message(text("\red Without even breaking stride, [] flips open and lights the [] in one smooth movement.", user, src), 1) + O.show_message(text("\red Without even breaking stride, [] flips open and lights [] in one smooth movement.", user, src), 1) else if(prob(75)) for(var/mob/O in viewers(user, null)) - O.show_message("\red After a few attempts, [user] manages to light the [src].", 1) + O.show_message("\red After a few attempts, [user] manages to light [src].", 1) else user << "\red You burn yourself while lighting the lighter." user.adjustFireLoss(5) for(var/mob/O in viewers(user, null)) - O.show_message("\red After a few attempts, [user] manages to light the [src], they however burn their finger in the process.", 1) + O.show_message("\red After a few attempts, [user] manages to light [src], they however burn their finger in the process.", 1) user.total_luminosity += 2 processing_objects.Add(src) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 67b1fcde752..ef92c846b88 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -75,6 +75,14 @@ item_state = "olddressuniform" color = "olddressuniform" +/obj/item/clothing/suit/storage/det_suit/fluff/graycoat + name = "gray coat" + desc = "Old, worn out coat. It's seen better days." + icon = 'custom_items.dmi' + icon_state = "graycoat" + item_state = "graycoat" + color = "graycoat" + //////////// Useable Items /obj/item/weapon/pen/fluff/multi @@ -116,6 +124,28 @@ icon_state = "johann_erzatz_1" volume = 50 +/obj/item/weapon/lighter/zippo/fluff/li_tsun_1 + name = "blue zippo lighter" + desc = "A zippo lighter made of some blue metal." + icon = 'custom_items.dmi' + icon_state = "bluezippo" + icon_on = "bluezippoon" + icon_off = "bluezippo" + +/obj/item/weapon/fluff/cado_keppel_1 + 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_state = "purplecomb" + item_state = "purplecomb" + + attack_self(mob/user) + if(user.r_hand == src || user.l_hand == src) + for(var/mob/O in viewers(user, null)) + O.show_message(text("\red [] uses their [] to comb their hair with incredible style and sophistication. What a guy.", user, src), 1) + return + //////////// Misc Items /obj/item/fluff/wes_solari_1 @@ -142,3 +172,8 @@ name = "old ID" desc = "A scratched and worn identification card; it appears too damaged to inferface with any technology. You can almost make out \"Tom Cabinet\" in the smeared ink." icon_state = "ethan_way_1" + +/obj/item/fluff/val_mcneil_1 + name = "rosary pendant" + desc = "A cross on a ring of beads, has McNeil etched onto the back." + icon_state = "val_mcneil_1" diff --git a/config/custom_items.txt b/config/custom_items.txt index b5c1ac10406..92731d7a606 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -21,4 +21,8 @@ orangebottle: Lillian Levett: /obj/item/weapon/pen/fluff/fancypen orangebottle: Lilliana Reade: /obj/item/weapon/pen/fluff/fancypen deusdactyl: Roger Wiles: /obj/item/clothing/under/rank/virologist/fluff/cdc_jumpsuit, /obj/item/clothing/suit/storage/labcoat/fluff/cdc_labcoat desiderium: Momiji Inubashiri: /obj/item/clothing/under/fluff/olddressuniform -leonheart11: Johann Erzatz: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1 \ No newline at end of file +leonheart11: Johann Erzatz: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1 +mangled: Li Tsun: /obj/item/weapon/lighter/zippo/fluff/li_tsun_1 +vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat +sparklysheep: Cado Keppel: /obj/item/weapon/fluff/cado_keppel_1 +silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1 \ No newline at end of file diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 6752e147da9..d7b6cb7d6b2 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 56e46393124..368dc033ef5 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 289fd5d815c..790669f50df 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index c03545cfefd..a3695c7087e 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ