cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 03:26:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7997 from mwerezak/fixes

Browse Source 
Fixes voidsuit attachment deployment not checking mob_can_equip()
This commit is contained in:
Chinsky
2015-01-31 09:25:16 +03:00
parent df81d3ed4f 75e0458102
commit a5219535f6
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+2 -2
View File
@@ -130,14 +130,14 @@
return 1
return 0
//This is a SAFE proc. Use this instead of equip_to_splot()!
//This is a SAFE proc. Use this instead of equip_to_slot()!
//set del_on_fail to have it delete W if it fails to equip
//set disable_warning to disable the 'you are unable to equip that' warning.
//unset redraw_mob to prevent the mob from being redrawn at the end.
/mob/proc/equip_to_slot_if_possible(obj/item/W as obj, slot, del_on_fail = 0, disable_warning = 0, redraw_mob = 1)
if(!istype(W)) return 0
if(!W.mob_can_equip(src, slot, disable_warning))
if(!W.mob_can_equip(src, slot))
if(del_on_fail)
del(W)
else