mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things
This commit is contained in:
@@ -111,7 +111,7 @@
|
||||
break
|
||||
|
||||
// attack with item, place item on conveyor
|
||||
/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user)
|
||||
/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user, params)
|
||||
if(isrobot(user)) return //Carn: fix for borgs dropping their modules on conveyor belts
|
||||
user.drop_item()
|
||||
if(I && I.loc) I.loc = src.loc
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
// wrench: (un)anchor
|
||||
// weldingtool: convert to real pipe
|
||||
|
||||
attackby(var/obj/item/I, var/mob/user)
|
||||
attackby(var/obj/item/I, var/mob/user, params)
|
||||
var/nicetype = "pipe"
|
||||
var/ispipe = 0 // Indicates if we should change the level of this pipe
|
||||
src.add_fingerprint(user)
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
|
||||
// attack by item places it in to disposal
|
||||
attackby(var/obj/item/I, var/mob/user)
|
||||
attackby(var/obj/item/I, var/mob/user, params)
|
||||
if(stat & BROKEN || !I || !user || (I.flags & NODROP))
|
||||
return
|
||||
|
||||
@@ -869,7 +869,7 @@
|
||||
//attack by item
|
||||
//weldingtool: unfasten and convert to obj/disposalconstruct
|
||||
|
||||
attackby(var/obj/item/I, var/mob/user)
|
||||
attackby(var/obj/item/I, var/mob/user, params)
|
||||
|
||||
var/turf/T = src.loc
|
||||
if(T.intact)
|
||||
@@ -1023,7 +1023,7 @@
|
||||
update()
|
||||
return
|
||||
|
||||
attackby(var/obj/item/I, var/mob/user)
|
||||
attackby(var/obj/item/I, var/mob/user, params)
|
||||
if(..())
|
||||
return
|
||||
|
||||
@@ -1170,7 +1170,7 @@
|
||||
return
|
||||
|
||||
// Override attackby so we disallow trunkremoval when somethings ontop
|
||||
/obj/structure/disposalpipe/trunk/attackby(var/obj/item/I, var/mob/user)
|
||||
/obj/structure/disposalpipe/trunk/attackby(var/obj/item/I, var/mob/user, params)
|
||||
|
||||
//Disposal bins or chutes
|
||||
/*
|
||||
@@ -1308,7 +1308,7 @@
|
||||
|
||||
return
|
||||
|
||||
attackby(var/obj/item/I, var/mob/user)
|
||||
attackby(var/obj/item/I, var/mob/user, params)
|
||||
if(!I || !user)
|
||||
return
|
||||
src.add_fingerprint(user)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
AM.loc = T
|
||||
..()
|
||||
|
||||
/obj/structure/bigDelivery/attackby(obj/item/W as obj, mob/user as mob)
|
||||
/obj/structure/bigDelivery/attackby(obj/item/W as obj, mob/user as mob, params)
|
||||
if(istype(W, /obj/item/device/destTagger))
|
||||
var/obj/item/device/destTagger/O = W
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
qdel(src)
|
||||
|
||||
|
||||
/obj/item/smallDelivery/attackby(obj/item/W as obj, mob/user as mob)
|
||||
/obj/item/smallDelivery/attackby(obj/item/W as obj, mob/user as mob, params)
|
||||
if(istype(W, /obj/item/device/destTagger))
|
||||
var/obj/item/device/destTagger/O = W
|
||||
|
||||
@@ -299,7 +299,7 @@
|
||||
update()
|
||||
return
|
||||
|
||||
attackby(var/obj/item/I, var/mob/user)
|
||||
attackby(var/obj/item/I, var/mob/user, params)
|
||||
if(!I || !user)
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user