diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index c8a3c8333fb..690591bdf6a 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -149,17 +149,18 @@ /mob/living/carbon/human/proc/equip_or_collect(var/obj/item/W, var/slot) if(!equip_to_slot_or_del(W, slot)) // Do I have a backpack? - var/obj/item/weapon/storage/B = back - - // Do I have a plastic bag? - if(!B) + var/obj/item/weapon/storage/B + if(istype(back,/obj/item/weapon/storage)) + B = back + // Do I have a plastic bag? + else B=is_in_hands(/obj/item/weapon/storage/bag/plasticbag) - if(!B) - // Gimme one. - B=new /obj/item/weapon/storage/bag/plasticbag(null) // Null in case of failed equip. - if(!put_in_hands(B,slot_back)) - return // Fuck it + if(!B) + // Gimme one. + B=new /obj/item/weapon/storage/bag/plasticbag(null) // Null in case of failed equip. + if(!put_in_hands(B,slot_back)) + return // Fuck it B.handle_item_insertion(W,1)