Merge branch 'master' into development

code/game/objects/items/weapons/material/twohanded.dm

@@ -245,6 +245,7 @@
 		MA.layer = FLOAT_LAYER
 		HS.add_overlay(MA)
 		HS.name = "[I.name] on a spear"
+		HS.material = material.name
 		qdel(src)
 		return
 
@@ -299,10 +300,11 @@
 	icon_state = "headspear"
 	density = 0
 	anchored = 1
+	var/material = "glass"
 
 /obj/structure/headspear/attack_hand(mob/living/user)
 	user.visible_message("<span class='warning'>[user] kicks over \the [src]!</span>", "<span class='danger'>You kick down \the [src]!</span>")
-	new /obj/item/weapon/material/twohanded/spear(user.loc)
+	new /obj/item/weapon/material/twohanded/spear(user.loc, material)
 	for(var/obj/item/organ/external/head/H in src)
 		H.loc = user.loc
 	qdel(src)

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

@@ -161,10 +161,18 @@
 		if(!istype(W))
 			user <<"<span class ='notice'>The [W] is blocking the cigarettes.</span>"
 			return
+		//Checking contents of packet so lighters won't be cigarettes.
+		for (var/i = contents.len; i > 0; i--)
+			W = contents[i]
+			if (istype(W))
+				break
+			else
+				W = null
+		if (!W)
+			return
 		reagents.trans_to_obj(W, (reagents.total_volume/contents.len))
 		user.equip_to_slot_if_possible(W, slot_wear_mask)
 		reagents.maximum_volume = 15 * contents.len
-		contents.len--
 		user << "<span class='notice'>You take a cigarette out of the pack.</span>"
 		update_icon()
 	else