Merge remote-tracking branch 'upstream/master'

code/game/objects/closets.dm

@@ -126,6 +126,8 @@
 			src.welded = 1
 			src.loc = P
 			O.amount -= 3
+		else
+			user << "\blue You need more paper."
 	else if(src.opened)
 		if(istype(W, /obj/item/weapon/grab))
 			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet

code/game/objects/closets/secure/security.dm

@@ -7,6 +7,7 @@
 		..()
 		sleep(2)
 		new /obj/item/clothing/suit/storage/captunic(src)
+		new /obj/item/clothing/suit/armor/captain(src)
 		new /obj/item/clothing/head/helmet/cap(src)
 		new /obj/item/clothing/under/rank/captain(src)
 		new /obj/item/clothing/suit/armor/vest(src)
@@ -110,7 +111,6 @@
 		new /obj/item/weapon/pepperspray(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/weapon/melee/baton(src)
-		new /obj/item/weapon/gun/energy/taser(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
 		return
 

code/game/objects/items/item.dm

@@ -192,6 +192,15 @@
 
 /obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/packageWrap))
+		if(istype(src,/obj/item/weapon/storage) && istype(src.loc, /mob))	//Put it into the bag
+			return
+		if(istype(src.loc,/obj/item/weapon/storage) || istype(src.loc,/obj/item/clothing/suit/storage/))	//Taking stuff out of storage duplicates it.
+			user << "\blue Do not do this, it is broken as all hell.  Take it out of the container first."
+			return
+		for(var/obj/item/T in user)	//Lets remove it from their inventory
+			if(T == src)
+				user.remove_from_mob(T)
+				break
 		var/obj/item/weapon/packageWrap/O = W
 		if (O.amount > 1)
 			var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(src.loc))