diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 06648809dd4..e8825d3248f 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -143,12 +143,17 @@ // Convinience proc. Collects crap that fails to equip either onto the mob's back, or drops it. // Used in job equipping so shit doesn't pile up at the start loc. /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 bag? - var/obj/item/weapon/storage/bag/plasticbag/B = is_in_hands(/obj/item/weapon/storage/bag/plasticbag) + if(!equip_to_slot_or_drop(W, slot)) + // Do I have a backpack? + var/obj/item/weapon/storage/B = back + + // Do I have a plastic bag? + if(!B) + B=is_in_hands(/obj/item/weapon/storage/bag/plasticbag) + if(!B) // Gimme one. - B=new(null) // Null in case of failed equip. + 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)