Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge

This commit is contained in:
Rob Nelson
2014-01-13 20:30:31 -08:00

View File

@@ -265,7 +265,6 @@
return
/obj/item/weapon/shard/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if ( istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0, user))