diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
index a8001bc51b1..422e47a9db5 100755
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -781,10 +781,10 @@
 					"/obj/item/clothing/head/collectable/xenom",
 					"/obj/item/clothing/head/collectable/xenom",
 					"/obj/item/clothing/head/collectable/petehat")
-	name = "Collectable Hat Crate!"
+	name = "Collectable hat crate!"
 	cost = 200
 	containertype = "/obj/structure/closet/crate/hat"
-	containername = "Collectable Hats Crate! Brought to you by Bass.inc!"
+	containername = "Collectable hats crate! Brought to you by Bass.inc!"
 	group = "Clothing"
 
 /datum/supply_packs/hats/New()
@@ -795,20 +795,34 @@
 	..()
 
 
-/datum/supply_packs/contraband
+/datum/supply_packs/poster
 	contains = list("/obj/item/weapon/contraband/poster",) //We randomly pick 5 items from this list through the constructor, look below
-	name = "Contraband Crate"
+	name = "Poster crate"
 	cost = 30
-	containertype = "/obj/structure/closet/crate/contraband"
-	containername = "Contraband crate"
-	group = "ERROR"
+	containertype = "/obj/structure/closet/crate/poster"
+	containername = "Poster crate"
 	contraband = 1
+	group = "Secure Storage"
 
-/datum/supply_packs/contraband/New()
+/datum/supply_packs/poster/New()
 	var/list/tempContains = list()
 	for(var/i = 0,i<5,i++)
 		tempContains += pick(contains)
 	src.contains = tempContains
 	..()
 
+/datum/supply_packs/cigarettes
+	contains = list("/obj/item/weapon/cigpacket/dromedaryco",
+					"/obj/item/weapon/cigpacket/dromedaryco",
+					"/obj/item/weapon/cigpacket/dromedaryco",
+					"/obj/item/weapon/cigpacket/dromedaryco",
+					"/obj/item/weapon/cigpacket/dromedaryco",
+					"/obj/item/weapon/cigpacket/dromedaryco",)
+	name = "DromedaryCo cigarettes crate"
+	cost = 15
+	containertype = "/obj/structure/closet/crate/cigarettes"
+	containername = "DromedaryCo cigarettes crate"
+	contraband = 1
+	group = "Secure Storage"
+
 //SUPPLY PACKS
\ 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 374783174bb..7e0c05a1768 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -4,6 +4,7 @@ MATCHES
 MATCHBOXES
 CIGARETTES
 CIGARS
+SMOKING PIPES
 CIG PACKET
 ZIPPO
 */
@@ -329,7 +330,7 @@ ZIPPO
 //CIG PACK//
 ////////////
 /obj/item/weapon/cigpacket
-	name = "Cigarette packet"
+	name = "cigarette packet"
 	desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
 	icon = 'cigarettes.dmi'
 	icon_state = "cigpacket"
@@ -342,23 +343,23 @@ ZIPPO
 
 
 	update_icon()
-		src.icon_state = text("cigpacket[]", src.cigcount)
-		src.desc = text("There are [] cigs\s left!", src.cigcount)
+		icon_state = "[initial(icon_state)][cigcount]"
+		desc = "There's [cigcount] cig\s left!"
 		return
 
 
 	attack_hand(mob/user as mob)
 		if(user.r_hand == src || user.l_hand == src)
-			if(src.cigcount == 0)
+			if(cigcount == 0)
 				user << "\red You're out of cigs, shit! How you gonna get through the rest of the day..."
 				return
 			else
-				src.cigcount--
+				cigcount--
 				var/obj/item/clothing/mask/cigarette/W = new /obj/item/clothing/mask/cigarette(user)
 				user.put_in_hand(W)
 		else
 			return ..()
-		src.update_icon()
+		update_icon()
 		return
 
 /obj/item/weapon/cigpacket/dromedaryco
diff --git a/code/game/objects/storage/crates.dm b/code/game/objects/storage/crates.dm
index cb33970a13b..d4dd6126628 100644
--- a/code/game/objects/storage/crates.dm
+++ b/code/game/objects/storage/crates.dm
@@ -38,9 +38,18 @@
 	icon_opened = "crateopen"
 	icon_closed = "crate"
 
-/obj/structure/closet/crate/contraband
-	name = "Contraband crate"
-	desc = "A random assortment of items manufactured by providers NOT listed under Nanotrasen's whitelist."
+/obj/structure/closet/crate/poster
+	name = "Poster crate"
+	desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist."
+	icon = 'storage.dmi'
+	icon_state = "crate"
+	density = 1
+	icon_opened = "crateopen"
+	icon_closed = "crate"
+
+/obj/structure/closet/crate/cigarettes
+	name = "DromedaryCo cigarettes crate"
+	desc = "A crate of cigarettes manufactured by the notorious DromedaryCo company."
 	icon = 'storage.dmi'
 	icon_state = "crate"
 	density = 1
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index d31dde2c514..1e30a2e609c 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ