fixes for issue 260 issue 262 and issue 263

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2747 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
quartz235@gmail.com
2011-12-19 23:48:09 +00:00
parent 66c32c3d96
commit c6e2da83b3
2 changed files with 42 additions and 39 deletions
+2 -2
View File
@@ -432,7 +432,7 @@
O.show_message(text("\red <B>[] is trying to break the handcuffs!</B>", usr), 1)
spawn(0)
if(do_after(usr, 50))
if(!usr:handcuffed) return
if(!usr:handcuffed || usr.moved_recently || usr:buckled) return
for(var/mob/O in viewers(usr))
O.show_message(text("\red <B>[] manages to break the handcuffs!</B>", usr), 1)
usr << "\green You successfully break your handcuffs."
@@ -444,7 +444,7 @@
O.show_message(text("\red <B>[] attempts to remove the handcuffs!</B>", usr), 1)
spawn(0)
if(do_after(usr, 1200))
if(!usr:handcuffed) return
if(!usr:handcuffed || usr.moved_recently || usr:buckled) return
for(var/mob/O in viewers(usr))
O.show_message(text("\red <B>[] manages to remove the handcuffs!</B>", usr), 1)
usr << "\blue You successfully remove your handcuffs."