diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index ad34bdb831..dd3356d617 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -123,6 +123,14 @@ icon_on = "redzippoon" icon_off = "redzippo" +/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_state = "gonzozippo" + icon_on = "gonzozippoon" + icon_off = "gonzozippo" + /obj/item/weapon/fluff/cado_keppel_1 //sparklysheep: Cado Keppel name = "purple comb" desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side." @@ -266,6 +274,22 @@ 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_state = "wolfflight0" + w_class = 2 + item_state = "wolfflight" + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT + m_amt = 50 + g_amt = 20 + on = 0 + brightness_on = 4 //luminosity when on + icon_on = "wolfflight1" + icon_off = "wolfflight0" + ////////////////////////////////// //////////// Clothing //////////// ////////////////////////////////// diff --git a/config/custom_items.txt b/config/custom_items.txt index 8f8257af58..c14fac093c 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -10,6 +10,7 @@ desiderium: Momiji Inubashiri: /obj/item/clothing/under/fluff/olddressuniform desiderium: Rook Maudlin: /obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat, /obj/item/clothing/head/det_hat/fluff/retpolcap, /obj/item/clothing/under/det/fluff/retpoluniform deusdactyl: James Girard: /obj/item/clothing/head/secsoft/fluff/swatcap, /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate +executivekill: Hunter Duke: /obj/item/weapon/lighter/zippo/fluff/executivekill_1 fastler: Fastler Greay: /obj/item/weapon/card/id/fluff/lifetime fniff: Sarah Calvera: /obj/item/fluff/sarah_calvera_1 fniff: Angleo Wilkerson: /obj/item/fluff/angelo_wilkerson_1 @@ -43,8 +44,9 @@ staghorn: Mara Kilpatrick: /obj/item/clothing/mask/mara_kilpatrick_1 tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper thebreadbocks: Steve Johnson: /obj/item/fluff/steve_johnson_1 themij: Taryn Keppel: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1 +thejesster14: Rosa Wolff: /obj/item/device/flashlight/fluff/thejesster14_1 tzefa: Wes Solari: /obj/item/fluff/wes_solari_1 vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/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 +roaper: Ian Colm: /obj/item/weapon/card/id/fluff/ian_colmid diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 94c25a7b4a..efa4686b13 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 fd2433e55c..16967faec7 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 6e9dec731c..70ea112ea0 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ