From 15a80594a645e3a6bcb28467307221046a7bb604 Mon Sep 17 00:00:00 2001
From: "petethegoat@gmail.com"
 <petethegoat@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 10 Dec 2012 00:56:42 +0000
Subject: [PATCH] Fixed the softcurity readme.

Added grabbing cigarettes with your mouth for Malkevin.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5290 316c924e-a436-60f5-8080-3fe189b3f50e
---
 .../Sigyn/Softcurity/__README.dm              |  4 ++--
 .../objects/items/weapons/cigs_lighters.dm    | 22 +++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/code/WorkInProgress/Sigyn/Softcurity/__README.dm b/code/WorkInProgress/Sigyn/Softcurity/__README.dm
index 8bd62cc10e6..75c62c277d5 100644
--- a/code/WorkInProgress/Sigyn/Softcurity/__README.dm
+++ b/code/WorkInProgress/Sigyn/Softcurity/__README.dm
@@ -5,6 +5,6 @@ You'll need to untick code/game/jobs/access.dm for this to all work correctly!
 
 Everything else can just be ticked on top of the original stuff.
 
-You can optionally download a modified map from http://tgstation13.googlecode.com/files/tgstation.2.0.9_departmentsec.zip.
-If you use this, make sure to untick the original map!
+You'll also need to download a modified map from http://tgstation13.googlecode.com/files/tgstation.2.0.9_Softcurity.zip.
+Make sure to untick the original map!
 */
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 73697c45634..9931c072000 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -325,7 +325,7 @@ ZIPPO
 /obj/item/weapon/cigpacket/New()
 	..()
 	flags |= NOREACT
-	create_reagents(15*cigcount)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
+	create_reagents(15 * cigcount)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
 
 /obj/item/weapon/cigpacket/Del()
 	..()
@@ -345,12 +345,26 @@ ZIPPO
 			var/obj/item/clothing/mask/cigarette/W = new /obj/item/clothing/mask/cigarette(user)
 			reagents.trans_to(W, (reagents.total_volume/cigcount))
 			user.put_in_active_hand(W)
-			reagents.maximum_volume = 15*cigcount
+			reagents.maximum_volume = 15 * cigcount
 			cigcount--
+			update_icon()
 	else
 		return ..()
-	update_icon()
-	return
+
+/obj/item/weapon/cigpacket/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M, /mob))
+		return
+
+	if(M == user && user.zone_sel.selecting == "mouth" && cigcount > 0 && !user.wear_mask)
+		var/obj/item/clothing/mask/cigarette/W = new /obj/item/clothing/mask/cigarette(user)
+		reagents.trans_to(W, (reagents.total_volume/cigcount))
+		user.equip_to_slot_if_possible(W, slot_wear_mask)
+		reagents.maximum_volume = 15 * cigcount
+		cigcount--
+		user << "<span class='notice'>You take a cigarette out of the pack.</span>"
+		update_icon()
+	else
+		..()
 
 /obj/item/weapon/cigpacket/dromedaryco
 	name = "DromedaryCo packet"