Merge pull request #10854 from PsiOmegaDelta/150824-UndressMeEverywhere

Shuffles de-equipping logic.
This commit is contained in:
Zuhayr
2015-08-24 21:59:59 +09:30
+1 -1
View File
@@ -232,7 +232,7 @@ var/list/slot_equipment_priority = list( \
//This differs from remove_from_mob() in that it checks if the item can be unequipped first.
/mob/proc/unEquip(obj/item/I, force = 0) //Force overrides NODROP for things like wizarditis and admin undress.
if(!force && canUnEquip(I))
if(!(force || canUnEquip(I)))
return
drop_from_inventory(I)
return 1