diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 0fbebfdcbee..739a5e16871 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -289,6 +289,9 @@ W.dropped(user) user << "\red God damnit!" + if(istype(W, /obj/item/weapon/packageWrap) && !(src in user)) //prevents package wrap being put inside the backpack when the backpack is not being worn/held (hence being wrappable) + return + handle_item_insertion(W) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 0d8a504c0e3..370a32dc4ff 100644 --- a/code/modules/mob/mob.dm +++ b/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) \ No newline at end of file diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 068851304c6..407be5f25c1 100644 --- a/code/modules/mob/mob_defines.dm +++ b/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 \ No newline at end of file diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index e1ee757c126..f1a5d661bc0 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -102,13 +102,22 @@ user.attack_log += text("\[[time_stamp()]\] Has used [src.name] on \ref[target]") - 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)