Merge pull request #9401 from Firecage/ofgibtonite

Adds a check to prevent a future ranged Gibtonite message + fixed the message
This commit is contained in:
phil235
2015-06-17 15:12:10 +02:00
+3 -1
View File
@@ -128,8 +128,10 @@
/obj/item/weapon/twohanded/required/attack_hand(mob/user)//Can't even pick it up without both hands empty
var/obj/item/weapon/twohanded/required/H = user.get_inactive_hand()
if(get_dist(src,user) > 1)
return 0
if(H != null)
user.visible_message("<span class='notice'>[src.name] is too cumbersome to carry in one hand!</span>")
user << "<span class='notice'>[src.name] is too cumbersome to carry in one hand!</span>"
return
var/obj/item/weapon/twohanded/offhand/O = new(user)
user.put_in_inactive_hand(O)