Lighters and Cig Packets (#637)

changes:

rscadd: "Lighters can now fit into cigarette packets."
bugfix: "Lighters will now go out when placed into a container"

code/game/objects/items/weapons/cigs_lighters.dm

@@ -499,4 +499,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/turf/location = get_turf(src)
 	if(location)
 		location.hotspot_expose(700, 5)
+
+	if (istype(loc, /obj/item/weapon/storage))//A lighter shouldn't stay lit inside a closed container
+		lit = 0
+		icon_state = "[base_state]"
+		item_state = "[base_state]"
+		set_light(0)
+		processing_objects.Remove(src)
 	return

code/game/objects/items/weapons/storage/fancy.dm

@@ -136,7 +136,7 @@
 	throwforce = 2
 	slot_flags = SLOT_BELT
 	storage_slots = 6
-	can_hold = list(/obj/item/clothing/mask/smokable/cigarette)
+	can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/weapon/flame/lighter)
 	icon_type = "cigarette"
 
 /obj/item/weapon/storage/fancy/cigarettes/New()