From f88595d0733a76cbfe325ee1a453d5b7e14df9f6 Mon Sep 17 00:00:00 2001 From: Kole6738 Date: Tue, 5 Jan 2016 15:25:21 -0800 Subject: [PATCH] Thanks --- code/modules/mining/ores_coins.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index aa160e975c6..71fb8e5c887 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -341,6 +341,10 @@ /obj/item/weapon/coin/attack_self(mob/user) if(cooldown < world.time - 15) + if(string_attached) //does the coin have a wire attached + user << "The coin won't flip very well with something attached!" //Tell user it will not flip + return //do not flip the coin + else var/coinflip = pick(sideslist) cooldown = world.time flick("coin_[cmineral]_flip", src) @@ -349,10 +353,6 @@ var/oldloc = loc sleep(15) if(loc == oldloc && user && !user.incapacitated()) - if(string_attached) //does the coin have a wire attached - user << "The coin won't flip very well with something attached!" //call out the user for failing physics 101 - return //do not flip the coin - else - user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \ - "You flip [src]. It lands on [coinflip].", \ - "You hear the clattering of loose change.") + user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \ + "You flip [src]. It lands on [coinflip].", \ + "You hear the clattering of loose change.")