Merge pull request #4766 from Kyep/parole

Parole
This commit is contained in:
Fox McCloud
2016-07-16 11:35:37 -04:00
committed by GitHub
4 changed files with 15 additions and 11 deletions
+4 -2
View File
@@ -95,7 +95,7 @@
..()
return
if(flags & NODROP)
if(!usr.canUnEquip(src))
return
var/obj/item/clothing/ears/O
@@ -634,8 +634,10 @@ BLIND // can't see anything
//makes sure that the clothing is equipped so that we can't drag it into our hand from miles away.
if(!(src.loc == usr))
return
if(!( usr.restrained() ) && !( usr.stat ) && ( over_object ))
if(!usr.canUnEquip(src))
to_chat(usr, "[src] appears stuck on you!")
return
switch(over_object.name)
if("r_hand")
usr.unEquip(src)