diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index a711fd24442..f5950c087b6 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -777,6 +777,25 @@ CIGARETTE PACKETS ARE IN FANCY.DM flame_light_color = LIGHT_COLOR_BLUE flame_light_range = 2 +/obj/item/flame/lighter/zippo/nt + name = "\improper NanoTrasen Zippo lighter" + desc = "A zippo lighter with a depiction of NanoTrasen's iconic logo." + icon_state = "ntzippo" + item_state = "ntzippo" + +/obj/item/flame/lighter/zippo/fisanduh + name = "\improper Fisanduhian Zippo lighter" + desc = "A zippo with a depiction of the flag of the Confederate States of Fisanduh. This is a well crafted model that burns brighter and hotter than \ + the usual lighter." + desc_fluff = "On Moroz it's rather hard to find a Confederate without at least some manner of lighter on their person. Fisanduhians don't \ + smoke anymore than the rest of Moroz does, instead they prize these lighters for their utility. From burning loose thread to lighting a \ + molotov and more. A common adage is that the fire of Fisanduh burns brighter than Dominia's, which seems to be true for their lighters at least. \ + These have found purchase throughout the Spur due to their reliability and impressive capability to light up various things, causing a \ + competition of sorts to arise with Fisanduhian and Himean producers over the best quality lighter." + icon_state = "fisanduhzippo" + item_state = "fisanduhzippo" + flame_light_range = 2 + /obj/item/flame/lighter/random/Initialize() . = ..() icon_state = "lighter-[pick("r","c","y","g")]" diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index bbc5280c853..7eaba620cbf 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -11,11 +11,13 @@ ..() var/zippolighters = list() zippolighters["regular zippo"] = /obj/item/flame/lighter/zippo + zippolighters["nanotrasen zippo"] = /obj/item/flame/lighter/zippo/nt zippolighters["black zippo"] = /obj/item/flame/lighter/zippo/black zippolighters["black cross zippo"] = /obj/item/flame/lighter/zippo/black/cross zippolighters["golden zippo"] = /obj/item/flame/lighter/zippo/gold zippolighters["royal zippo"] = /obj/item/flame/lighter/zippo/royal zippolighters["dominian zippo"] = /obj/item/flame/lighter/zippo/dominia + zippolighters["fisanduhian zippo"] = /obj/item/flame/lighter/zippo/fisanduh zippolighters["coalition zippo"] = /obj/item/flame/lighter/zippo/coalition zippolighters["solarian zippo"] = /obj/item/flame/lighter/zippo/sol zippolighters["bieselite zippo"] = /obj/item/flame/lighter/zippo/tcfl diff --git a/html/changelogs/wickedcybs_zippo.yml b/html/changelogs/wickedcybs_zippo.yml new file mode 100644 index 00000000000..484261d164d --- /dev/null +++ b/html/changelogs/wickedcybs_zippo.yml @@ -0,0 +1,6 @@ +author: WickedCybs + +delete-after: True + +changes: + - rscadd: "Added a NanoTrasen and Fisanduhian zippo lighter to the game. You can find these in the zippo selection in the loadout menu." \ No newline at end of file diff --git a/icons/mob/items/lefthand_cigs_lighters.dmi b/icons/mob/items/lefthand_cigs_lighters.dmi index f5fd6c52886..761b76870c0 100644 Binary files a/icons/mob/items/lefthand_cigs_lighters.dmi and b/icons/mob/items/lefthand_cigs_lighters.dmi differ diff --git a/icons/mob/items/righthand_cigs_lighters.dmi b/icons/mob/items/righthand_cigs_lighters.dmi index 29db0ac186c..f9be0b57f57 100644 Binary files a/icons/mob/items/righthand_cigs_lighters.dmi and b/icons/mob/items/righthand_cigs_lighters.dmi differ diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi index 43dbfca2051..d497dacbd74 100644 Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ