diff --git a/code/defines/obj/clothing/mask.dm b/code/defines/obj/clothing/mask.dm
index 395d626d8e1..297df69df09 100644
--- a/code/defines/obj/clothing/mask.dm
+++ b/code/defines/obj/clothing/mask.dm
@@ -99,12 +99,25 @@
 	name = "Cigarette"
 	icon_state = "cigoff"
 	var/lit = 0
+	var/icon_on = "cigon"  //Note - these are in masks.dmi not in cigarette.dmi
+	var/icon_off = "cigoff"
+	var/icon_butt = "cigbutt"
 	throw_speed = 0.5
 	item_state = "cigoff"
 	var/lastHolder = null
 	var/smoketime = 300
 	w_class = 1
 
+/obj/item/clothing/mask/cigarette/cigar
+	name = "Premium Cigar"
+	icon_state = "cigaroff"
+	icon_on = "cigaron"
+	icon_off = "cigaroff"
+	icon_butt = "cigarbutt"
+	throw_speed = 0.5
+	item_state = "cigaroff"
+	smoketime = 1500
+
 /obj/item/clothing/mask/mime
 	name = "mime mask"
 	desc = "It looks a little creepy"
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index c0c9da1209b..efb55e7d80f 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -1445,6 +1445,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	var/cigcount = 6
 	flags = ONBELT | TABLEPASS
 
+/*
 /obj/item/weapon/cigarpacket
 	name = "Pete's Cuban Cigars"
 	desc = "The most robust cigars on the planet."
@@ -1454,7 +1455,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	w_class = 1
 	throwforce = 2
 	var/cigarcount = 6
-	flags = ONBELT | TABLEPASS
+	flags = ONBELT | TABLEPASS */
 
 /obj/item/weapon/cigbutt
 	name = "Cigarette butt"
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index e948d4b6cff..70fcc4a7f13 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -68,36 +68,36 @@ obj/item/weapon/matchbox.attackby(obj/item/weapon/match/W as obj, mob/user as mo
 	return
 
 
-//////////////
-//CIGARETTES//
-//////////////
+///////////////////////
+//CIGARETTES + CIGARS//
+///////////////////////
 /obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/weldingtool)  && W:welding)
 		if(src.lit == 0)
 			src.lit = 1
 			src.damtype = "fire"
-			src.icon_state = "cigon"
-			src.item_state = "cigon"
+			src.icon_state = icon_on
+			src.item_state = icon_on
 			for(var/mob/O in viewers(user, null))
-				O.show_message(text("\red [] casually lights the cigarette with [], what a badass.", user, W), 1)
+				O.show_message(text("\red [] casually lights the [] with [], what a badass.", user, src.name, W), 1)
 			spawn() //start fires while it's lit
 				src.process()
 	else if(istype(W, /obj/item/weapon/zippo) && W:lit)
 		if(src.lit == 0)
 			src.lit = 1
-			src.icon_state = "cigon"
-			src.item_state = "cigon"
+			src.icon_state = icon_on
+			src.item_state = icon_on
 			for(var/mob/O in viewers(user, null))
-				O.show_message(text("\red With a single flick of his wrist, [] smoothly lights his cigarette with his []. Damn they're cool.", user, W), 1)
+				O.show_message(text("\red With a single flick of his wrist, [] smoothly lights his [] with his []. Damn they're cool.", user, src.name, W), 1)
 			spawn() //start fires while it's lit
 				src.process()
 	else if(istype(W, /obj/item/weapon/match) && W:lit)
 		if(src.lit == 0)
 			src.lit = 1
-			src.icon_state = "cigon"
-			src.item_state = "cigon"
+			src.icon_state = icon_on
+			src.item_state = icon_on
 			for(var/mob/O in viewers(user, null))
-				O.show_message(text("\red With a single flick of his wrist, [] smoothly lights his cigarette with his []. Damn they're cool.", user, W), 1)
+				O.show_message(text("\red [] lights his [] with his []. How poor can you get?", user, src.name, W), 1)
 			spawn() //start fires while it's lit
 				src.process()
 
@@ -119,10 +119,14 @@ obj/item/weapon/matchbox.attackby(obj/item/weapon/match/W as obj, mob/user as mo
 			if(M.l_hand == src || M.r_hand == src || M.wear_mask == src)
 				location = M.loc
 		if(src.smoketime < 1)
-			var/obj/item/weapon/cigbutt/C = new /obj/item/weapon/cigbutt
+			if (istype(src,/obj/item/clothing/mask/cigarette/cigar))
+				var/obj/item/weapon/cigbutt/C = new /obj/item/weapon/cigarbutt
+				C.loc = location
+			else
+				var/obj/item/weapon/cigbutt/C = new /obj/item/weapon/cigbutt
+				C.loc = location
 			if(M != null)
-				M << "\red Your cigarette goes out."
-			C.loc = location
+				M << "\red Your [src.name] goes out."
 			del(src)
 			return
 		if (istype(location, /turf)) //start a fire if possible
@@ -161,13 +165,13 @@ obj/item/weapon/matchbox.attackby(obj/item/weapon/match/W as obj, mob/user as mo
 /obj/item/clothing/mask/cigarette/dropped(mob/user as mob)
 	if(src.lit == 1)
 		for(var/mob/O in viewers(user, null))
-			O.show_message(text("\red [] calmly drops and treads on the lit cigarette, putting it out instantly.", user), 1)
+			O.show_message(text("\red [] calmly drops and treads on the lit [], putting it out instantly.", user,src.name), 1)
 		src.lit = -1
 		src.damtype = "brute"
-		src.icon_state = "cigbutt"
-		src.item_state = "cigoff"
-		src.name = "Cigarette butt"
-		src.desc = "A cigarette butt."
+		src.icon_state = icon_butt
+		src.item_state = icon_off
+		src.desc = "A [src.name] butt."
+		src.name = "[src.name] butt"
 		return ..()
 	else
 		for(var/mob/O in viewers(user, null))
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 5b75b30e689..552d5290dcd 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi
index bae1b0d3642..c2b2d3321c9 100644
Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 44e250dcb7a..75684812104 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ