Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

This commit is contained in:
Markolie
2015-02-22 22:12:11 +01:00
parent aee4626ed9
commit 672305e034
456 changed files with 714 additions and 1182 deletions
+1 -1
View File
@@ -145,7 +145,7 @@
//No other icons for it atm
/obj/machinery/power/am_control_unit/attackby(obj/item/W, mob/user)
/obj/machinery/power/am_control_unit/attackby(obj/item/W, mob/user, params)
if(!istype(W) || !user) return
if(istype(W, /obj/item/weapon/wrench))
if(!anchored)
+1 -1
View File
@@ -37,7 +37,7 @@
return
/obj/machinery/power/am_engine/injector/attackby(obj/item/weapon/fuel/F, mob/user)
/obj/machinery/power/am_engine/injector/attackby(obj/item/weapon/fuel/F, mob/user, params)
if( (stat & BROKEN) || !connected) return
if(istype(F, /obj/item/weapon/fuel/H))
+1 -1
View File
@@ -20,7 +20,7 @@
content = "Anti-Hydrogen"
fuel = 1e-12 //pico-kilogram
/obj/item/weapon/fuel/attackby(obj/item/weapon/fuel/F, mob/user)
/obj/item/weapon/fuel/attackby(obj/item/weapon/fuel/F, mob/user, params)
..()
if(istype(src, /obj/item/weapon/fuel/antiH))
if(istype(F, /obj/item/weapon/fuel/antiH))
+2 -2
View File
@@ -135,7 +135,7 @@ proc/cardinalrange(var/center)
else if(processing) shutdown_core()
/obj/machinery/am_shielding/attackby(obj/item/W, mob/user)
/obj/machinery/am_shielding/attackby(obj/item/W, mob/user, params)
if(!istype(W) || !user) return
if(W.force > 10)
stability -= W.force/2
@@ -213,7 +213,7 @@ proc/cardinalrange(var/center)
m_amt = 100
w_amt = 2000
/obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user)
/obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/device/multitool) && istype(src.loc,/turf))
new/obj/machinery/am_shielding(src.loc)
del(src)
+1 -1
View File
@@ -365,7 +365,7 @@
//attack with an item - open/close cover, insert cell, or (un)lock interface
/obj/machinery/power/apc/attackby(obj/item/W, mob/living/user)
/obj/machinery/power/apc/attackby(obj/item/W, mob/living/user, params)
if (istype(user, /mob/living/silicon) && get_dist(src,user)>1)
return src.attack_hand(user)
+3 -3
View File
@@ -1,6 +1,6 @@
// attach a wire to a power machine - leads from the turf you are standing on
/obj/machinery/power/attackby(obj/item/weapon/W, mob/user)
/obj/machinery/power/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/stack/cable_coil))
@@ -120,7 +120,7 @@
/obj/structure/cable/attack_tk(mob/user)
return
/obj/structure/cable/attackby(obj/item/W, mob/user)
/obj/structure/cable/attackby(obj/item/W, mob/user, params)
var/turf/T = src.loc
if(T.intact)
@@ -278,7 +278,7 @@
usr << "\blue You cannot do that."
..()
/obj/item/stack/cable_coil/attackby(obj/item/weapon/W, mob/user)
/obj/item/stack/cable_coil/attackby(obj/item/weapon/W, mob/user, params)
..()
if( istype(W, /obj/item/weapon/wirecutters) && src.amount > 1)
src.amount--
+1 -1
View File
@@ -9,7 +9,7 @@
desc = "This cable is tough. It cannot be cut with simple hand tools."
layer = 2.39 //Just below pipes, which are at 2.4
/obj/structure/cable/heavyduty/attackby(obj/item/W, mob/user)
/obj/structure/cable/heavyduty/attackby(obj/item/W, mob/user, params)
var/turf/T = src.loc
if(T.intact)
+1 -1
View File
@@ -76,7 +76,7 @@
SNG.drain("CELL",src,H.wear_suit)
return
/obj/item/weapon/stock_parts/cell/attackby(obj/item/W, mob/user)
/obj/item/weapon/stock_parts/cell/attackby(obj/item/W, mob/user, params)
..()
if(istype(W, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = W
+1 -1
View File
@@ -118,7 +118,7 @@
if(stat & (BROKEN|NOPOWER)) return
interact(user)
/obj/machinery/power/generator/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/machinery/power/generator/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/wrench))
anchored = !anchored
user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor."
+3 -3
View File
@@ -63,8 +63,8 @@ var/const/GRAV_NEEDS_WRENCH = 3
/obj/machinery/gravity_generator/part
var/obj/machinery/gravity_generator/main/main_part = null
/obj/machinery/gravity_generator/part/attackby(obj/item/I as obj, mob/user as mob)
return main_part.attackby(I, user)
/obj/machinery/gravity_generator/part/attackby(obj/item/I as obj, mob/user as mob, params)
return main_part.attackby(I, user, params)
/obj/machinery/gravity_generator/part/get_status()
return main_part.get_status()
@@ -177,7 +177,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
// Interaction
// Fixing the gravity generator.
/obj/machinery/gravity_generator/main/attackby(obj/item/I as obj, mob/user as mob)
/obj/machinery/gravity_generator/main/attackby(obj/item/I as obj, mob/user as mob, params)
var/old_broken_state = broken_state
switch(broken_state)
if(GRAV_NEEDS_SCREWDRIVER)
+4 -4
View File
@@ -21,7 +21,7 @@
var/obj/machinery/light/newlight = null
var/sheets_refunded = 2
/obj/item/light_fixture_frame/attackby(obj/item/weapon/W as obj, mob/living/user as mob)
/obj/item/light_fixture_frame/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params)
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
del(src)
@@ -99,7 +99,7 @@
usr << "The casing is closed."
return
/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/living/user as mob)
/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params)
src.add_fingerprint(user)
if (istype(W, /obj/item/weapon/wrench))
if (src.stage == 1)
@@ -344,7 +344,7 @@
// attack with item - insert light (if right type), otherwise try to break the light
/obj/machinery/light/attackby(obj/item/W, mob/living/user)
/obj/machinery/light/attackby(obj/item/W, mob/living/user, params)
//Light replacer code
if(istype(W, /obj/item/device/lightreplacer))
@@ -730,7 +730,7 @@
// attack bulb/tube with object
// if a syringe, can inject plasma to make it explode
/obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user)
/obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user, params)
..()
if(istype(I, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = I
+1 -1
View File
@@ -72,7 +72,7 @@
overheat()
explosion(get_turf(src), 2, 5, 2, -1)
attackby(var/obj/item/O as obj, var/mob/user as mob)
attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/weapon/tank/plasma))
if(P)
user << "\red The generator already has a plasma tank loaded!"
+2 -2
View File
@@ -26,7 +26,7 @@
/obj/machinery/power/port_gen/process()
ideally we're looking to generate 5000
/obj/machinery/power/port_gen/attackby(obj/item/weapon/W, mob/user)
/obj/machinery/power/port_gen/attackby(obj/item/weapon/W, mob/user, params)
tank [un]loading stuff
/obj/machinery/power/port_gen/attack_hand(mob/user)
@@ -199,7 +199,7 @@ display round(lastgen) and plasmatank amount
/obj/machinery/power/port_gen/pacman/proc/overheat()
explosion(src.loc, 2, 5, 2, -1)
/obj/machinery/power/port_gen/pacman/attackby(var/obj/item/O as obj, var/mob/user as mob)
/obj/machinery/power/port_gen/pacman/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, sheet_path))
var/obj/item/stack/addstack = O
var/amount = min((max_sheets - sheets), addstack.amount)
+1 -1
View File
@@ -50,7 +50,7 @@ var/global/list/rad_collectors = list()
..()
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user)
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/analyzer))
user << "\blue The [W.name] detects that [last_power]W were recently produced."
return 1
+1 -1
View File
@@ -144,7 +144,7 @@
A.process() //TODO: Carn: check this out
/obj/machinery/power/emitter/attackby(obj/item/W, mob/user)
/obj/machinery/power/emitter/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
if(active)
@@ -95,7 +95,7 @@ field_generator power level display
return
/obj/machinery/field_generator/attackby(obj/item/W, mob/user)
/obj/machinery/field_generator/attackby(obj/item/W, mob/user, params)
if(active)
user << "The [src] needs to be off."
return
+1 -1
View File
@@ -29,7 +29,7 @@
new /obj/machinery/singularity/(T, 50)
if(src) del(src)
/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user)
/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
anchored = !anchored
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
@@ -120,7 +120,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return
/obj/structure/particle_accelerator/attackby(obj/item/W, mob/user)
/obj/structure/particle_accelerator/attackby(obj/item/W, mob/user, params)
if(istool(W))
if(src.process_tool_hit(W,user))
return
@@ -314,7 +314,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return
/obj/machinery/particle_accelerator/attackby(obj/item/W, mob/user)
/obj/machinery/particle_accelerator/attackby(obj/item/W, mob/user, params)
if(istool(W))
if(src.process_tool_hit(W,user))
return
+1 -1
View File
@@ -107,7 +107,7 @@
return
/obj/machinery/power/smes/attackby(obj/item/I, mob/user)
/obj/machinery/power/smes/attackby(obj/item/I, mob/user, params)
//opening using screwdriver
if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", initial(icon_state), I))
update_icon()
+3 -3
View File
@@ -57,7 +57,7 @@ var/list/solars_list = list()
/obj/machinery/power/solar/attackby(obj/item/weapon/W, mob/user)
/obj/machinery/power/solar/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
@@ -223,7 +223,7 @@ var/list/solars_list = list()
glass_type = null
/obj/item/solar_assembly/attackby(var/obj/item/weapon/W, var/mob/user)
/obj/item/solar_assembly/attackby(var/obj/item/weapon/W, var/mob/user, params)
if(!anchored && isturf(loc))
if(istype(W, /obj/item/weapon/wrench))
@@ -396,7 +396,7 @@ var/list/solars_list = list()
ui.push_data(data)
return
/obj/machinery/power/solar_control/attackby(I as obj, user as mob)
/obj/machinery/power/solar_control/attackby(I as obj, user as mob, params)
if(istype(I, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
+1 -1
View File
@@ -58,7 +58,7 @@
if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet
control.cdir = angle
/obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user)
/obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user, params)
if(istype(W, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+1 -1
View File
@@ -222,7 +222,7 @@
doors += P
/*
/obj/machinery/computer/turbine_computer/attackby(I as obj, user as mob)
/obj/machinery/computer/turbine_computer/attackby(I as obj, user as mob, params)
if(istype(I, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))