Fixed and further improved package wrapping. Added a sprite for wrapped closets.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3302 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/closets.dm

@@ -129,16 +129,7 @@
 		del(src)
 
 /obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/packageWrap))
-		var/obj/item/weapon/packageWrap/O = W
-		if (O.amount > 3)
-			var/obj/effect/bigDelivery/P = new /obj/effect/bigDelivery(get_turf(src.loc))
-			P.wrapped = src
-			src.close()
-			src.welded = 1
-			src.loc = P
-			O.amount -= 3
-	else if(src.opened)
+	if(src.opened)
 		if(istype(W, /obj/item/weapon/grab))
 			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
 
@@ -160,6 +151,8 @@
 		if(W)
 			W.loc = src.loc
 
+	else if(istype(W, /obj/item/weapon/packageWrap))
+		return
 	else if(istype(W, /obj/item/weapon/weldingtool) && W:welding )
 		if(!W:remove_fuel(0,user))
 			user << "\blue You need more welding fuel to complete this task."

code/game/objects/crates.dm

@@ -287,19 +287,14 @@
 	return attack_hand(user)
 
 /obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if (istype(W, /obj/item/weapon/packageWrap))
-		var/obj/item/weapon/packageWrap/O = W
-		if (O.amount > 3)
-			var/obj/effect/bigDelivery/P = new /obj/effect/bigDelivery(get_turf(src.loc))
-			P.wrapped = src
-			src.loc = P
-			O.amount -= 3
-	else if(opened)
+	if(opened)
 		if(isrobot(user))
 			return
 		user.drop_item()
 		if(W)
 			W.loc = src.loc
+	else if(istype(W, /obj/item/weapon/packageWrap))
+		return
 	else return attack_hand(user)
 
 /obj/structure/closet/crate/secure/emp_act(severity)

code/game/objects/items/item.dm

@@ -182,20 +182,6 @@
 	user.update_clothing()
 	return
 
-/obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if (istype(W, /obj/item/weapon/packageWrap))
-		var/obj/item/weapon/packageWrap/O = W
-		if(src.anchored)	return
-		if(!istype(loc,/turf))
-			user << "\red You need to place the item on the ground before wrapping it!"
-			return
-		else if (O.amount > 1)
-			var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(src.loc))
-			P.wrapped = src
-
-			src.loc = P
-			O.amount -= 1
-
 /obj/item/attack_self(mob/user as mob)
 	..()
 	if(twohanded)