cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes equip_or_collect

Browse Source 
Equip_or_collect fixed to not delete the item being equipped.

Equip or Collect would use equip_or_del, and if failed, would try to
insert the item in a bag.  However, equip_or_del deletes the item, so it
cannot be put in the bag afterwards.
This commit is contained in:
Regory
2014-08-09 17:53:18 -04:00
parent 191573852c
commit 7ac1d76f80
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+14 -11
View File
@@ -147,23 +147,26 @@
// 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))
if(W.mob_can_equip(src, slot, 1))
//Mob can equip. Equip it.
equip_to_slot_or_del(W, slot)
else
//Mob can't equip it. Put it in a bag B.
// Do I have a backpack?
var/obj/item/weapon/storage/B
if(istype(back,/obj/item/weapon/storage))
//Mob is wearing backpack
B = back
// Do I have a plastic bag?
else
//not wearing backpack. Check if player holding plastic bag
B=is_in_hands(/obj/item/weapon/storage/bag/plasticbag)
if(!B)
// Gimme one.
if(!B) //If not holding plastic bag, give plastic bag
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(!put_in_hands(B))
return // Bag could not be placed in players hands. I don't know what to do here...
//Now, B represents a container we can insert W into.
B.handle_item_insertion(W,1)
//The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot.
var/list/slot_equipment_priority = list( \
slot_back,\
@@ -941,9 +944,9 @@ var/list/slot_equipment_priority = list( \
else if( stunned )
// lying = 0
canmove = 0
else if (!buckled)
lying = !can_stand
canmove = has_limbs
else if (!buckled) //If not buckled, stunned, sleeping, etc
lying = !can_stand //If can't stand, then lying
canmove = has_limbs //If has any limbs, then can move
if(lying)
density = 0