diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 2a0a11c7e56..1b080963b30 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -881,6 +881,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon_state = "sancolettezippo"
 	item_state = "sancolettezippo"
 
+/obj/item/flame/lighter/callisto
+	name = "\improper Callistean lighter"
+	desc = "A cheap plastic lighter bearing the flag of Callisto."
+	desc_extended = "It's debated whether this (recently) discontinued line of cheap lighters was a money laundering scheme or a publicity stunt - extremely cheap, extremely flimsy, these Idris made lighters became an unintended social phenomenon among Callistean smokers; running competitions amongst them as to how long they can keep those lighters alive."
+	icon_state = "lightercallisto"
+	item_state = "lightercallisto"
+
 /obj/item/flame/lighter/zippo/nralakk
 	name = "\improper Nralakk Federation Zippo lighter"
 	desc = "An advanced zippo lighter depicting the flag of the Nralakk Federation."
diff --git a/code/modules/client/preference_setup/loadout/items/smoking.dm b/code/modules/client/preference_setup/loadout/items/smoking.dm
index cd668c40d98..805399b3bac 100644
--- a/code/modules/client/preference_setup/loadout/items/smoking.dm
+++ b/code/modules/client/preference_setup/loadout/items/smoking.dm
@@ -28,6 +28,7 @@
 	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
+	zippolighters["callistean lighter"] = /obj/item/flame/lighter/callisto
 	gear_tweaks += new /datum/gear_tweak/path(zippolighters)
 
 /datum/gear/smoking/lighter
diff --git a/html/changelogs/shimmeristaken-zippo.yml b/html/changelogs/shimmeristaken-zippo.yml
new file mode 100644
index 00000000000..ddb2841188a
--- /dev/null
+++ b/html/changelogs/shimmeristaken-zippo.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: shimmeristaken
+
+# 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 cool Callistean lighter to the game and as an option in the loadout menu."
diff --git a/icons/mob/items/lefthand_cigs_lighters.dmi b/icons/mob/items/lefthand_cigs_lighters.dmi
index 8973bbd653a..3f6f49f5d0e 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 7d8928c62b7..8f7a5abf546 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 f7942b956b3..8767cc4749b 100644
Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ