Merge pull request #1975 from RavingManiac/master

Wrapping paper fixes and improvements

code/modules/mob/mob.dm

@@ -912,4 +912,4 @@ note dizziness decrements automatically in the mob's Life() proc.
 	return ""
 
 /mob/proc/flash_weak_pain()
-	flick("weak_pain",pain)
+	flick("weak_pain",pain)

code/modules/mob/mob_defines.dm

@@ -226,4 +226,4 @@
 	var/has_limbs = 1 //Whether this mob have any limbs he can move with
 	var/can_stand = 1 //Whether this mob have ability to stand
 
-	var/immune_to_ssd = 0
+	var/immune_to_ssd = 0

code/modules/recycling/sortingmachinery.dm

@@ -102,13 +102,22 @@
 
 		user.attack_log += text("\[[time_stamp()]\] <font color='blue'>Has used [src.name] on \ref[target]</font>")
 
-		if (istype(target, /obj/item) && !(istype(target, /obj/item/weapon/storage)))
+		if (istype(target, /obj/item))
 			var/obj/item/O = target
 			if (src.amount > 1)
 				var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(O.loc))	//Aaannd wrap it up!
 				if(!istype(O.loc, /turf))
 					if(user.client)
 						user.client.screen -= O
+				P.w_class = O.w_class
+				if(P.w_class <= 1.0)
+					P.icon_state = "deliverycrate1"
+				else if (P.w_class <= 2.0)
+					P.icon_state = "deliverycrate2"
+				else if (P.w_class <= 3.0)
+					P.icon_state = "deliverycrate3"
+				else
+					P.icon_state = "deliverycrate4"
 				P.wrapped = O
 				O.loc = P
 				P.add_fingerprint(usr)