diff --git a/code/__defines/lighting.dm b/code/__defines/lighting.dm index 06a92931191..b617cb6c734 100644 --- a/code/__defines/lighting.dm +++ b/code/__defines/lighting.dm @@ -82,6 +82,7 @@ #define LIGHT_COLOR_PURPLE "#A97FAA" //Soft purple. rgb(169, 127, 170) #define LIGHT_COLOR_VIOLET "#B43CB8" //Deep purple. rgb(180, 60, 184) #define LIGHT_COLOR_SCARLET "#E85656" //Light red. rgb(232, 86, 86) +#define LIGHT_COLOR_WHITE "#FFFFFF" //White. rgb(255, 255, 255) //These ones aren't a direct colour like the ones above, because nothing would fit #define LIGHT_COLOR_FIRE "#FAA019" //Warm orange color, leaning strongly towards yellow. rgb(250, 160, 25) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index f5950c087b6..96c63916a73 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -796,6 +796,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "fisanduhzippo" flame_light_range = 2 +/obj/item/flame/lighter/zippo/luceian + name = "\improper Luceian Zippo lighter" + desc = "A bright zippo lighter with the all-seeing eye of Ennoia on its front. Clearly Luceian." + desc_fluff = "Luceian lighters, sometimes referred to as “Ennoic Fires,” are commonly carried by Assunzionii as an emergency light \ + source. A genuine lighter in the Luceian tradition will have a proving mark stamped upon its base that shows when and where it was \ + blessed following its construction." + icon_state = "luceianzippo" + item_state = "luceianzippo" + flame_light_color = LIGHT_COLOR_WHITE + 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 7eaba620cbf..c3f460bde8c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -24,6 +24,7 @@ zippolighters["himeo zippo"] = /obj/item/flame/lighter/zippo/himeo zippolighters["europan zippo"] = /obj/item/flame/lighter/zippo/europa zippolighters["gadpathurian zippo"] = /obj/item/flame/lighter/zippo/gadpathur + zippolighters["luceian zippo"] = /obj/item/flame/lighter/zippo/luceian zippolighters["asoral jet lighter"] = /obj/item/flame/lighter/zippo/asoral gear_tweaks += new/datum/gear_tweak/path(zippolighters) diff --git a/html/changelogs/wickedcybs_zippo2.yml b/html/changelogs/wickedcybs_zippo2.yml new file mode 100644 index 00000000000..0244e7cd4ad --- /dev/null +++ b/html/changelogs/wickedcybs_zippo2.yml @@ -0,0 +1,8 @@ +author: WickedCybs, Schwann + +delete-after: True + +changes: + - rscadd: "Added a Luceian Zippo to the Zippo lighter selection. Now you can ruin your lungs while maintaining your faith." + - tweak: "Added a define for bright white light." + - tweak: "Tweaked the lit Fisanduhian zippo sprite." \ 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 761b76870c0..a3fcb776a49 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 f9be0b57f57..d94a15ab33d 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 d497dacbd74..b53cc781cc0 100644 Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ