diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index d6d60f00475..16002307b98 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -886,6 +886,21 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "sancolettezippo" item_state = "sancolettezippo" +/obj/item/flame/lighter/zippo/nralakk + name = "\improper Nralakk Federation Zippo lighter" + desc = "An advanced zippo lighter depicting the flag of the Nralakk Federation." + desc_extended = "A stylish lighter using Skrell hover technology. Burns with a purple flame. With the growth of the Federation's tobacco industry, these lighters are a commonplace convenience for many Skrell both within Nralakk space and abroad.These lighters are also often carried by wulumunusha smokers, and are a particularly common sight among adherents of the Weishii faith." + icon_state = "nralakkzippo" + item_state = "nralakkzippo" + flame_light_color = LIGHT_COLOR_PURPLE + +/obj/item/flame/lighter/zippo/nralakk/update_icon() + if(lit) + flick("[base_state]_turnon", src) + else + flick("[base_state]_turnoff", src) + return ..() + /obj/item/flame/lighter/random/Initialize() . = ..() icon_state = "lighter-[pick("r","c","y","g")]" diff --git a/code/modules/client/preference_setup/loadout/items/smoking.dm b/code/modules/client/preference_setup/loadout/items/smoking.dm index c93a9c207fc..cd668c40d98 100644 --- a/code/modules/client/preference_setup/loadout/items/smoking.dm +++ b/code/modules/client/preference_setup/loadout/items/smoking.dm @@ -27,6 +27,7 @@ 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 + zippolighters["nralakk zippo"] = /obj/item/flame/lighter/zippo/nralakk gear_tweaks += new /datum/gear_tweak/path(zippolighters) /datum/gear/smoking/lighter diff --git a/html/changelogs/RustingWithYou - skrippo.yml b/html/changelogs/RustingWithYou - skrippo.yml new file mode 100644 index 00000000000..5a12bf269b8 --- /dev/null +++ b/html/changelogs/RustingWithYou - skrippo.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a Nralakk Federation zippo lighter." diff --git a/icons/mob/items/lefthand_cigs_lighters.dmi b/icons/mob/items/lefthand_cigs_lighters.dmi index 9ea15b0fafc..8973bbd653a 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 bd31f1f4dd6..7d8928c62b7 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 b3a2c781245..f7942b956b3 100644 Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ