diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
index b73e5b5cf0..d72556aeb7 100644
--- a/code/game/machinery/vending/vending_types.dm
+++ b/code/game/machinery/vending/vending_types.dm
@@ -200,6 +200,8 @@
 	product_ads = "For the taste that cools your mood, look for the big blue K!;Refined smokers go for Gold!;Lady Fingers are preferred by women who appreciate a cool smoke.;Lady Fingers are the number one cigarette this side of Gateway!;The tobacco connoisseur prefers Koorlander Gold.;For the cool, filtered feel, Lady Finger Cigarettes provide the smoothest draw of any cigarette on the market.;For the man who knows his place is at the top, Koorlander Gold shows the world that you're the best and no-one can say otherwise.;The Colonial Administration Bureau would like to remind you that smoking kills."
 	products = list(
 		/obj/item/storage/fancy/cigarettes/kpack = 20,
+		/obj/item/storage/fancy/cigarettes/spirit = 20,
+		/obj/item/storage/fancy/cigarettes/spirit/yellow = 20,
 		/obj/item/storage/fancy/cigarettes/arcturian_ace = 15,
 		/obj/item/storage/fancy/cigarettes/emeraldgreen = 15,
 		/obj/item/storage/fancy/cigarettes/wypacket = 15,
@@ -216,6 +218,8 @@
 
 	prices = list(
 		/obj/item/storage/fancy/cigarettes/kpack = 40,
+		/obj/item/storage/fancy/cigarettes/spirit = 40,
+		/obj/item/storage/fancy/cigarettes/spirit/yellow = 40,
 		/obj/item/storage/fancy/cigarettes/arcturian_ace = 25,
 		/obj/item/storage/fancy/cigarettes/emeraldgreen = 35,
 		/obj/item/storage/fancy/cigarettes/wypacket = 30,
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 79d38603dc..db7d7133f0 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -211,6 +211,19 @@
 	item_state = "lfpacket"
 	default_cig_type = /obj/item/clothing/mask/cigarette/ucigarette
 
+/obj/item/storage/fancy/cigarettes/spirit
+	name = "\improper American Spirit Turquoise Packet"
+	desc = "A pack of turquoise American Spirit cigarettes, for that strong full-bodied flavour you know and love."
+	icon_state = "naspacket"
+	item_state = "naspacket"
+	default_cig_type = /obj/item/clothing/mask/cigarette
+
+/obj/item/storage/fancy/cigarettes/spirit/yellow
+	name = "\improper American Spirit Yellow Packet"
+	desc = "A pack of yellow American Spirit cigarettes, for that mellow flavour you know and love."
+	icon_state = "y_naspacket"
+	item_state = "y_naspacket"
+
 /obj/item/storage/fancy/cigarettes/lucky_strikes_4
 	name = "\improper Lucky Strikes Mini Packet"
 	desc = "These four-packs of Luckies come in every MRE. They're not as good as the Habana Reals that come in the LACN MREs, but at least they're free."
diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
index 800295b074..d549903fe5 100644
--- a/code/modules/client/preferences_gear.dm
+++ b/code/modules/client/preferences_gear.dm
@@ -1024,6 +1024,7 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
 /datum/gear/smoking/pack_lucky_strikes
 	display_name = "Pack Of Lucky Strikes"
 	path = /obj/item/storage/fancy/cigarettes/lucky_strikes
+	cost = 0
 
 /datum/gear/smoking/pack_emeraldgreen
 	display_name = "Pack Of Emerald Greens"
@@ -1055,6 +1056,16 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
 	path = /obj/item/storage/fancy/cigarettes/blackpack
 	cost = 4
 
+/datum/gear/smoking/spirit
+	display_name = "Pack Of American Spirit, Turquoise"
+	path = /obj/item/storage/fancy/cigarettes/spirit
+	cost = 4
+
+/datum/gear/smoking/spirit_yellow
+	display_name = "Pack Of American Spirit, Yellow"
+	path = /obj/item/storage/fancy/cigarettes/spirit/yellow
+	cost = 4
+
 /datum/gear/smoking/weed_joint
 	display_name = "Joint of space weed"
 	path = /obj/item/clothing/mask/cigarette/weed
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 0ff2c84b59..91c8fba5f0 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -215,6 +215,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	/obj/item/storage/fancy/cigarettes/lady_finger = "helmet_cig_lf",
 	/obj/item/storage/fancy/cigarettes/blackpack = "helmet_cig_blackpack",
 	/obj/item/storage/fancy/cigarettes/arcturian_ace = "helmet_cig_aapack",
+	/obj/item/storage/fancy/cigarettes/spirit = "helmet_cig_naspack",
+	/obj/item/storage/fancy/cigarettes/spirit/yellow = "helmet_cig_y_naspack",
 	/obj/item/storage/fancy/cigarettes/lucky_strikes_4 = "hat_cig_ls_mre",
 	/obj/item/storage/fancy/cigar/matchbook = "helmet_matches_mre",
 	/obj/item/clothing/mask/cigarette/cigar = "helmet_cig_cig",
diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi
index a7a44ef2af..e1499c4ee4 100644
Binary files a/icons/mob/humans/onmob/helmet_garb.dmi and b/icons/mob/humans/onmob/helmet_garb.dmi differ
diff --git a/icons/obj/items/cigarettes.dmi b/icons/obj/items/cigarettes.dmi
index 89b3ca2195..62d7dcfba5 100644
Binary files a/icons/obj/items/cigarettes.dmi and b/icons/obj/items/cigarettes.dmi differ