diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm
index cda3510df6a..1b9582f561f 100755
--- a/code/defines/obj/vending.dm
+++ b/code/defines/obj/vending.dm
@@ -153,12 +153,12 @@
 	name = "cigarette machine"
 	desc = "If you want to get cancer, might as well do it in style"
 	icon_state = "cigs"
-	product_paths = "/obj/item/weapon/cigpacket;/obj/item/weapon/matchbox"
-//	product_amounts = "10;10"
-	product_prices = "1;1"
+	product_paths = "/obj/item/weapon/cigpacket;/obj/item/weapon/matchbox;/obj/item/weapon/lighter/random"
+//	product_amounts = "10;10;4"
+	product_prices = "1;1;2"
 	product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!"
 	vend_delay = 34
-	product_hidden = "/obj/item/weapon/zippo"
+	product_hidden = "/obj/item/weapon/lighter/zippo"
 //	product_hideamt = "4"
 	hidden_prices = "2"
 	product_coin = "/obj/item/clothing/mask/cigarette/cigar/havanian"
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index b3c8452fd61..bd22ac8a450 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -96,7 +96,7 @@
 		H.equip_if_possible(new /obj/item/weapon/fcardholder(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/drinks/dflask(H.back), H.slot_in_backpack)
-		H.equip_if_possible(new /obj/item/weapon/zippo(H), H.slot_l_store)
+		H.equip_if_possible(new /obj/item/weapon/lighter/zippo(H), H.slot_l_store)
 //		H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/candy_corn(H), H.slot_h_store)
 //		No... just no. --SkyMarshal
 		var/datum/organ/external/O = H.organs[pick(H.organs)]
diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm
index 15e95ba5c6a..5d41480fda6 100644
--- a/code/game/objects/closets/secure/security.dm
+++ b/code/game/objects/closets/secure/security.dm
@@ -174,7 +174,7 @@
 		new /obj/item/device/radio/headset/headset_sec(src)
 		//
 		new /obj/item/weapon/reagent_containers/food/drinks/dflask(src)
-		new /obj/item/weapon/zippo(B)
+		new /obj/item/weapon/lighter/zippo(B)
 		new /obj/item/weapon/pepperspray/small(src)
 		return
 
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 8b307932995..908418e501d 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -473,7 +473,7 @@
 		istype(W, /obj/item/weapon/screwdriver)                   || \
 		istype(W, /obj/item/weapon/pen)                           || \
 		istype(W, /obj/item/weapon/weldingtool)      && W:welding || \
-		istype(W, /obj/item/weapon/zippo)            && W:lit     || \
+		istype(W, /obj/item/weapon/lighter/zippo)            && W:lit     || \
 		istype(W, /obj/item/weapon/match)            && W:lit     || \
 		istype(W, /obj/item/clothing/mask/cigarette) && W:lit     || \
 		istype(W, /obj/item/weapon/wirecutters)                   || \
@@ -509,7 +509,7 @@
 /proc/is_burn(obj/item/W as obj)
 	return ( \
 		istype(W, /obj/item/weapon/weldingtool)      && W:welding || \
-		istype(W, /obj/item/weapon/zippo)            && W:lit     || \
+		istype(W, /obj/item/weapon/lighter/zippo)    && W:lit     || \
 		istype(W, /obj/item/weapon/match)            && W:lit     || \
 		istype(W, /obj/item/clothing/mask/cigarette) && W:lit	|| \
 		istype(W,/obj/item/projectile/beam)\
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index cddb2a25e65..e930a057ea3 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -28,7 +28,7 @@
 		..()
 		if(istype(W, /obj/item/weapon/weldingtool)  && W:welding)
 			light("\red [user] casually lights the [name] with [W], what a badass.")
-		else if(istype(W, /obj/item/weapon/zippo) && W:lit)
+		else if(istype(W, /obj/item/weapon/lighter) && W:lit)
 			light()
 		else if(istype(W, /obj/item/weapon/match) && W:lit)
 			light()
@@ -110,7 +110,11 @@
 		else
 			src.candlecount--
 			var/obj/item/candle/W = new /obj/item/candle(user)
-			user.put_in_hand(W)
+			if(user.hand)
+				user.l_hand = W
+			else
+				user.r_hand = W
+			W.layer = 20
 	else
 		return ..()
 	src.update_icon()
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 12e17bac5f1..ac53cf357df 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -34,6 +34,7 @@ ZIPPO
 				processing_objects.Remove(src)
 				return
 
+
 	dropped(mob/user as mob)
 		if(src.lit == 1)
 			spawn(10)
@@ -124,14 +125,17 @@ ZIPPO
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		..()
-		if(istype(W, /obj/item/weapon/weldingtool)  && W:welding)
+		if(istype(W, /obj/item/weapon/weldingtool) && W:welding)
 			light("\red [user] casually lights the [name] with [W], what a badass.")
 
-		else if(istype(W, /obj/item/weapon/zippo) && (W:lit > 0))
+		else if(istype(W, /obj/item/weapon/lighter/zippo) && (W:lit > 0))
 			light("\red With a single flick of their wrist, [user] smoothly lights their [name] with their [W]. Damn they're cool.")
 
+		else if(istype(W, /obj/item/weapon/lighter) && (W:lit > 0))
+			light("\red After some fiddling, [user] manages to light their [name] with [W].")
+
 		else if(istype(W, /obj/item/weapon/match) && (W:lit > 0))
-			light("\red [user] lights their [name] with their [W]. How poor can you get?")
+			light("\red [user] lights their [name] with their [W].")
 		return
 
 
@@ -197,7 +201,7 @@ ZIPPO
 	butt_count = 0
 
 /obj/item/clothing/mask/cigarette/cigar/cohiba
-	name = "Cohiba Cigar"
+	name = "Cohiba Robusto Cigar"
 	desc = "There's little more you could want from a cigar."
 	icon_state = "cigar2off"
 	icon_on = "cigar2on"
@@ -212,7 +216,7 @@ ZIPPO
 	smoketime = 7200
 
 /obj/item/weapon/cigbutt
-	name = "Cigarette butt"
+	name = "cigarette butt"
 	desc = "A manky old cigarette butt."
 	icon = 'cigarettes.dmi'
 	icon_state = "cigbutt"
@@ -269,36 +273,68 @@ ZIPPO
 /////////
 //ZIPPO//
 /////////
-/obj/item/weapon/zippo
-	name = "Zippo lighter"
-	desc = "The detective's zippo."
+
+/obj/item/weapon/lighter
+	name = "cheap lighter"
+	desc = "A cheap-as-free lighter."
 	icon = 'items.dmi'
-	icon_state = "zippo"
-	item_state = "zippo"
+	icon_state = "lighter-g"
+	item_state = "lighter-g"
+	var/icon_on = "lighter-g-on"
+	var/icon_off = "lighter-g"
 	w_class = 1
 	throwforce = 4
 	flags = ONBELT | TABLEPASS | CONDUCT
-	var
-		lit = 0
+	var/lit = 0
 
+/obj/item/weapon/lighter/zippo
+	name = "Zippo lighter"
+	desc = "The zippo."
+	icon_state = "zippo"
+	item_state = "zippo"
+	icon_on = "zippoon"
+	icon_off = "zippo"
+
+/obj/item/weapon/lighter/random
+	New()
+		var/color = pick("r","c","y","g")
+		icon_on = "lighter-[color]-on"
+		icon_off = "lighter-[color]"
+		icon_state = icon_off
+
+/obj/item/weapon/lighter
 
 	attack_self(mob/user)
 		if(user.r_hand == src || user.l_hand == src)
 			if(!src.lit)
 				src.lit = 1
-				src.icon_state = "zippoon"
-				src.item_state = "zippoon"
-				for(var/mob/O in viewers(user, null))
-					O.show_message(text("\red Without even breaking stride, [] flips open and lights the [] in one smooth movement.", user, src), 1)
+				src.icon_state = icon_on
+				src.item_state = icon_on
+				if( istype(src,/obj/item/weapon/lighter/zippo) )
+					for(var/mob/O in viewers(user, null))
+						O.show_message(text("\red Without even breaking stride, [] flips open and lights the [] in one smooth movement.", user, src), 1)
+				else
+					if(prob(75))
+						for(var/mob/O in viewers(user, null))
+							O.show_message("\red After a few attempts, [user] manages to light the [src].", 1)
+					else
+						user << "\red <b>You burn yourself while lighting the lighter.</b>"
+						user.adjustFireLoss(5)
+						for(var/mob/O in viewers(user, null))
+							O.show_message("\red After a few attempts, [user] manages to light the [src], they however burn their finger in the process.", 1)
 
 				user.total_luminosity += 2
 				processing_objects.Add(src)
 			else
 				src.lit = 0
-				src.icon_state = "zippo"
-				src.item_state = "zippo"
-				for(var/mob/O in viewers(user, null))
-					O.show_message(text("\red You hear a quiet click, as [] shuts off the [] without even looking what they're doing. Wow.", user, src), 1)
+				src.icon_state = icon_off
+				src.item_state = icon_off
+				if( istype(src,/obj/item/weapon/lighter/zippo) )
+					for(var/mob/O in viewers(user, null))
+						O.show_message(text("\red You hear a quiet click, as [] shuts off the [] without even looking at what they're doing. Wow.", user, src), 1)
+				else
+					for(var/mob/O in viewers(user, null))
+						O.show_message("\red [user] quietly shuts off the [src].", 1)
 
 				user.total_luminosity -= 2
 				processing_objects.Remove(src)
diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm
index 912063f00a2..c001a0028f3 100644
--- a/code/game/objects/storage/belt.dm
+++ b/code/game/objects/storage/belt.dm
@@ -102,7 +102,7 @@
 		"/obj/item/weapon/reagent_containers/syringe",
 		"/obj/item/weapon/reagent_containers/glass/dispenser",
 		"/obj/item/weapon/reagent_containers/hypospray",
-		"/obj/item/weapon/zippo",
+		"/obj/item/weapon/lighter/zippo",
 		"/obj/item/weapon/cigpacket",
 		"/obj/item/weapon/storage/pill_bottle",
 		"/obj/item/stack/medical",
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 022ac20be9f..e3984feed8c 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -17,6 +17,7 @@
 	else
 		alert("Coders only baby")
 		return
+//	feedback_add_details("admin_verb","DG2") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
 
@@ -772,7 +773,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), M.slot_wear_mask)
 			M.equip_if_possible(new /obj/item/clothing/head/centhat(M), M.slot_head)
 			M.equip_if_possible(new /obj/item/weapon/gun/projectile/mateba(M), M.slot_s_store)
-			M.equip_if_possible(new /obj/item/weapon/zippo(M), M.slot_r_store)
+			M.equip_if_possible(new /obj/item/weapon/lighter/zippo(M), M.slot_r_store)
 			M.equip_if_possible(new /obj/item/ammo_magazine/a357(M), M.slot_l_store)
 
 			var/obj/item/weapon/card/id/W = new(M)
@@ -795,7 +796,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(new /obj/item/clothing/mask/cigarette/cigar/havanian(M), M.slot_wear_mask)
 			M.equip_if_possible(new /obj/item/clothing/head/deathsquad/beret(M), M.slot_head)
 			M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), M.slot_belt)
-			M.equip_if_possible(new /obj/item/weapon/zippo(M), M.slot_r_store)
+			M.equip_if_possible(new /obj/item/weapon/lighter/zippo(M), M.slot_r_store)
 			M.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(M), M.slot_back)
 
 			var/obj/item/weapon/card/id/W = new(M)
diff --git a/code/modules/clothing/suits/detective.dm b/code/modules/clothing/suits/detective.dm
index 8ea2d259d66..1f6248348ab 100644
--- a/code/modules/clothing/suits/detective.dm
+++ b/code/modules/clothing/suits/detective.dm
@@ -12,7 +12,7 @@
 	icon_state = "detective"
 	item_state = "det_suit"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
-	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/cigpacket,/obj/item/weapon/zippo,/obj/item/device/detective_scanner,/obj/item/device/taperecorder,/obj/item/policetaperoll)
+	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/cigpacket,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder,/obj/item/policetaperoll)
 	armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 
 
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index cabe34ec5d6..e27b5707826 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -794,8 +794,8 @@
 			contents += O
 			if(istype(module_state_1,/obj/item/borg/sight))
 				sight_mode |= module_state_1:sight_mode
-			else if(istype(module_state_1,/obj/item/weapon/zippo))
-				var/obj/item/weapon/zippo/Z = module_state_1
+			else if(istype(module_state_1,/obj/item/weapon/lighter/zippo))
+				var/obj/item/weapon/lighter/zippo/Z = module_state_1
 				Z.lit = 1
 				Z.icon_state = "zippoon"
 				Z.item_state = "zippoon"
@@ -806,8 +806,8 @@
 			contents += O
 			if(istype(module_state_2,/obj/item/borg/sight))
 				sight_mode |= module_state_2:sight_mode
-			else if(istype(module_state_2,/obj/item/weapon/zippo))
-				var/obj/item/weapon/zippo/Z = module_state_2
+			else if(istype(module_state_2,/obj/item/weapon/lighter/zippo))
+				var/obj/item/weapon/lighter/zippo/Z = module_state_2
 				Z.lit = 1
 				Z.icon_state = "zippoon"
 				Z.item_state = "zippoon"
@@ -818,8 +818,8 @@
 			contents += O
 			if(istype(module_state_3,/obj/item/borg/sight))
 				sight_mode |= module_state_3:sight_mode
-			else if(istype(module_state_3,/obj/item/weapon/zippo))
-				var/obj/item/weapon/zippo/Z = module_state_3
+			else if(istype(module_state_3,/obj/item/weapon/lighter/zippo))
+				var/obj/item/weapon/lighter/zippo/Z = module_state_3
 				Z.lit = 1
 				Z.icon_state = "zippoon"
 				Z.item_state = "zippoon"
@@ -832,8 +832,8 @@
 		var/obj/item/O = locate(href_list["deact"])
 		if(activated(O))
 			if(module_state_1 == O)
-				if(istype(module_state_1, /obj/item/weapon/zippo))
-					var/obj/item/weapon/zippo/Z = module_state_1
+				if(istype(module_state_1, /obj/item/weapon/lighter/zippo))
+					var/obj/item/weapon/lighter/zippo/Z = module_state_1
 					Z.lit = 0
 					Z.icon_state = "zippo"
 					Z.item_state = "zippo"
@@ -841,8 +841,8 @@
 				module_state_1 = null
 				contents -= O
 			else if(module_state_2 == O)
-				if(istype(module_state_2, /obj/item/weapon/zippo))
-					var/obj/item/weapon/zippo/Z = module_state_2
+				if(istype(module_state_2, /obj/item/weapon/lighter/zippo))
+					var/obj/item/weapon/lighter/zippo/Z = module_state_2
 					Z.lit = 0
 					Z.icon_state = "zippo"
 					Z.item_state = "zippo"
@@ -850,8 +850,8 @@
 				module_state_2= null
 				contents -= O
 			else if(module_state_3 == O)
-				if(istype(module_state_3, /obj/item/weapon/zippo))
-					var/obj/item/weapon/zippo/Z = module_state_3
+				if(istype(module_state_3, /obj/item/weapon/lighter/zippo))
+					var/obj/item/weapon/lighter/zippo/Z = module_state_3
 					Z.lit = 0
 					Z.icon_state = "zippo"
 					Z.item_state = "zippo"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 969042828e4..ffe76a3b76c 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -193,7 +193,10 @@
 		src.modules += M
 
 		src.modules += new /obj/item/weapon/reagent_containers/robodropper(src)
-		src.modules += new /obj/item/weapon/zippo(src)
+
+		var/obj/item/weapon/lighter/zippo/L = new /obj/item/weapon/lighter/zippo(src)
+		L.lit = 1
+		src.modules += L
 
 		src.modules += new /obj/item/weapon/tray(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src)
diff --git a/code/unused/computer2/peripherals.dm b/code/unused/computer2/peripherals.dm
index b5d2310d5fd..4f4184bd4b1 100644
--- a/code/unused/computer2/peripherals.dm
+++ b/code/unused/computer2/peripherals.dm
@@ -162,7 +162,7 @@
 				prize.name = "electronic blink toy game"
 				prize.desc = "Blink.  Blink.  Blink."
 			if(3)
-				prize = new /obj/item/weapon/zippo( prize_location )
+				prize = new /obj/item/weapon/lighter/zippo( prize_location )
 				prize.name = "Burno Lighter"
 				prize.desc = "Almost like a decent lighter!"
 			if(4)
diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm
index 1874c310cfc..100f9318672 100755
--- a/maps/tgstation.2.0.8.dmm
+++ b/maps/tgstation.2.0.8.dmm
@@ -5187,7 +5187,7 @@
 "bVM" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "yellowcorner"},/area/hallway/primary/aft)
 "bVN" = (/obj/item/weapon/clipboard,/obj/item/weapon/stamp/ce,/obj/item/clothing/glasses/meson,/obj/structure/table/reinforced,/turf/simulated/floor,/area/engine/chiefs_office)
 "bVO" = (/obj/item/weapon/storage/belt/utility,/obj/item/weapon/weldingtool,/obj/item/weapon/wrench,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/structure/table/reinforced,/turf/simulated/floor,/area/engine/chiefs_office)
-"bVP" = (/obj/item/weapon/zippo,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/structure/table/reinforced,/obj/structure/disposalpipe/segment,/obj/item/device/hacktool/engineer,/turf/simulated/floor,/area/engine/chiefs_office)
+"bVP" = (/obj/item/weapon/lighter/zippo,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/structure/table/reinforced,/obj/structure/disposalpipe/segment,/obj/item/device/hacktool/engineer,/turf/simulated/floor,/area/engine/chiefs_office)
 "bVQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/chiefs_office)
 "bVR" = (/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/structure/table/reinforced,/obj/item/stack/medical/ointment{pixel_y = 4},/turf/simulated/floor,/area/engine/chiefs_office)
 "bVS" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/reinforced,/turf/simulated/floor,/area/engine/chiefs_office)
@@ -5854,7 +5854,7 @@
 "ciD" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start)
 "ciE" = (/obj/machinery/door/window/northright,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "ciF" = (/obj/structure/table/reinforced{icon_state = "reinf_tabledir"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
-"ciG" = (/obj/structure/table/reinforced{icon_state = "reinf_tabledir"},/obj/item/weapon/zippo,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
+"ciG" = (/obj/structure/table/reinforced{icon_state = "reinf_tabledir"},/obj/item/weapon/lighter/zippo,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "ciH" = (/obj/structure/table/reinforced{icon_state = "reinf_tabledir"},/obj/item/weapon/cigpacket,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "ciI" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "ciJ" = (/obj/item/stack/sheet/glass{amount = 5000},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
@@ -6185,12 +6185,12 @@
 "coW" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control)
 "coX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor,/area/centcom/control)
 "coY" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control)
-"coZ" = (/obj/structure/rack,/obj/item/weapon/pinpointer,/obj/item/clothing/suit/space/syndicate/black/blue,/obj/item/clothing/head/helmet/space/syndicate/black/blue,/obj/item/weapon/storage/belt/security/full,/obj/effect/landmark{name = "nukecode"},/obj/item/weapon/zippo,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
+"coZ" = (/obj/structure/rack,/obj/item/weapon/pinpointer,/obj/item/clothing/suit/space/syndicate/black/blue,/obj/item/clothing/head/helmet/space/syndicate/black/blue,/obj/item/weapon/storage/belt/security/full,/obj/effect/landmark{name = "nukecode"},/obj/item/weapon/lighter/zippo,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "cpa" = (/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "ERTIN"; name = "ERT-Shuttle Airlock"; opacity = 0},/turf/unsimulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/centcom/specops)
 "cpb" = (/obj/structure/bookcase{name = "bookcase (Tactics)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
 "cpc" = (/obj/structure/closet/secure_closet/hos,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
 "cpd" = (/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
-"cpe" = (/obj/structure/rack,/obj/item/weapon/secstorage/sbriefcase,/obj/item/weapon/cigpacket,/obj/item/weapon/zippo,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
+"cpe" = (/obj/structure/rack,/obj/item/weapon/secstorage/sbriefcase,/obj/item/weapon/cigpacket,/obj/item/weapon/lighter/zippo,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
 "cpf" = (/obj/structure/bookcase{name = "bookcase (Reports)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
 "cpg" = (/obj/structure/table/woodentable,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/centcom/control)
 "cph" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor,/area/centcom/control)
@@ -6365,7 +6365,7 @@
 "csu" = (/obj/structure/table,/obj/machinery/blender{pixel_y = 11},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
 "csv" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
 "csw" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
-"csx" = (/obj/structure/table,/obj/item/weapon/zippo,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
+"csx" = (/obj/structure/table,/obj/item/weapon/lighter/zippo,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
 "csy" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/cola,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
 "csz" = (/obj/structure/table,/obj/item/weapon/dice/d20,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding)
 "csA" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding)
@@ -6437,7 +6437,7 @@
 "ctO" = (/obj/machinery/gibber,/turf/unsimulated/floor{icon_state = "white"},/area/tdome)
 "ctP" = (/obj/machinery/door/airlock/command{name = "Thunderdome"},/turf/unsimulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/tdome)
 "ctQ" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve)
-"ctR" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/zippo,/obj/item/weapon/cigpacket,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve)
+"ctR" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/lighter/zippo,/obj/item/weapon/cigpacket,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve)
 "ctS" = (/obj/structure/table{icon_state = "tabledir"; dir = 2},/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve)
 "ctT" = (/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve)
 "ctU" = (/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve)