From 80f7e49f5e37df0296df9921b3104ec13c45a7ff Mon Sep 17 00:00:00 2001
From: NanakoAC <nanakoglasgow@gmail.com>
Date: Tue, 2 Aug 2016 19:43:22 +0100
Subject: [PATCH] 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"
---
 .../objects/items/weapons/cigs_lighters.dm    |  7 ++++
 .../objects/items/weapons/storage/fancy.dm    |  2 +-
 html/changelogs/Nanako-Lighterpacket.yml      | 38 +++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/Nanako-Lighterpacket.yml

diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 723726e37f9..537cadee68d 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/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
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 0ed8ad7b7b2..19d079e5ce1 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/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()
diff --git a/html/changelogs/Nanako-Lighterpacket.yml b/html/changelogs/Nanako-Lighterpacket.yml
new file mode 100644
index 00000000000..91c4ea8f549
--- /dev/null
+++ b/html/changelogs/Nanako-Lighterpacket.yml
@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Nanako
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Lighters can now fit into cigarette packets."
+  - bugfix: "Lighters will now go out when placed into a container"
+  
\ No newline at end of file