TG: Added a cheap lighter so that zippos will have some company.

The cheap lighter can be purchased at vending machines and comes in 4 colors:
green, yellow, cyan and red.

Technical info:

The path
/obj/item/weapon/zippo

was changed to
/obj/item/weapon/lighter/zippo

The new lighter is
/obj/item/weapon/lighter/random
Revision: r3033
Author: 	 baloh.matevz
Date: 	Feb 4, 2012
Review scores: No one has yet scored this revision.

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
 

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)\

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()

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)

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",