shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1798 from Citadel-Station-13/upstream-merge-28856

Browse Source 
[MIRROR] Straight jackets can now properly be put onto others
This commit is contained in:
LetterJay
2017-06-27 22:53:40 -05:00
committed by GitHub
parent 79da431a44 ed4aa5a01a
commit 7f250e742a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+2 -2
View File
@@ -665,13 +665,13 @@
else
final_where = where
if(!what.mob_can_equip(who, src, final_where, TRUE))
if(!what.mob_can_equip(who, src, final_where, TRUE, TRUE))
to_chat(src, "<span class='warning'>\The [what.name] doesn't fit in that place!</span>")
return
visible_message("<span class='notice'>[src] tries to put [what] on [who].</span>")
if(do_mob(src, who, what.equip_delay_other))
if(what && Adjacent(who) && what.mob_can_equip(who, src, final_where, TRUE))
if(what && Adjacent(who) && what.mob_can_equip(who, src, final_where, TRUE, TRUE))
if(temporarilyRemoveItemFromInventory(what))
if(where_list)
if(!who.put_in_hand(what, where_list[2]))