Merge pull request #11340 from phil235/CoinFlipThrowFix

Fixes the do_after progress bar appearing on a coin when flipping+throwing it
This commit is contained in:
Cheridan
2015-08-27 01:00:01 -05:00

View File

@@ -326,7 +326,9 @@
flick("coin_[cmineral]_flip", src)
icon_state = "coin_[cmineral]_[coinflip]"
playsound(user.loc, 'sound/items/coinflip.ogg', 50, 1)
if(do_after(user, 15, target = src))
var/oldloc = loc
sleep(15)
if(loc == oldloc && user && !user.incapacitated())
user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \
"<span class='notice'>You flip [src]. It lands on [coinflip].</span>", \
"<span class='italics'>You hear the clattering of loose change.</span>")