Attackby was being called more than once. Wasn't apparent until the message was added.
This commit is contained in:
ComicIronic
2015-02-18 14:04:17 +00:00
parent 4603068a49
commit b97b6f75fb
5 changed files with 12 additions and 10 deletions

View File

@@ -21,7 +21,6 @@
return RECYK_METAL return RECYK_METAL
/obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob) /obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob)
..()
if(iswelder(W)) if(iswelder(W))
var/obj/item/weapon/weldingtool/WT = W var/obj/item/weapon/weldingtool/WT = W
@@ -42,8 +41,8 @@
R.use(2) R.use(2)
if (!R && replace) if (!R && replace)
user.put_in_hands(M) user.put_in_hands(M)
return return 1
..() return ..()
/obj/item/stack/rods/attack_self(mob/user as mob) /obj/item/stack/rods/attack_self(mob/user as mob)

View File

@@ -13,7 +13,6 @@
max_amount = 60 max_amount = 60
/obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob) /obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob)
..()
if(istype(O,/obj/item/weapon/wirecutters)) if(istype(O,/obj/item/weapon/wirecutters))
var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc) var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc)
CC.amount = 5 CC.amount = 5
@@ -22,6 +21,7 @@
if(amount <= 0) if(amount <= 0)
user.drop_from_inventory(src) user.drop_from_inventory(src)
del(src) del(src)
return 1
if(istype(O,/obj/item/stack/sheet/metal)) if(istype(O,/obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = O var/obj/item/stack/sheet/metal/M = O
@@ -31,3 +31,6 @@
if(amount <= 0) if(amount <= 0)
user.drop_from_inventory(src) user.drop_from_inventory(src)
del(src) del(src)
return 1
return ..()

View File

@@ -207,7 +207,6 @@
return return
/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob) /obj/item/stack/attackby(obj/item/W as obj, mob/user as mob)
..()
if (istype(W, src.type) && src.type==W.type) if (istype(W, src.type) && src.type==W.type)
var/obj/item/stack/S = W var/obj/item/stack/S = W
if (S.amount >= S.max_amount) if (S.amount >= S.max_amount)

View File

@@ -27,7 +27,6 @@
state = 0 //fine state = 0 //fine
/obj/item/stack/tile/light/attackby(var/obj/item/O as obj, var/mob/user as mob) /obj/item/stack/tile/light/attackby(var/obj/item/O as obj, var/mob/user as mob)
..()
if(istype(O,/obj/item/weapon/crowbar)) if(istype(O,/obj/item/weapon/crowbar))
var/obj/item/stack/sheet/metal/M = getFromPool(/obj/item/stack/sheet/metal, get_turf(src)) var/obj/item/stack/sheet/metal/M = getFromPool(/obj/item/stack/sheet/metal, get_turf(src))
M.amount = 1 M.amount = 1
@@ -35,4 +34,6 @@
new/obj/item/stack/light_w(user.loc) new/obj/item/stack/light_w(user.loc)
if(amount <= 0) if(amount <= 0)
user.drop_from_inventory(src) user.drop_from_inventory(src)
del(src) del(src)
return 1
return ..()

View File

@@ -27,6 +27,7 @@
spawn spawn
src.Destroy() src.Destroy()
returnToPool(src) returnToPool(src)
/obj/item/stack/tile/plasteel/New(var/loc, var/amount=null) /obj/item/stack/tile/plasteel/New(var/loc, var/amount=null)
. = ..() . = ..()
pixel_x = rand(1, 14) pixel_x = rand(1, 14)
@@ -63,7 +64,6 @@
return return
/obj/item/stack/tile/plasteel/attackby(obj/item/W as obj, mob/user as mob) /obj/item/stack/tile/plasteel/attackby(obj/item/W as obj, mob/user as mob)
..()
if(iswelder(W)) if(iswelder(W))
var/obj/item/weapon/weldingtool/WT = W var/obj/item/weapon/weldingtool/WT = W
if(amount < 4) if(amount < 4)
@@ -83,5 +83,5 @@
R.use(4) R.use(4)
if (!R && replace) if (!R && replace)
user.put_in_hands(M) user.put_in_hands(M)
return return 1
..() return ..()