diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index e52c86d368b..396a97a79eb 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -115,13 +115,13 @@ icon_on = "blackzippoon" icon_off = "blackzippo" -/obj/item/weapon/lighter/zippo/fluff/sniperyeti_1 //sniperyeti: Patrick Harris/Susan Harris - name = "red black zippo" - desc = "A shiny red zippo lighter that looks like it's in perfect condition." +/obj/item/weapon/lighter/zippo/fluff/fay_sullivan_1 //furohman: Fay Sullivan + name = "Graduation Lighter" + desc = "A silver engraved lighter with 41 on one side and Tharsis University on the other. The lid reads Fay Sullivan, Cybernetic Engineering, 2541" icon = 'custom_items.dmi' - icon_state = "redzippo" - icon_on = "redzippoon" - icon_off = "redzippo" + icon_state = "gradzippo" + icon_on = "gradzippoon" + icon_off = "gradzippo" /obj/item/weapon/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke name = "Gonzo Fist zippo" diff --git a/config/custom_items.txt b/config/custom_items.txt index 24f9bb6e17c..e7454b7555f 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -17,6 +17,7 @@ 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 foolamancer: Edvin Telephosphor: /obj/item/clothing/head/fluff/edvin_telephosphor_1 +furohman: Fay Sullivan: /obj/item/weapon/lighter/zippo/fluff/fay_sullivan_1 gvazdas: Sarah Carbrokes: /obj/item/fluff/sarah_carbrokes_1 jamini: Edwin Atweeke: /obj/item/clothing/suit/labcoat/fluff/burnt leonheart11: Johann Erzatz: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1 @@ -39,8 +40,6 @@ serithi: Serithi Artalis: /obj/item/clothing/glasses/fluff/serithi_artalis_1, /o 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 -sniperyeti: Patrick Harris: /obj/item/weapon/lighter/zippo/fluff/sniperyeti_1 -sniperyeti: Susan Harris: /obj/item/weapon/lighter/zippo/fluff/sniperyeti_1 spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/suit/labcoat/fluff/pink sparklysheep: Cado Keppel: /obj/item/weapon/fluff/cado_keppel_1 staghorn: Mara Kilpatrick: /obj/item/clothing/mask/mara_kilpatrick_1 diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index c7ad27e9e7b..68f2fb1bfc8 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ