diff --git a/aurorastation.dme b/aurorastation.dme index b53df7a9db0..cf533e0f9fa 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -10,7 +10,6 @@ #define DEBUG // END_PREFERENCES // BEGIN_INCLUDE -#include "code\_macros.dm" #include "code\global.dm" #include "code\hub.dm" #include "code\names.dm" @@ -18,6 +17,7 @@ #include "code\world.dm" #include "code\__defines\_compile_options.dm" #include "code\__defines\_layers.dm" +#include "code\__defines\_macros.dm" #include "code\__defines\admin.dm" #include "code\__defines\atmos.dm" #include "code\__defines\callback.dm" diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index 7d40486a025..92dd49cc3aa 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -88,7 +88,7 @@ return 1 /obj/machinery/atmospherics/binary/circulator/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) anchored = !anchored user.visible_message("[user.name] [anchored ? "secures" : "unsecures"] the bolts holding [src.name] to the floor.", \ diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 347f483b8fc..bf8c19d1bc5 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -235,7 +235,7 @@ return /obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() if (unlocked) user << "You cannot unwrench \the [src], turn it off first." diff --git a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm index a4e58ed9411..180385f2d88 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm @@ -86,7 +86,7 @@ add_overlay("hi-turb") attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) anchored = !anchored user << "You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor." @@ -257,7 +257,7 @@ attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) anchored = !anchored turbine = null user << "You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor." diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 94cc5f832af..b9076622938 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -214,7 +214,7 @@ Thus, the two variables affect pump operation are set in New(): update_icon() /obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() if (!(stat & NOPOWER) && use_power) user << "You cannot unwrench this [src], turn it off first." diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index 3b34022b221..ee8b2688040 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -84,7 +84,7 @@ update_icon() /obj/machinery/atmospherics/omni/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(!istype(W, /obj/item/weapon/wrench)) + if(!iswrench(W)) return ..() var/int_pressure = 0 diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm index f3377e206e8..c75a3e25a40 100644 --- a/code/ATMOSPHERICS/components/portables_connector.dm +++ b/code/ATMOSPHERICS/components/portables_connector.dm @@ -131,7 +131,7 @@ /obj/machinery/atmospherics/portables_connector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() if (connected_device) user << "You cannot unwrench \the [src], dettach \the [connected_device] first." diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index c71a6be5986..1dbaad64c2e 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -129,7 +129,7 @@ ..() /obj/machinery/atmospherics/trinary/filter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index d299ea50198..b52e3676ff8 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -104,7 +104,7 @@ return 1 /obj/machinery/atmospherics/trinary/mixer/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm index aa045c69e96..f5bfc7a53ab 100644 --- a/code/ATMOSPHERICS/components/tvalve.dm +++ b/code/ATMOSPHERICS/components/tvalve.dm @@ -342,7 +342,7 @@ go_to_side() /obj/machinery/atmospherics/tvalve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() if (istype(src, /obj/machinery/atmospherics/tvalve/digital)) user << "You cannot unwrench \the [src], it's too complicated." diff --git a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm index f2abab8e9a1..636de1aa4d7 100644 --- a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm @@ -66,7 +66,7 @@ return 1 attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() var/turf/T = src.loc if (level==1 && isturf(T) && !T.is_plating()) diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 4817a1ab851..35bbee2fec4 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -350,7 +350,7 @@ return /obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if (!WT.welding) user << "\The [WT] must be turned on!" @@ -390,7 +390,7 @@ update_icon() /obj/machinery/atmospherics/unary/vent_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() if (!(stat & NOPOWER) && use_power) user << "You cannot unwrench \the [src], turn it off first." diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 7e07cce2ca0..b40a425ffdf 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -260,7 +260,7 @@ update_icon() /obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (istype(W, /obj/item/weapon/wrench)) + if (iswrench(W)) if (!(stat & NOPOWER) && use_power) user << "You cannot unwrench \the [src], turn it off first." return 1 @@ -285,7 +285,7 @@ qdel(src) return 1 - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if (!WT.welding) user << "\The [WT] must be turned on!" diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index c2bdaf61382..b5503c87571 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -300,7 +300,7 @@ open() /obj/machinery/atmospherics/valve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() if (istype(src, /obj/machinery/atmospherics/valve/digital)) user << "You cannot unwrench \the [src], it's too complicated." diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index c93968604a1..dc0d3dca273 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -80,7 +80,7 @@ if(istype(W,/obj/item/device/pipe_painter)) return 0 - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() var/turf/T = src.loc if (level==1 && isturf(T) && !T.is_plating()) diff --git a/code/_macros.dm b/code/__defines/_macros.dm similarity index 82% rename from code/_macros.dm rename to code/__defines/_macros.dm index 87e3d76b52d..ae81dc70952 100644 --- a/code/_macros.dm +++ b/code/__defines/_macros.dm @@ -1,56 +1,70 @@ -#define Clamp(x, y, z) (x <= y ? y : (x >= z ? z : x)) -#define CLAMP01(x) (Clamp(x, 0, 1)) - -#define span(class, text) ("[text]") - -#define isAI(A) istype(A, /mob/living/silicon/ai) -#define isDrone(A) istype(A, /mob/living/silicon/robot/drone) - -#define isalien(A) istype(A, /mob/living/carbon/alien) - -#define isanimal(A) istype(A, /mob/living/simple_animal) - -#define isairlock(A) istype(A, /obj/machinery/door/airlock) - -#define isbrain(A) istype(A, /mob/living/carbon/brain) - -#define iscarbon(A) istype(A, /mob/living/carbon) - -#define iscorgi(A) istype(A, /mob/living/simple_animal/corgi) - -#define isEye(A) istype(A, /mob/eye) - -#define ishuman(A) istype(A, /mob/living/carbon/human) - -#define isliving(A) istype(A, /mob/living) - -#define ismouse(A) istype(A, /mob/living/simple_animal/mouse) - -#define isnewplayer(A) istype(A, /mob/new_player) - -#define isobj(A) istype(A, /obj) - -#define isobserver(A) istype(A, /mob/dead/observer) - -#define isorgan(A) istype(A, /obj/item/organ/external) - -#define ispAI(A) istype(A, /mob/living/silicon/pai) - -#define isrobot(A) istype(A, /mob/living/silicon/robot) - -#define issilicon(A) istype(A, /mob/living/silicon) - -#define isslime(A) istype(A, /mob/living/carbon/slime) - -#define to_chat(target, message) target << message -#define MAP_IMAGE_PATH "nano/images/" -#define map_image_file_name(z_level) "Aurora-[z_level].png" -#define to_world(message) world << message -#define sound_to(target, sound) target << sound -#define to_file(file_entry, file_content) file_entry << file_content -#define show_browser(target, browser_content, browser_name) target << browse(browser_content, browser_name) -#define send_rsc(target, rsc_content, rsc_name) target << browse_rsc(rsc_content, rsc_name) - -#define CanInteract(user, state) (CanUseTopic(user, state) == STATUS_INTERACTIVE) - -#define isopenturf(target) istype(target, /turf/simulated/open) +#define Clamp(x, y, z) (x <= y ? y : (x >= z ? z : x)) +#define CLAMP01(x) (Clamp(x, 0, 1)) + +#define span(class, text) ("[text]") + +#define isAI(A) istype(A, /mob/living/silicon/ai) +#define isDrone(A) istype(A, /mob/living/silicon/robot/drone) + +#define isalien(A) istype(A, /mob/living/carbon/alien) + +#define isanimal(A) istype(A, /mob/living/simple_animal) + +#define isairlock(A) istype(A, /obj/machinery/door/airlock) + +#define isbrain(A) istype(A, /mob/living/carbon/brain) + +#define iscarbon(A) istype(A, /mob/living/carbon) + +#define iscorgi(A) istype(A, /mob/living/simple_animal/corgi) + +#define isEye(A) istype(A, /mob/eye) + +#define ishuman(A) istype(A, /mob/living/carbon/human) + +#define isliving(A) istype(A, /mob/living) + +#define ismouse(A) istype(A, /mob/living/simple_animal/mouse) + +#define isnewplayer(A) istype(A, /mob/new_player) + +#define isobj(A) istype(A, /obj) + +#define isobserver(A) istype(A, /mob/dead/observer) + +#define isorgan(A) istype(A, /obj/item/organ/external) + +#define ispAI(A) istype(A, /mob/living/silicon/pai) + +#define isrobot(A) istype(A, /mob/living/silicon/robot) + +#define issilicon(A) istype(A, /mob/living/silicon) + +#define isslime(A) istype(A, /mob/living/carbon/slime) + +#define isscrewdriver(A) istype(A, /obj/item/weapon/screwdriver) + +#define iswrench(A) istype(A, /obj/item/weapon/wrench) + +#define iswelder(A) istype(A, /obj/item/weapon/weldingtool) + +#define iscoil(A) istype(A, /obj/item/stack/cable_coil) + +#define iswirecutter(A) istype(A, /obj/item/weapon/wirecutters) + +#define ismultitool(A) istype(A, /obj/item/device/multitool) + +#define iscrowbar(A) istype(A, /obj/item/weapon/crowbar) + +#define to_chat(target, message) target << message +#define MAP_IMAGE_PATH "nano/images/" +#define map_image_file_name(z_level) "Aurora-[z_level].png" +#define to_world(message) world << message +#define sound_to(target, sound) target << sound +#define to_file(file_entry, file_content) file_entry << file_content +#define show_browser(target, browser_content, browser_name) target << browse(browser_content, browser_name) +#define send_rsc(target, rsc_content, rsc_name) target << browse_rsc(rsc_content, rsc_name) + +#define CanInteract(user, state) (CanUseTopic(user, state) == STATUS_INTERACTIVE) + +#define isopenturf(target) istype(target, /turf/simulated/open) diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index d8b3176b969..fe77d32c46a 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -827,46 +827,6 @@ var/global/list/common_tools = list( return 1 return 0 -/proc/iswrench(O) - if(istype(O, /obj/item/weapon/wrench)) - return 1 - return 0 - -/proc/iswelder(O) - if(istype(O, /obj/item/weapon/weldingtool)) - return 1 - return 0 - -/proc/iscoil(O) - if(istype(O, /obj/item/stack/cable_coil)) - return 1 - return 0 - -/proc/iswirecutter(O) - if(istype(O, /obj/item/weapon/wirecutters)) - return 1 - return 0 - -/proc/isscrewdriver(O) - if(istype(O, /obj/item/weapon/screwdriver)) - return 1 - return 0 - -/proc/ismultitool(O) - if(istype(O, /obj/item/device/multitool)) - return 1 - return 0 - -/proc/iscrowbar(O) - if(istype(O, /obj/item/weapon/crowbar)) - return 1 - return 0 - -/proc/iswire(O) - if(istype(O, /obj/item/stack/cable_coil)) - return 1 - return 0 - proc/is_hot(obj/item/W as obj) switch(W.type) if(/obj/item/weapon/weldingtool) @@ -918,9 +878,9 @@ proc/is_hot(obj/item/W as obj) if(W.sharp) return 1 return ( \ W.sharp || \ - istype(W, /obj/item/weapon/screwdriver) || \ + isscrewdriver(W) || \ istype(W, /obj/item/weapon/pen) || \ - istype(W, /obj/item/weapon/weldingtool) || \ + iswelder(W) || \ istype(W, /obj/item/weapon/flame/lighter/zippo) || \ istype(W, /obj/item/weapon/flame/match) || \ istype(W, /obj/item/clothing/mask/smokable/cigarette) || \ diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 066c357a22e..196f2e623aa 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -116,14 +116,14 @@ var/list/wireColours = list("red", "blue", "green", "darkred", "orange", "brown" var/obj/item/I = L.get_active_hand() holder.add_hiddenprint(L) if(href_list["cut"]) // Toggles the cut/mend status - if(istype(I, /obj/item/weapon/wirecutters)) + if(iswirecutter(I)) var/colour = href_list["cut"] CutWireColour(colour) else L << "You need wirecutters!" else if(href_list["pulse"]) - if(istype(I, /obj/item/device/multitool)) + if(ismultitool(I)) var/colour = href_list["pulse"] PulseColour(colour) else diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 346b7652378..3055c5001b8 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -322,7 +322,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50) /obj/item/weapon/module/power_control/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (istype(W, /obj/item/device/multitool)) + if (ismultitool(W)) var/obj/item/weapon/circuitboard/ghettosmes/newcircuit = new/obj/item/weapon/circuitboard/ghettosmes(user.loc) qdel(src) user.put_in_hands(newcircuit) @@ -406,7 +406,7 @@ icon_state = "neuralbroke" /obj/item/weapon/neuralbroke/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) new /obj/item/device/encryptionkey/hivenet(user.loc) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You bypass the fried security chip and extract the encryption key." diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 1395ef58188..d10e0be3e32 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -86,7 +86,7 @@ /obj/machinery/dna_scannernew/proc/eject_occupant() src.go_out() for(var/obj/O in src) - if((!istype(O,/obj/item/weapon/reagent_containers)) && (!istype(O,/obj/item/weapon/circuitboard/clonescanner)) && (!istype(O,/obj/item/weapon/stock_parts)) && (!istype(O,/obj/item/stack/cable_coil))) + if((!istype(O,/obj/item/weapon/reagent_containers)) && (!istype(O,/obj/item/weapon/circuitboard/clonescanner)) && (!istype(O,/obj/item/weapon/stock_parts)) && (!iscoil(O))) O.loc = get_turf(src)//Ejects items that manage to get in there (exluding the components) if(!occupant) for(var/mob/M in src)//Failsafe so you can get mobs out diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm index e85c813c0c0..efb99651249 100644 --- a/code/game/machinery/CableLayer.dm +++ b/code/game/machinery/CableLayer.dm @@ -27,7 +27,7 @@ return /obj/machinery/cablelayer/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/stack/cable_coil)) + if(iscoil(O)) var/result = load_cable(O) if(!result) @@ -36,7 +36,7 @@ user << "You load [result] lengths of cable into [src]." return - if(istype(O, /obj/item/weapon/wirecutters)) + if(iswirecutter(O)) if(cable && cable.amount) var/m = round(input(usr,"Please specify the length of cable to cut","Cut cable",min(cable.amount,30)) as num, 1) m = min(m, cable.amount) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 61a247b07ab..202cdb78c37 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -751,13 +751,13 @@ switch(buildstage) if(2) - if(istype(W, /obj/item/weapon/screwdriver)) // Opening that Air Alarm up. + if(isscrewdriver(W)) // Opening that Air Alarm up. wiresexposed = !wiresexposed user << "You [wiresexposed ? "open" : "close"] the maintenance panel." update_icon() return - if (wiresexposed && istype(W, /obj/item/weapon/wirecutters)) + if (wiresexposed && iswirecutter(W)) user.visible_message("[user] has cut the wires inside \the [src]!", "You cut the wires inside \the [src].") playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) new/obj/item/stack/cable_coil(get_turf(src), 5) @@ -778,7 +778,7 @@ return if(1) - if(istype(W, /obj/item/stack/cable_coil)) + if(iscoil(W)) var/obj/item/stack/cable_coil/C = W if (C.use(5)) user << "You wire \the [src]." @@ -790,7 +790,7 @@ user << "You need 5 pieces of cable to do wire \the [src]." return - else if(istype(W, /obj/item/weapon/crowbar)) + else if(iscrowbar(W)) user << "You start prying out the circuit." playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) if(do_after(user,20)) @@ -808,7 +808,7 @@ update_icon() return - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) user << "You remove the air alarm assembly from the wall!" new /obj/item/frame/air_alarm(get_turf(user)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 1aafb6857b8..194d2daad38 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -260,7 +260,7 @@ update_flag valve_open = !valve_open /obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(!istype(W, /obj/item/weapon/wrench) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda)) + if(!iswrench(W) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda)) visible_message("\The [user] hits \the [src] with \a [W]!") src.health -= W.force src.add_fingerprint(user) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index cebccf86cd6..080712231db 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -91,7 +91,7 @@ return ..() /obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "You begin to unfasten \the [src]..." diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index b2be1b5376f..ce4514eff7c 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -109,7 +109,7 @@ update_icon() return - else if (istype(W, /obj/item/weapon/wrench)) + else if (iswrench(W)) if(connected_port) disconnect() user << "You disconnect \the [src] from the port." @@ -168,7 +168,7 @@ power_change() return - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) if(!cell) user << "There is no power cell installed." return diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 9afc19c7dbd..7b2b2ae3624 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -206,7 +206,7 @@ update_connected_network() /obj/machinery/portable_atmospherics/powered/scrubber/huge/attackby(var/obj/item/I as obj, var/mob/user as mob) - if(istype(I, /obj/item/weapon/wrench)) + if(iswrench(I)) if(on) user << "Turn \the [src] off first!" return @@ -220,7 +220,7 @@ //doesn't use power cells if(istype(I, /obj/item/weapon/cell)) return - if (istype(I, /obj/item/weapon/screwdriver)) + if (isscrewdriver(I)) return //doesn't hold tanks @@ -234,7 +234,7 @@ name = "Stationary Air Scrubber" /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/attackby(var/obj/item/I as obj, var/mob/user as mob) - if(istype(I, /obj/item/weapon/wrench)) + if(iswrench(I)) user << "The bolts are too tight for you to unscrew!" return diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index cf049bd23f7..e0a88e1fb1d 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -137,7 +137,7 @@ if(panel_open) //Don't eat multitools or wirecutters used on an open lathe. - if(istype(O, /obj/item/device/multitool) || istype(O, /obj/item/weapon/wirecutters)) + if(ismultitool(O) || iswirecutter(O)) attack_hand(user) return diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 7709c309493..d4d4b4df83f 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -55,11 +55,11 @@ return /obj/machinery/bot/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(!locked) open = !open user << "Maintenance panel is now [src.open ? "opened" : "closed"]." - else if(istype(W, /obj/item/weapon/weldingtool)) + else if(iswelder(W)) if(health < maxhealth) if(open) health = min(maxhealth, health+10) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 6397f1dfc59..80ac5437590 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -94,7 +94,7 @@ C.loc = src cell = C updateDialog() - else if(istype(I,/obj/item/weapon/screwdriver)) + else if(isscrewdriver(I)) if(locked) user << "The maintenance hatch cannot be opened or closed while the controls are locked." return @@ -109,7 +109,7 @@ icon_state = "mulebot0" updateDialog() - else if (istype(I, /obj/item/weapon/wrench)) + else if (iswrench(I)) if (src.health < maxhealth) src.health = min(maxhealth, src.health+25) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 375936f2bba..58f77cb6320 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -59,7 +59,7 @@ user.visible_message("[user] inserts a cell into the charger.", "You insert a cell into the charger.") chargelevel = -1 update_icon() - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) if(charging) user << "Remove the cell first!" return diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index f25b5e6c255..7ae753b6bf5 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -240,7 +240,7 @@ user.drop_item() qdel(W) return - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) if(locked && (anchored || occupant)) user << "Can not do that while [src] is in use." else diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index ba75ebc3ccc..2b522e36f20 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -14,13 +14,13 @@ switch(state) if(0) - if(istype(P, /obj/item/weapon/wrench)) + if(iswrench(P)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) user << "You wrench the frame into place." anchored = 1 state = 1 - if(istype(P, /obj/item/weapon/weldingtool)) + if(iswelder(P)) var/obj/item/weapon/weldingtool/WT = P if(!WT.isOn()) user << "The welder must be on for this task." @@ -32,7 +32,7 @@ new /obj/item/stack/material/plasteel( loc, 4) qdel(src) if(1) - if(istype(P, /obj/item/weapon/wrench)) + if(iswrench(P)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) user << "You unfasten the frame." @@ -45,12 +45,12 @@ circuit = P user.drop_item() P.loc = src - if(istype(P, /obj/item/weapon/screwdriver) && circuit) + if(isscrewdriver(P) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You screw the circuit board into place." state = 2 icon_state = "2" - if(istype(P, /obj/item/weapon/crowbar) && circuit) + if(iscrowbar(P) && circuit) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) user << "You remove the circuit board." state = 1 @@ -58,12 +58,12 @@ circuit.loc = loc circuit = null if(2) - if(istype(P, /obj/item/weapon/screwdriver) && circuit) + if(isscrewdriver(P) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You unfasten the circuit board." state = 1 icon_state = "1" - if(istype(P, /obj/item/stack/cable_coil)) + if(iscoil(P)) var/obj/item/stack/cable_coil/C = P if (C.get_amount() < 5) user << "You need five coils of wire to add them to the frame." @@ -77,7 +77,7 @@ user << "You add cables to the frame." return if(3) - if(istype(P, /obj/item/weapon/wirecutters)) + if(iswirecutter(P)) if (brain) user << "Get that brain out of there first" else @@ -145,7 +145,7 @@ usr << "Added [P]." icon_state = "3b" - if(istype(P, /obj/item/weapon/crowbar) && brain) + if(iscrowbar(P) && brain) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) user << "You remove the brain." brain.loc = loc @@ -153,7 +153,7 @@ icon_state = "3" if(4) - if(istype(P, /obj/item/weapon/crowbar)) + if(iscrowbar(P)) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) user << "You remove the glass panel." state = 3 @@ -164,7 +164,7 @@ new /obj/item/stack/material/glass/reinforced( loc, 2 ) return - if(istype(P, /obj/item/weapon/screwdriver)) + if(isscrewdriver(P)) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You connect the monitor." if(!brain) @@ -227,7 +227,7 @@ else user << "ERROR: Unable to locate artificial intelligence." return - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) if(anchored) user.visible_message("\The [user] starts to unbolt \the [src] from the plating...") if(!do_after(user,40)) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 54734929c87..7864b8d7406 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -13,13 +13,13 @@ /obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob) switch(state) if(0) - if(istype(P, /obj/item/weapon/wrench)) + if(iswrench(P)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) user << "You wrench the frame into place." src.anchored = 1 src.state = 1 - if(istype(P, /obj/item/weapon/weldingtool)) + if(iswelder(P)) var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) user << "The welding tool must be on to complete this task." @@ -31,7 +31,7 @@ new /obj/item/stack/material/steel( src.loc, 5 ) qdel(src) if(1) - if(istype(P, /obj/item/weapon/wrench)) + if(iswrench(P)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) user << "You unfasten the frame." @@ -48,12 +48,12 @@ P.loc = src else user << "This frame does not accept circuit boards of this type!" - if(istype(P, /obj/item/weapon/screwdriver) && circuit) + if(isscrewdriver(P) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You screw the circuit board into place." src.state = 2 src.icon_state = "2" - if(istype(P, /obj/item/weapon/crowbar) && circuit) + if(iscrowbar(P) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) user << "You remove the circuit board." src.state = 1 @@ -61,12 +61,12 @@ circuit.loc = src.loc src.circuit = null if(2) - if(istype(P, /obj/item/weapon/screwdriver) && circuit) + if(isscrewdriver(P) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You unfasten the circuit board." src.state = 1 src.icon_state = "1" - if(istype(P, /obj/item/stack/cable_coil)) + if(iscoil(P)) var/obj/item/stack/cable_coil/C = P if (C.get_amount() < 5) user << "You need five coils of wire to add them to the frame." @@ -79,7 +79,7 @@ state = 3 icon_state = "3" if(3) - if(istype(P, /obj/item/weapon/wirecutters)) + if(iswirecutter(P)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You remove the cables." src.state = 2 @@ -100,13 +100,13 @@ src.state = 4 src.icon_state = "4" if(4) - if(istype(P, /obj/item/weapon/crowbar)) + if(iscrowbar(P)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) user << "You remove the glass panel." src.state = 3 src.icon_state = "3" new /obj/item/stack/material/glass( src.loc, 2 ) - if(istype(P, /obj/item/weapon/screwdriver)) + if(isscrewdriver(P)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You connect the monitor." var/B = new src.circuit.build_path ( src.loc ) diff --git a/code/game/machinery/computer/camera_circuit.dm b/code/game/machinery/computer/camera_circuit.dm index 8db87c36ae7..60abd05a4bf 100644 --- a/code/game/machinery/computer/camera_circuit.dm +++ b/code/game/machinery/computer/camera_circuit.dm @@ -38,7 +38,7 @@ attackby(var/obj/item/I, var/mob/user)//if(health > 50) ..() - else if(istype(I,/obj/item/weapon/screwdriver)) + else if(isscrewdriver(I)) secured = !secured user.visible_message("The [src] can [secured ? "no longer" : "now"] be modified.") updateBuildPath() diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index b8138b262ea..96cb6914f23 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -93,7 +93,7 @@ return text /obj/machinery/computer/attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver) && circuit) + if(isscrewdriver(I) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index e42d5fccbbf..b8e09200390 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -53,7 +53,7 @@ /* /obj/machinery/computer/pod/attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if(stat & BROKEN) diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index 8ad18ad985c..4b3a5a90b08 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -27,7 +27,7 @@ var/prison_shuttle_timeleft = 0 return src.attack_hand(user) attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 762dafbdeea..7e7195d50b5 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -30,7 +30,7 @@ attackby(obj/item/P as obj, mob/user as mob) switch(state) if(1) - if(istype(P, /obj/item/stack/cable_coil)) + if(iscoil(P)) var/obj/item/stack/cable_coil/C = P if (C.get_amount() < 5) user << "You need five lengths of cable to add them to the frame." @@ -43,7 +43,7 @@ state = 2 icon_state = "box_1" else - if(istype(P, /obj/item/weapon/wrench)) + if(iswrench(P)) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user << "You dismantle the frame" new /obj/item/stack/material/steel(src.loc, 5) @@ -73,7 +73,7 @@ else user << "This frame does not accept circuit boards of this type!" else - if(istype(P, /obj/item/weapon/wirecutters)) + if(iswirecutter(P)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You remove the cables." state = 1 @@ -82,7 +82,7 @@ A.amount = 5 if(3) - if(istype(P, /obj/item/weapon/crowbar)) + if(iscrowbar(P)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) state = 2 circuit.loc = src.loc @@ -98,7 +98,7 @@ components = null icon_state = "box_1" else - if(istype(P, /obj/item/weapon/screwdriver)) + if(isscrewdriver(P)) var/component_check = 1 for(var/R in req_components) if(req_components[R] > 0) @@ -134,7 +134,7 @@ for(var/I in req_components) if(istype(P, text2path(I)) && (req_components[I] > 0)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - if(istype(P, /obj/item/stack/cable_coil)) + if(iscoil(P)) var/obj/item/stack/cable_coil/CP = P if(CP.get_amount() > 1) var/camt = min(CP.amount, req_components[I]) // amount of cable to take, idealy amount required, but limited by amount provided @@ -153,7 +153,7 @@ update_desc() break user << desc - if(P && P.loc != src && !istype(P, /obj/item/stack/cable_coil)) + if(P && P.loc != src && !iscoil(P)) user << "You cannot add that component to the machine!" diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 2f01bcb7ba4..601af3bdbfc 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -181,7 +181,7 @@ for reference: visible_message("BZZzZZzZZzZT") return return - else if (istype(W, /obj/item/weapon/wrench)) + else if (iswrench(W)) if (src.health < src.maxhealth) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) src.health = src.maxhealth diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index f1f1f57e47d..3b4e0ed2b16 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -862,7 +862,7 @@ About the new airlock wires panel: var/obj/item/device/magnetic_lock/newbracer = C newbracer.attachto(src, user) return - if(!repairing && (istype(C, /obj/item/weapon/weldingtool) && !( src.operating > 0 ) && src.density)) + if(!repairing && (iswelder(C) && !( src.operating > 0 ) && src.density)) var/obj/item/weapon/weldingtool/W = C if(W.remove_fuel(0,user)) if(!src.welded) @@ -874,7 +874,7 @@ About the new airlock wires panel: return else return - else if(istype(C, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(C)) if (src.p_open) if (stat & BROKEN) usr << "The panel is broken and cannot be closed." @@ -883,16 +883,16 @@ About the new airlock wires panel: else src.p_open = 1 src.update_icon() - else if(istype(C, /obj/item/weapon/wirecutters)) + else if(iswirecutter(C)) return src.attack_hand(user) - else if(istype(C, /obj/item/device/multitool)) + else if(ismultitool(C)) return src.attack_hand(user) else if(istype(C, /obj/item/device/assembly/signaler)) return src.attack_hand(user) else if(istype(C, /obj/item/weapon/pai_cable)) // -- TLE var/obj/item/weapon/pai_cable/cable = C cable.plugin(src, user) - else if(!repairing && istype(C, /obj/item/weapon/crowbar)) + else if(!repairing && iscrowbar(C)) if(src.p_open && (operating < 0 || (!operating && welded && !src.arePowerSystemsOn() && density && (!src.locked || (stat & BROKEN)))) ) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.") diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 5e34e661de8..f6f6d1fa719 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -103,7 +103,7 @@ // This only works on broken doors or doors without power. Also allows repair with Plasteel. /obj/machinery/door/blast/attackby(obj/item/weapon/C as obj, mob/user as mob) src.add_fingerprint(user) - if(istype(C, /obj/item/weapon/crowbar) || (istype(C, /obj/item/weapon/material/twohanded/fireaxe) && C:wielded == 1) || (istype(C, /obj/item/weapon/melee/hammer))) + if(iscrowbar(C) || (istype(C, /obj/item/weapon/material/twohanded/fireaxe) && C:wielded == 1) || (istype(C, /obj/item/weapon/melee/hammer))) if (((stat & NOPOWER) || (stat & BROKEN)) && !( src.operating )) force_toggle() else diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 4a73e7143b7..7a77b6551b4 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -296,7 +296,7 @@ return - if(repairing && istype(I, /obj/item/weapon/weldingtool)) + if(repairing && iswelder(I)) if(!density) user << "\The [src] must be closed before you can repair it." return @@ -313,7 +313,7 @@ repairing = null return - if(repairing && istype(I, /obj/item/weapon/crowbar)) + if(repairing && iscrowbar(I)) user << "You remove \the [repairing]." playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) repairing.loc = user.loc diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 2fc33358e7d..2d799ff2028 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -209,7 +209,7 @@ add_fingerprint(user) if(operating) return//Already doing something. - if(istype(C, /obj/item/weapon/weldingtool) && !repairing) + if(iswelder(C) && !repairing) var/obj/item/weapon/weldingtool/W = C if(W.remove_fuel(0, user)) blocked = !blocked @@ -220,14 +220,14 @@ update_icon() return - if(density && istype(C, /obj/item/weapon/screwdriver)) + if(density && isscrewdriver(C)) hatch_open = !hatch_open user.visible_message("[user] has [hatch_open ? "opened" : "closed"] \the [src] maintenance panel.", "You have [hatch_open ? "opened" : "closed"] the [src] maintenance panel.") update_icon() return - if(blocked && istype(C, /obj/item/weapon/crowbar) && !repairing) + if(blocked && iscrowbar(C) && !repairing) if(!hatch_open) user << "You must open the maintenance panel first!" else @@ -256,11 +256,11 @@ user << "\The [src] is welded shut!" return - if(istype(C, /obj/item/weapon/crowbar) || istype(C,/obj/item/weapon/material/twohanded/fireaxe) || (istype(C, /obj/item/weapon/melee/hammer))) + if(iscrowbar(C) || istype(C,/obj/item/weapon/material/twohanded/fireaxe) || (istype(C, /obj/item/weapon/melee/hammer))) if(operating) return - if(blocked && istype(C, /obj/item/weapon/crowbar)) + if(blocked && iscrowbar(C)) user.visible_message("\The [user] pries at \the [src] with \a [C], but \the [src] is welded in place!",\ "You try to pry \the [src] [density ? "open" : "closed"], but it is welded in place!",\ "You hear someone struggle and metal straining.") @@ -275,7 +275,7 @@ "You start forcing \the [src] [density ? "open" : "closed"] with \the [C]!",\ "You hear metal strain.") if(do_after(user,30)) - if(istype(C, /obj/item/weapon/crowbar) || (istype(C, /obj/item/weapon/melee/hammer))) + if(iscrowbar(C) || (istype(C, /obj/item/weapon/melee/hammer))) if(stat & (BROKEN|NOPOWER) || !density) user.visible_message("\The [user] forces \the [src] [density ? "open" : "closed"] with \a [C]!",\ "You force \the [src] [density ? "open" : "closed"] with \the [C]!",\ diff --git a/code/game/machinery/doors/firedoor_assembly.dm b/code/game/machinery/doors/firedoor_assembly.dm index c01fff5bed3..e9c34673c29 100644 --- a/code/game/machinery/doors/firedoor_assembly.dm +++ b/code/game/machinery/doors/firedoor_assembly.dm @@ -15,7 +15,7 @@ obj/structure/firedoor_assembly/update_icon() icon_state = "door_construction" obj/structure/firedoor_assembly/attackby(C as obj, mob/user as mob) - if(istype(C, /obj/item/stack/cable_coil) && !wired && anchored) + if(iscoil(C) && !wired && anchored) var/obj/item/stack/cable_coil/cable = C if (cable.get_amount() < 1) user << "You need one length of coil to wire \the [src]." @@ -26,7 +26,7 @@ obj/structure/firedoor_assembly/attackby(C as obj, mob/user as mob) wired = 1 user << "You wire \the [src]." - else if(istype(C, /obj/item/weapon/wirecutters) && wired ) + else if(iswirecutter(C) && wired ) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) user.visible_message("[user] cuts the wires from \the [src].", "You start to cut the wires from \the [src].") @@ -46,13 +46,13 @@ obj/structure/firedoor_assembly/attackby(C as obj, mob/user as mob) qdel(src) else user << "You must secure \the [src] first!" - else if(istype(C, /obj/item/weapon/wrench)) + else if(iswrench(C)) anchored = !anchored playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user.visible_message("[user] has [anchored ? "" : "un" ]secured \the [src]!", "You have [anchored ? "" : "un" ]secured \the [src]!") update_icon() - else if(!anchored && istype(C, /obj/item/weapon/weldingtool)) + else if(!anchored && iswelder(C)) var/obj/item/weapon/weldingtool/WT = C if(WT.remove_fuel(0, user)) user.visible_message("[user] dissassembles \the [src].", diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 639404c1e19..73216a473e9 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -180,7 +180,7 @@ return 1 //If it's emagged, crowbar can pry electronics out. - if (src.operating == -1 && istype(I, /obj/item/weapon/crowbar)) + if (src.operating == -1 && iscrowbar(I)) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] removes the electronics from the windoor.", "You start to remove electronics from the windoor.") if (do_after(user,40)) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 2dbc9500890..459afb99419 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -82,7 +82,7 @@ /obj/machinery/firealarm/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) - if (istype(W, /obj/item/weapon/screwdriver) && buildstage == 2) + if (isscrewdriver(W) && buildstage == 2) if(!wiresexposed) set_light(0) wiresexposed = !wiresexposed @@ -93,20 +93,20 @@ set_light(0) switch(buildstage) if(2) - if (istype(W, /obj/item/device/multitool)) + if (ismultitool(W)) src.detecting = !( src.detecting ) if (src.detecting) user.visible_message("\The [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.") else user.visible_message("\The [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.") - else if (istype(W, /obj/item/weapon/wirecutters)) + else if (iswirecutter(W)) user.visible_message("\The [user] has cut the wires inside \the [src]!", "You have cut the wires inside \the [src].") new/obj/item/stack/cable_coil(get_turf(src), 5) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) buildstage = 1 update_icon() if(1) - if(istype(W, /obj/item/stack/cable_coil)) + if(iscoil(W)) var/obj/item/stack/cable_coil/C = W if (C.use(5)) user << "You wire \the [src]." @@ -115,7 +115,7 @@ else user << "You need 5 pieces of cable to wire \the [src]." return - else if(istype(W, /obj/item/weapon/crowbar)) + else if(iscrowbar(W)) user << "You pry out the circuit!" playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) spawn(20) @@ -130,7 +130,7 @@ buildstage = 1 update_icon() - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) user << "You remove the fire alarm assembly from the wall!" new /obj/item/frame/fire_alarm(get_turf(user)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 5180a01d961..a9cb0634af7 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -48,7 +48,7 @@ //Don't want to render prison breaks impossible /obj/machinery/flasher/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/wirecutters)) + if (iswirecutter(W)) add_fingerprint(user) src.disable = !src.disable if (src.disable) @@ -112,7 +112,7 @@ src.flash() /obj/machinery/flasher/portable/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/wrench)) + if (iswrench(W)) add_fingerprint(user) src.anchored = !src.anchored diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index 85ec1193925..249bff64571 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -102,7 +102,7 @@ /obj/machinery/floodlight/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/screwdriver)) + if (isscrewdriver(W)) if (!open) if(unlocked) unlocked = 0 @@ -111,7 +111,7 @@ unlocked = 1 user << "You unscrew the battery panel." - if (istype(W, /obj/item/weapon/crowbar)) + if (iscrowbar(W)) if(unlocked) if(open) open = 0 diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index 592323fc23f..9fd81b123b5 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -24,10 +24,10 @@ var/list/floor_light_cache = list() anchored = 1 /obj/machinery/floor_light/attackby(var/obj/item/W, var/mob/user) - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) anchored = !anchored visible_message("\The [user] has [anchored ? "attached" : "detached"] \the [src].") - else if(istype(W, /obj/item/weapon/weldingtool) && (damaged || (stat & BROKEN))) + else if(iswelder(W) && (damaged || (stat & BROKEN))) var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0, user)) user << "\The [src] must be on to complete this task." diff --git a/code/game/machinery/floorlayer.dm b/code/game/machinery/floorlayer.dm index 9dd78fd094e..93cc7566a3a 100644 --- a/code/game/machinery/floorlayer.dm +++ b/code/game/machinery/floorlayer.dm @@ -36,7 +36,7 @@ /obj/machinery/floorlayer/attackby(var/obj/item/W as obj, var/mob/user as mob) - if (istype(W, /obj/item/weapon/wrench)) + if (iswrench(W)) var/m = input("Choose work mode", "Mode") as null|anything in mode mode[m] = !mode[m] var/O = mode[m] @@ -49,7 +49,7 @@ TakeTile(T) return - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) if(!length(contents)) user << "\The [src] is empty." else @@ -60,7 +60,7 @@ T = null return - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) T = input("Choose tile type.", "Tiles") as null|anything in contents return ..() diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index d51d87f2dca..f207f4cc34d 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -98,7 +98,7 @@ update_icon() /obj/machinery/sparker/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/screwdriver)) + if (isscrewdriver(W)) add_fingerprint(user) disable = !disable if(disable) diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 6edc97145c4..56ce454367a 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -166,7 +166,7 @@ datum/track/New(var/title_name, var/audio) /obj/machinery/media/jukebox/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) if(playing) StopPlaying() user.visible_message("[user] has [anchored ? "un" : ""]secured \the [src].", "You [anchored ? "un" : ""]secure \the [src].") diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 71ba7147a19..4fefdf5e53c 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -56,7 +56,7 @@ /obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob) if(src.broken > 0) - if(src.broken == 2 && istype(O, /obj/item/weapon/screwdriver)) // If it's broken and they're using a screwdriver + if(src.broken == 2 && isscrewdriver(O)) // If it's broken and they're using a screwdriver user.visible_message( \ "\The [user] starts to fix part of the microwave.", \ "You start to fix part of the microwave." \ @@ -67,7 +67,7 @@ "You have fixed part of the microwave." \ ) src.broken = 1 // Fix it a bit - else if(src.broken == 1 && istype(O, /obj/item/weapon/wrench)) // If it's broken and they're doing the wrench + else if(src.broken == 1 && iswrench(O)) // If it's broken and they're doing the wrench user.visible_message( \ "\The [user] starts to fix part of the microwave.", \ "You start to fix part of the microwave." \ @@ -137,7 +137,7 @@ var/obj/item/weapon/grab/G = O user << "This is ridiculous. You can not fit \the [G.affecting] in this [src]." return 1 - else if(istype(O,/obj/item/weapon/crowbar)) + else if(iscrowbar(O)) user.visible_message( \ "\The [user] begins [src.anchored ? "unsecuring" : "securing"] the microwave.", \ "You attempt to [src.anchored ? "unsecure" : "secure"] the microwave." diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index ae16caccc4a..594e991c867 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -177,7 +177,7 @@ ********************/ /obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/screwdriver)) + if(isscrewdriver(O)) panel_open = !panel_open user.visible_message("[user] [panel_open ? "opens" : "closes"] the maintenance panel of \the [src].", "You [panel_open ? "open" : "close"] the maintenance panel of \the [src].") cut_overlays() @@ -186,7 +186,7 @@ SSnanoui.update_uis(src) return - if(istype(O, /obj/item/device/multitool)||istype(O, /obj/item/weapon/wirecutters)) + if(ismultitool(O)||iswirecutter(O)) if(panel_open) attack_hand(user) return diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 7af9846da45..bce4863d867 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -54,7 +54,7 @@ /obj/machinery/mass_driver/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) if(!anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user.visible_message("[user.name] secures [src] to the floor.", \ diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 8183b0e95a3..f5d1238b2af 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -109,7 +109,7 @@ var/global/list/navbeacons // no I don't like putting this in, but it will do if(!T.is_plating()) return // prevent intraction when T-scanner revealed - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) open = !open user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "You [open ? "open" : "close"] the beacon's cover.") diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index 3fce3edc99b..594bfef4619 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -44,7 +44,7 @@ var/bomb_set return /obj/machinery/nuclearbomb/attackby(obj/item/weapon/O as obj, mob/user as mob, params) - if (istype(O, /obj/item/weapon/screwdriver)) + if (isscrewdriver(O)) src.add_fingerprint(user) if (src.auth) if (panel_open == 0) @@ -68,7 +68,7 @@ var/bomb_set flick("lock", src) return - if (panel_open && (istype(O, /obj/item/device/multitool) || istype(O, /obj/item/weapon/wirecutters))) + if (panel_open && (ismultitool(O) || iswirecutter(O))) return attack_hand(user) if (src.extended) @@ -82,7 +82,7 @@ var/bomb_set if (src.anchored) switch(removal_stage) if(0) - if(istype(O,/obj/item/weapon/weldingtool)) + if(iswelder(O)) var/obj/item/weapon/weldingtool/WT = O if(!WT.isOn()) return if (WT.get_fuel() < 5) // uses up 5 fuel. @@ -98,7 +98,7 @@ var/bomb_set return if(1) - if(istype(O,/obj/item/weapon/crowbar)) + if(iscrowbar(O)) user.visible_message("[user] starts forcing open the bolt covers on [src].", "You start forcing open the anchoring bolt covers with [O]...") if(do_after(user,15)) @@ -108,7 +108,7 @@ var/bomb_set return if(2) - if(istype(O,/obj/item/weapon/weldingtool)) + if(iswelder(O)) var/obj/item/weapon/weldingtool/WT = O if(!WT.isOn()) return @@ -125,7 +125,7 @@ var/bomb_set return if(3) - if(istype(O,/obj/item/weapon/wrench)) + if(iswrench(O)) user.visible_message("[user] begins unwrenching the anchoring bolts on [src].", "You begin unwrenching the anchoring bolts...") @@ -136,7 +136,7 @@ var/bomb_set return if(4) - if(istype(O,/obj/item/weapon/crowbar)) + if(iscrowbar(O)) user.visible_message("[user] begins lifting [src] off of the anchors.", "You begin lifting the device off the anchors...") diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 1acab011d55..40a8b2929fc 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -432,7 +432,7 @@ Buildable meters /obj/item/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) ..() //* - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() if (!isturf(src.loc)) return 1 @@ -1165,7 +1165,7 @@ Buildable meters /obj/item/pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) ..() - if (!istype(W, /obj/item/weapon/wrench)) + if (!iswrench(W)) return ..() if(!locate(/obj/machinery/atmospherics/pipe, src.loc)) user << "You need to fasten it to a pipe" diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 692b97aac1f..68e462045f3 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -105,7 +105,7 @@ user.drop_item() qdel(W) return - else if (istype(W, /obj/item/weapon/wrench)) + else if (iswrench(W)) if (unwrenched==0) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "You begin to unfasten \the [src] from the floor..." diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index b20b35e5fcb..28c7955bc9c 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -39,13 +39,13 @@ /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) - if (istype(W, /obj/item/weapon/wrench)) + if (iswrench(W)) P_type_t = input("Choose pipe type", "Pipe type") as null|anything in Pipes P_type = Pipes[P_type_t] user.visible_message("[user] has set \the [src] to manufacture [P_type_t].", "You set \the [src] to manufacture [P_type_t].") return - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) a_dis=!a_dis user.visible_message("[user] has [!a_dis?"de":""]activated auto-dismantling.", "You [!a_dis?"de":""]activate auto-dismantling.") return @@ -62,7 +62,7 @@ return - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(metal) var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(round(metal),50)) as num, 1) m = min(m, 50) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index def50714870..7ca92d7d3ea 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -289,7 +289,7 @@ var/list/turret_icons /obj/machinery/porta_turret/attackby(obj/item/I, mob/user) if(stat & BROKEN) - if(istype(I, /obj/item/weapon/crowbar)) + if(iscrowbar(I)) //If the turret is destroyed, you can remove it with a crowbar to //try and salvage its components user << "You begin prying the metal coverings off." @@ -308,7 +308,7 @@ var/list/turret_icons user << "You remove the turret but did not manage to salvage anything." qdel(src) // qdel - else if((istype(I, /obj/item/weapon/wrench))) + else if((iswrench(I))) if (immobile) user << "[src] is firmly attached to the ground with some form of epoxy." return @@ -693,14 +693,14 @@ var/list/turret_icons //this is a bit unwieldy but self-explanatory switch(build_step) if(0) //first step - if(istype(I, /obj/item/weapon/wrench) && !anchored) + if(iswrench(I) && !anchored) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) user << "You secure the external bolts." anchored = 1 build_step = 1 return - else if(istype(I, /obj/item/weapon/crowbar) && !anchored) + else if(iscrowbar(I) && !anchored) playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) user << "You dismantle the turret construction." new /obj/item/stack/material/steel( loc, 5) @@ -718,7 +718,7 @@ var/list/turret_icons user << "You need two sheets of metal to continue construction." return - else if(istype(I, /obj/item/weapon/wrench)) + else if(iswrench(I)) playsound(loc, 'sound/items/Ratchet.ogg', 75, 1) user << "You unfasten the external bolts." anchored = 0 @@ -727,13 +727,13 @@ var/list/turret_icons if(2) - if(istype(I, /obj/item/weapon/wrench)) + if(iswrench(I)) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) user << "You bolt the metal armor into place." build_step = 3 return - else if(istype(I, /obj/item/weapon/weldingtool)) + else if(iswelder(I)) var/obj/item/weapon/weldingtool/WT = I if(!WT.isOn()) return @@ -768,7 +768,7 @@ var/list/turret_icons qdel(I) //delete the gun :( return - else if(istype(I, /obj/item/weapon/wrench)) + else if(iswrench(I)) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) user << "You remove the turret's metal armor bolts." build_step = 2 @@ -787,7 +787,7 @@ var/list/turret_icons //attack_hand() removes the gun if(5) - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) build_step = 6 user << "You close the internal access hatch." @@ -805,14 +805,14 @@ var/list/turret_icons user << "You need two sheets of metal to continue construction." return - else if(istype(I, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(I)) playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) build_step = 5 user << "You open the internal access hatch." return if(7) - if(istype(I, /obj/item/weapon/weldingtool)) + if(iswelder(I)) var/obj/item/weapon/weldingtool/WT = I if(!WT.isOn()) return if(WT.get_fuel() < 5) @@ -835,7 +835,7 @@ var/list/turret_icons qdel(src) // qdel - else if(istype(I, /obj/item/weapon/crowbar)) + else if(iscrowbar(I)) playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) user << "You pry off the turret's exterior armor." new /obj/item/stack/material/steel(loc, 2) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index e7816b9bfc3..6868d4cb6a7 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -20,7 +20,7 @@ obj/machinery/recharger var/portable = 1 obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob) - if(portable && istype(G, /obj/item/weapon/wrench)) + if(portable && iswrench(G)) if(charging) user << "Remove [charging] first!" return diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index c49f972943a..aef72a14373 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -66,7 +66,7 @@ else user << "The hatch must be open to insert a power cell." return - else if(istype(I, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(I)) panel_open = !panel_open user.visible_message("[user] [panel_open ? "opens" : "closes"] the hatch on the [src].", "You [panel_open ? "open" : "close"] the hatch on the [src].") update_icon() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 50dd39fe2e8..1e9316efe9d 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -478,7 +478,7 @@ /obj/machinery/suit_storage_unit/attackby(obj/item/I as obj, mob/user as mob) if(!src.ispowered) return - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) src.panelopen = !src.panelopen playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user << text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") ) @@ -681,7 +681,7 @@ return //Hacking init. - if(istype(I, /obj/item/device/multitool) || istype(I, /obj/item/weapon/wirecutters)) + if(ismultitool(I) || iswirecutter(I)) if(panel_open) attack_hand(user) return @@ -717,7 +717,7 @@ src.updateUsrDialog() return - else if(istype(I,/obj/item/weapon/screwdriver)) + else if(isscrewdriver(I)) panel_open = !panel_open user << "You [panel_open ? "open" : "close"] the maintenance panel." diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm index 9cd1dfec09b..332aa5cb13f 100644 --- a/code/game/machinery/supplybeacon.dm +++ b/code/game/machinery/supplybeacon.dm @@ -45,7 +45,7 @@ drop_type = "supermatter" /obj/machinery/power/supply_beacon/attackby(var/obj/item/weapon/W, var/mob/user) - if(!use_power && istype(W, /obj/item/weapon/wrench)) + if(!use_power && iswrench(W)) if(!anchored && !connect_to_network()) user << "This device must be placed over an exposed cable." return diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index b4eaa9efb09..712d8b5e0a1 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -130,7 +130,7 @@ /obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(active) user << "You need to deactivate the beacon first!" return diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 5352701ce31..384e592a072 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -189,7 +189,7 @@ return attackby(var/obj/item/weapon/D as obj, var/mob/user as mob) - if(istype(D, /obj/item/weapon/screwdriver)) + if(isscrewdriver(D)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 7a9597d3f6a..38291cdf0c9 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -15,7 +15,7 @@ /obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob) // Using a multitool lets you access the receiver's interface - if(istype(P, /obj/item/device/multitool)) + if(ismultitool(P)) attack_hand(user) @@ -33,25 +33,25 @@ switch(construct_op) if(0) - if(istype(P, /obj/item/weapon/screwdriver)) + if(isscrewdriver(P)) user << "You unfasten the bolts." playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) construct_op ++ if(1) - if(istype(P, /obj/item/weapon/screwdriver)) + if(isscrewdriver(P)) user << "You fasten the bolts." playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) construct_op -- - if(istype(P, /obj/item/weapon/wrench)) + if(iswrench(P)) user << "You dislodge the external plating." playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) construct_op ++ if(2) - if(istype(P, /obj/item/weapon/wrench)) + if(iswrench(P)) user << "You secure the external plating." playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) construct_op -- - if(istype(P, /obj/item/weapon/wirecutters)) + if(iswirecutter(P)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You remove the cables." construct_op ++ @@ -59,7 +59,7 @@ A.amount = 5 stat |= BROKEN // the machine's been borked! if(3) - if(istype(P, /obj/item/stack/cable_coil)) + if(iscoil(P)) var/obj/item/stack/cable_coil/A = P if (A.use(5)) user << "You insert the cables." @@ -67,7 +67,7 @@ stat &= ~BROKEN // the machine's not borked anymore! else user << "You need five coils of wire for this." - if(istype(P, /obj/item/weapon/crowbar)) + if(iscrowbar(P)) user << "You begin prying out the circuit board other components..." playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) if(do_after(user,60)) @@ -88,7 +88,7 @@ newpath = text2path(I) var/obj/item/s = new newpath s.loc = user.loc - if(istype(P, /obj/item/stack/cable_coil)) + if(iscoil(P)) var/obj/item/stack/cable_coil/A = P A.amount = 1 diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 24549bd8b71..0b80e0db77a 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -124,7 +124,7 @@ return attackby(var/obj/item/weapon/D as obj, var/mob/user as mob) - if(istype(D, /obj/item/weapon/screwdriver)) + if(isscrewdriver(D)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 945cc69e662..bd1b31e0317 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -207,7 +207,7 @@ return attackby(var/obj/item/weapon/D as obj, var/mob/user as mob) - if(istype(D, /obj/item/weapon/screwdriver)) + if(isscrewdriver(D)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 78ed33e308f..cf9078cefa8 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -208,7 +208,7 @@ if (I || istype(W, /obj/item/weapon/spacecash)) attack_hand(user) return - else if(istype(W, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(W)) src.panel_open = !src.panel_open user << "You [src.panel_open ? "open" : "close"] the maintenance panel." cut_overlays() @@ -217,7 +217,7 @@ SSnanoui.update_uis(src) // Speaker switch is on the main UI, not wires UI return - else if(istype(W, /obj/item/device/multitool)||istype(W, /obj/item/weapon/wirecutters)) + else if(ismultitool(W)||iswirecutter(W)) if(src.panel_open) attack_hand(user) return @@ -229,7 +229,7 @@ user << "You insert \the [W] into \the [src]." SSnanoui.update_uis(src) return - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) if(!can_move) return user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index fad84493b7f..5c3a3c4cf66 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -10,7 +10,7 @@ var/reverse = 0 //if resulting object faces opposite its dir (like light fixtures) /obj/item/frame/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/wrench)) + if (iswrench(W)) new refund_type( get_turf(src.loc), refund_amt) qdel(src) return diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index a22482a4168..2ee21bea444 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -73,7 +73,7 @@ icon_state = "wm_[state][panel]" /obj/machinery/washing_machine/attackby(obj/item/weapon/W as obj, mob/user as mob) - /*if(istype(W,/obj/item/weapon/screwdriver)) + /*if(isscrewdriver(W)) panel = !panel user << "You [panel ? "open" : "close"] the [src]'s maintenance panel"*/ if(istype(W,/obj/item/weapon/pen/crayon) || istype(W,/obj/item/weapon/stamp)) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index cbceabfd014..b270a27972f 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -768,7 +768,7 @@ user << "Invalid ID: Access denied." else user << "Maintenance protocols disabled by operator." - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) if(state==1) state = 2 user << "You undo the securing bolts." @@ -778,7 +778,7 @@ user << "You tighten the securing bolts." playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) return - else if(istype(W, /obj/item/weapon/crowbar)) + else if(iscrowbar(W)) if(state==2) state = 3 user << "You open the hatch to the power unit" @@ -788,7 +788,7 @@ user << "You close the hatch to the power unit" playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) return - else if(istype(W, /obj/item/stack/cable_coil)) + else if(iscoil(W)) if(state == 3 && hasInternalDamage(MECHA_INT_SHORT_CIRCUIT)) var/obj/item/stack/cable_coil/CC = W if(CC.use(2)) @@ -797,7 +797,7 @@ else user << "There's not enough wire to finish the task." return - else if(istype(W, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(W)) if(hasInternalDamage(MECHA_INT_TEMP_CONTROL)) clearInternalDamage(MECHA_INT_TEMP_CONTROL) user << "You repair the damaged temperature controller." @@ -807,7 +807,7 @@ return - else if(istype(W, /obj/item/device/multitool)) + else if(ismultitool(W)) if(state>=3 && src.occupant) user << "You attempt to eject the pilot using the maintenance controls." if(src.occupant.stat) @@ -831,7 +831,7 @@ user << "There's already a powercell installed." return - else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HURT) + else if(iswelder(W) && user.a_intent != I_HURT) var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) if (hasInternalDamage(MECHA_INT_TANK_BREACH)) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 062d9417fe5..74fa4b6d357 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -3,22 +3,22 @@ //////////////////////////////// /datum/construction/mecha/custom_action(step, atom/used_atom, mob/user) - if(istype(used_atom, /obj/item/weapon/weldingtool)) + if(iswelder(used_atom)) var/obj/item/weapon/weldingtool/W = used_atom if (W.remove_fuel(0, user)) playsound(holder, 'sound/items/Welder2.ogg', 50, 1) else return 0 - else if(istype(used_atom, /obj/item/weapon/wrench)) + else if(iswrench(used_atom)) playsound(holder, 'sound/items/Ratchet.ogg', 50, 1) - else if(istype(used_atom, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(used_atom)) playsound(holder, 'sound/items/Screwdriver.ogg', 50, 1) - else if(istype(used_atom, /obj/item/weapon/wirecutters)) + else if(iswirecutter(used_atom)) playsound(holder, 'sound/items/Wirecutter.ogg', 50, 1) - else if(istype(used_atom, /obj/item/stack/cable_coil)) + else if(iscoil(used_atom)) var/obj/item/stack/cable_coil/C = used_atom if(C.use(4)) playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) @@ -35,22 +35,22 @@ return 1 /datum/construction/reversible/mecha/custom_action(index as num, diff as num, atom/used_atom, mob/user as mob) - if(istype(used_atom, /obj/item/weapon/weldingtool)) + if(iswelder(used_atom)) var/obj/item/weapon/weldingtool/W = used_atom if (W.remove_fuel(0, user)) playsound(holder, 'sound/items/Welder2.ogg', 50, 1) else return 0 - else if(istype(used_atom, /obj/item/weapon/wrench)) + else if(iswrench(used_atom)) playsound(holder, 'sound/items/Ratchet.ogg', 50, 1) - else if(istype(used_atom, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(used_atom)) playsound(holder, 'sound/items/Screwdriver.ogg', 50, 1) - else if(istype(used_atom, /obj/item/weapon/wirecutters)) + else if(iswirecutter(used_atom)) playsound(holder, 'sound/items/Wirecutter.ogg', 50, 1) - else if(istype(used_atom, /obj/item/stack/cable_coil)) + else if(iscoil(used_atom)) var/obj/item/stack/cable_coil/C = used_atom if(C.use(4)) playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 39620c47426..c83e6964f0a 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -31,7 +31,7 @@ /obj/effect/decal/mecha_wreckage/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(salvage_num <= 0) user << "You don't see anything that can be cut with [W]." @@ -49,7 +49,7 @@ else user << "You need more welding fuel to complete this task." return - if(istype(W, /obj/item/weapon/wirecutters)) + if(iswirecutter(W)) if(salvage_num <= 0) user << "You don't see anything that can be cut with [W]." return @@ -61,7 +61,7 @@ salvage_num-- else user << "You failed to salvage anything valuable from [src]." - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) if(!isemptylist(crowbar_salvage)) var/obj/S = pick(crowbar_salvage) if(S) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 24a98517419..af5dce5b33a 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -124,7 +124,7 @@ icon_state = design.icon_state // poster[serial_number] /obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wirecutters)) + if(iswirecutter(W)) playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) if(ruined) user << "You remove the remnants of the poster." diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 7cf9b6f1555..06d0ba611aa 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -25,7 +25,7 @@ var/damage = W.force / 4.0 - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 0b7a7e899b6..ed914fc299c 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -9,7 +9,7 @@ /obj/item/frame/apc/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() - if (istype(W, /obj/item/weapon/wrench)) + if (iswrench(W)) new /obj/item/stack/material/steel( get_turf(src.loc), 2 ) qdel(src) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 2964f914092..097806ceab4 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -58,7 +58,7 @@ src.name = "body bag" //..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri return - else if(istype(W, /obj/item/weapon/wirecutters)) + else if(iswirecutter(W)) user << "You cut the tag off the bodybag" src.name = "body bag" cut_overlays() diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 4ae9c625668..660c172710c 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -32,7 +32,7 @@ return ..() /obj/item/device/powersink/attackby(var/obj/item/I, var/mob/user) - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) if(mode == 0) var/turf/T = loc if(isturf(T) && !!T.is_plating()) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 87977b38461..e6bfd0b2bc6 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -236,10 +236,10 @@ /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob) // ..() user.set_machine(src) - if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ )))) + if (!( isscrewdriver(W) || (istype(W, /obj/item/device/encryptionkey/ )))) return - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(keyslot1 || keyslot2) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index b7713bfcc11..de3b147f538 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -546,7 +546,7 @@ var/global/list/default_medbay_channels = list( /obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() user.set_machine(src) - if (!( istype(W, /obj/item/weapon/screwdriver) )) + if (!( isscrewdriver(W) )) return b_stat = !( b_stat ) if(!istype(src, /obj/item/device/radio/beacon)) @@ -599,10 +599,10 @@ var/global/list/default_medbay_channels = list( /obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob) // ..() user.set_machine(src) - if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ )))) + if (!( isscrewdriver(W) || (istype(W, /obj/item/device/encryptionkey/ )))) return - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(keyslot) diff --git a/code/game/objects/items/devices/radio_jammer.dm b/code/game/objects/items/devices/radio_jammer.dm index 341b3b31e82..de802879690 100644 --- a/code/game/objects/items/devices/radio_jammer.dm +++ b/code/game/objects/items/devices/radio_jammer.dm @@ -103,7 +103,7 @@ proc/within_jamming_range(var/atom/test) // tests if an object is near a radio j /obj/item/device/radiojammer/improvised/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/screwdriver)) + if (isscrewdriver(W)) user << "You disassemble the improvised signal jammer." user.put_in_hands(assembly_holder) user.put_in_hands(cell) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 610495f3568..9e8e7a2ed05 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -146,7 +146,7 @@ user << "You switch on the [src]." /obj/item/device/suit_cooling_unit/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/screwdriver)) + if (isscrewdriver(W)) if(cover_open) cover_open = 0 user << "You screw the panel into place." diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 345bfc9921c..69ecc557a0c 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -258,7 +258,7 @@ W.loc = src src.cell = W user << "You insert the cell!" - if(istype(W, /obj/item/stack/cable_coil)) + if(iscoil(W)) if(src.wires) user << "You have already inserted wire!" return diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 6b2e6451f57..768d862bbf5 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -33,7 +33,7 @@ attackby(obj/item/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/weldingtool)) + if (iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) overlays.Cut() diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index ffc12efc49b..ce528413cbb 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -49,7 +49,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list( /obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob) ..() - if (istype(W, /obj/item/weapon/weldingtool)) + if (iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(get_amount() < 2) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index d2f47ecd31a..80960896d40 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -26,7 +26,7 @@ /obj/item/stack/material/glass/attackby(obj/item/W, mob/user) ..() if(!is_reinforced) - if(istype(W,/obj/item/stack/cable_coil)) + if(iscoil(W)) var/obj/item/stack/cable_coil/CC = W if (get_amount() < 1 || CC.get_amount() < 5) user << "You need five lengths of coil and one sheet of glass to make wired glass." diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index 9a0e0b2eaed..58e04479af7 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -24,7 +24,7 @@ /obj/item/weapon/flame/candle/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool light("\The [user] casually lights the [name] with [W].") diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 7df53686a4c..968d7838b0c 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -17,7 +17,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/lit = 0 /proc/isflamesource(A) - if(istype(A, /obj/item/weapon/weldingtool)) + if(iswelder(A)) var/obj/item/weapon/weldingtool/WT = A return (WT.isOn()) else if(istype(A, /obj/item/weapon/flame)) @@ -186,7 +186,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM text = zippomes else if(istype(W, /obj/item/weapon/flame/lighter)) text = lightermes - else if(istype(W, /obj/item/weapon/weldingtool)) + else if(iswelder(W)) text = weldermes else if(istype(W, /obj/item/device/assembly/igniter)) text = ignitermes diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm index c3a9659df65..81baf3fa8fb 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm @@ -56,7 +56,7 @@ user << "You [locked ? "" : "un"]lock the circuit controls." else user << "Access denied." - else if(istype(I,/obj/item/device/multitool)) + else if(ismultitool(I)) if(locked) user << "Circuit controls are locked." return diff --git a/code/game/objects/items/weapons/circuitboards/computer/research.dm b/code/game/objects/items/weapons/circuitboards/computer/research.dm index 7695913eede..bdea0829f0d 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/research.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/research.dm @@ -7,7 +7,7 @@ build_path = /obj/machinery/computer/rdconsole/core /obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) user.visible_message("\The [user] adjusts the jumper on \the [src]'s access protocol pins.", "You adjust the jumper on the access protocol pins.") if(src.build_path == /obj/machinery/computer/rdconsole/core) src.name = T_BOARD("RD Console - Robotics") diff --git a/code/game/objects/items/weapons/circuitboards/computer/supply.dm b/code/game/objects/items/weapons/circuitboards/computer/supply.dm index 882e2714f64..cb24d57c5e4 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/supply.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/supply.dm @@ -17,7 +17,7 @@ contraband_enabled = SC.can_order_contraband /obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/device/multitool)) + if(ismultitool(I)) var/catastasis = src.contraband_enabled var/opposite_catastasis if(catastasis) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm b/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm index db395ec702d..b1a1a6e29c4 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm @@ -8,7 +8,7 @@ var/init_dirs = SOUTH /obj/item/weapon/circuitboard/unary_atmos/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) machine_dir = turn(machine_dir, 90) init_dirs = machine_dir user.visible_message("\The [user] adjusts the jumper on the [src]'s port configuration pins.", "You adjust the jumper on the port configuration pins. Now set to [dir2text(machine_dir)].") diff --git a/code/game/objects/items/weapons/cloaking_device.dm b/code/game/objects/items/weapons/cloaking_device.dm index fd9808589f5..2b5b5fb8dec 100644 --- a/code/game/objects/items/weapons/cloaking_device.dm +++ b/code/game/objects/items/weapons/cloaking_device.dm @@ -133,7 +133,7 @@ else user << "[src] already has a cell." - else if(istype(W, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(W)) if(cell) cell.update_icon() cell.forceMove(get_turf(src.loc)) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 4680b0be64d..c406c9e801e 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -25,10 +25,10 @@ return ..() /obj/item/weapon/plastique/attackby(var/obj/item/I, var/mob/user) - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) open_panel = !open_panel user << "You [open_panel ? "open" : "close"] the wire panel." - else if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler )) + else if(iswirecutter(I) || ismultitool(I) || istype(I, /obj/item/device/assembly/signaler )) wires.Interact(user) else ..() diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 68790b8f531..f1291bf2484 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -47,7 +47,7 @@ /obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() - if (!istype(W, /obj/item/weapon/wirecutters)) + if (!iswirecutter(W)) user << "I need wirecutters for that." return diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 361071771cc..071b3aeeb4d 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -72,7 +72,7 @@ icon_state = initial(icon_state) +"_ass" name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" stage = 1 - else if(istype(W,/obj/item/weapon/screwdriver) && path != 2) + else if(isscrewdriver(W) && path != 2) if(stage == 1) path = 1 if(beakers.len) diff --git a/code/game/objects/items/weapons/improvised_components.dm b/code/game/objects/items/weapons/improvised_components.dm index af4e528b709..11cee31ffcf 100644 --- a/code/game/objects/items/weapons/improvised_components.dm +++ b/code/game/objects/items/weapons/improvised_components.dm @@ -7,7 +7,7 @@ thrown_force_divisor = 0.1 /obj/item/weapon/material/butterflyconstruction/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) user << "You finish the concealed blade weapon." new /obj/item/weapon/material/butterfly(user.loc, material.name) qdel(src) @@ -58,7 +58,7 @@ var/obj/item/weapon/material/tmp_shard = I finished = new /obj/item/weapon/material/twohanded/spear(get_turf(user), tmp_shard.material.name) user << "You fasten \the [I] to the top of the rod with the cable." - else if(istype(I, /obj/item/weapon/wirecutters)) + else if(iswirecutter(I)) finished = new /obj/item/weapon/melee/baton/cattleprod(get_turf(user)) user << "You fasten the wirecutters to the top of the rod with the cable, prongs outward." if(finished) diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index 9c4e053829e..b1055b2a93f 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -106,7 +106,7 @@ Commenting this out pending rebalancing of radiation based on small objects. check_health(1) /obj/item/weapon/material/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(material.ignition_point && WT.remove_fuel(0, user)) TemperatureAct(150) diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 9bf4a61f69b..26ce64e6bb8 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -47,7 +47,7 @@ alpha = 255 /obj/item/weapon/material/shard/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/weldingtool) && material.shard_can_repair) + if(iswelder(W) && material.shard_can_repair) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) material.place_sheet(loc) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 20fe0c4c73e..f8675288777 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -39,12 +39,12 @@ playsound(src.loc, "sparks", 50, 1) return - if (istype(W, /obj/item/weapon/screwdriver)) + if (isscrewdriver(W)) if (do_after(user, 20)) src.open =! src.open user.show_message(text("You [] the service panel.", (src.open ? "open" : "close"))) return - if ((istype(W, /obj/item/device/multitool)) && (src.open == 1)&& (!src.l_hacking)) + if ((ismultitool(W)) && (src.open == 1)&& (!src.l_hacking)) user.show_message("Now attempting to reset internal memory, please hold.", 1) src.l_hacking = 1 if (do_after(usr, 100)) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 519019bb86f..c439c584d22 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -73,7 +73,7 @@ else user << "[src] already has a cell." - else if(istype(W, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(W)) if(bcell) bcell.update_icon() bcell.loc = get_turf(src.loc) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index bc75e87f75e..16407d11c6d 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -227,7 +227,7 @@ /obj/item/weapon/weldingtool/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if (isrobot(loc)) user << span("alert", "You cannot modify your own welder!") return diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index 24369356d72..698478527b6 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -14,7 +14,7 @@ R.add_reagent("fuel", max_fuel) /obj/item/weapon/weldpack/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/T = W if(T.welding & prob(50)) message_admins("[key_name_admin(user)] triggered a fueltank explosion.") diff --git a/code/game/objects/structures/banner.dm b/code/game/objects/structures/banner.dm index 25886f17528..6aa4172f949 100644 --- a/code/game/objects/structures/banner.dm +++ b/code/game/objects/structures/banner.dm @@ -27,7 +27,7 @@ src.update_icon() /obj/structure/banner/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) switch(anchored) if(0) anchored = 1 diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 58ca8692c98..4c4fc65a95f 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -220,7 +220,7 @@ return 0 if(istype(W,/obj/item/tk_grab)) return 0 - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0,user)) if(WT.isOn()) @@ -248,7 +248,7 @@ W.forceMove(src.loc) else if(istype(W, /obj/item/weapon/packageWrap)) return - else if(istype(W, /obj/item/weapon/weldingtool)) + else if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0,user)) if(!WT.isOn()) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 78b5702b2c9..fae98d51364 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -88,7 +88,7 @@ return ..() else if(istype(W, /obj/item/weapon/packageWrap)) return - else if(istype(W, /obj/item/stack/cable_coil)) + else if(iscoil(W)) var/obj/item/stack/cable_coil/C = W if(rigged) user << "[src] is already rigged!" @@ -103,7 +103,7 @@ user.drop_item() W.forceMove(src) return - else if(istype(W, /obj/item/weapon/wirecutters)) + else if(iswirecutter(W)) if(rigged) user << "You cut away the wiring." playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index b41b25cc73d..197aa17a080 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -10,7 +10,7 @@ return /obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) new /obj/item/stack/material/wood(src) var/turf/T = get_turf(src) for(var/atom/movable/AM in contents) @@ -34,7 +34,7 @@ icon_state = "mulecrate" /obj/structure/largecrate/hoverpod/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) var/obj/item/mecha_parts/mecha_equipment/ME var/obj/mecha/working/hoverpod/H = new (loc) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index bfec020bab2..800be635beb 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -148,7 +148,7 @@ created_name = t return - if(istype(W, /obj/item/weapon/weldingtool) && ( (istext(glass)) || (glass == 1) || (!anchored) )) + if(iswelder(W) && ( (istext(glass)) || (glass == 1) || (!anchored) )) var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0, user)) playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) @@ -178,7 +178,7 @@ user << "You need more welding fuel." return - else if(istype(W, /obj/item/weapon/wrench) && state == 0) + else if(iswrench(W) && state == 0) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) if(anchored) user.visible_message("[user] begins unsecuring the airlock assembly from the floor.", "You starts unsecuring the airlock assembly from the floor.") @@ -190,7 +190,7 @@ user << "You [anchored? "un" : ""]secured the airlock assembly!" anchored = !anchored - else if(istype(W, /obj/item/stack/cable_coil) && state == 0 && anchored) + else if(iscoil(W) && state == 0 && anchored) var/obj/item/stack/cable_coil/C = W if (C.get_amount() < 1) user << "You need one length of coil to wire the airlock assembly." @@ -201,7 +201,7 @@ src.state = 1 user << "You wire the airlock." - else if(istype(W, /obj/item/weapon/wirecutters) && state == 1 ) + else if(iswirecutter(W) && state == 1 ) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.") @@ -229,7 +229,7 @@ else EL.inuse = 0 - else if(istype(W, /obj/item/weapon/crowbar) && state == 2 ) + else if(iscrowbar(W) && state == 2 ) //This should never happen, but just in case I guess if (!electronics) user << "There was nothing to remove." @@ -272,7 +272,7 @@ user << "You installed [material_display_name(material_name)] plating into the airlock assembly." glass = material_name - else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 ) + else if(isscrewdriver(W) && state == 2 ) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user << "Now finishing the airlock." diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 4defa671d52..3263f70e9ec 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -12,7 +12,7 @@ return /obj/structure/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) var/obj/structure/bed/chair/C = new /obj/structure/bed/chair(loc) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) C.set_dir(dir) diff --git a/code/game/objects/structures/fireaxe_cabinet.dm b/code/game/objects/structures/fireaxe_cabinet.dm index d079b4c3b09..6cb7a2ff228 100644 --- a/code/game/objects/structures/fireaxe_cabinet.dm +++ b/code/game/objects/structures/fireaxe_cabinet.dm @@ -78,7 +78,7 @@ /obj/structure/fireaxecabinet/attackby(var/obj/item/O, var/mob/user) - if(istype(O, /obj/item/device/multitool)) + if(ismultitool(O)) toggle_lock(user) return diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 18d1a15d45b..66184d42ba4 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -54,7 +54,7 @@ reinforce_girder() /obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench) && state == 0) + if(iswrench(W) && state == 0) if(anchored && !reinf_material) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "Now disassembling the girder..." @@ -111,7 +111,7 @@ user << "You drill through the girder!" dismantle() - else if(istype(W, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(W)) if(state == 2) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user << "Now unsecuring support struts..." @@ -124,7 +124,7 @@ reinforcing = !reinforcing user << "\The [src] can now be [reinforcing? "reinforced" : "constructed"]!" - else if(istype(W, /obj/item/weapon/wirecutters) && state == 1) + else if(iswirecutter(W) && state == 1) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) user << "Now removing support struts..." if(do_after(user,40)) @@ -134,7 +134,7 @@ reinf_material = null reset_girder() - else if(istype(W, /obj/item/weapon/crowbar) && state == 0 && anchored) + else if(iscrowbar(W) && state == 0 && anchored) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user << "Now dislodging the girder..." if(do_after(user, 40)) @@ -271,7 +271,7 @@ qdel(src) /obj/structure/girder/cult/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "Now disassembling the girder..." if(do_after(user,40)) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index ddaeceacb6b..911c9a91513 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -143,7 +143,7 @@ //This return will prevent afterattack from executing if the object goes into the trashbag, //This prevents dumb stuff like splashing the cart with the contents of a container, after putting said container into trash - else if (!has_items && (istype(I, /obj/item/weapon/wrench) || istype(I, /obj/item/weapon/weldingtool) || istype(I, /obj/item/weapon/gun/energy/plasmacutter))) + else if (!has_items && (iswrench(I) || iswelder(I) || istype(I, /obj/item/weapon/gun/energy/plasmacutter))) dismantle(user) return ..() diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index b27c359f76c..931c4c80d90 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -42,7 +42,7 @@ var/turf/T = get_turf(src) T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead return - if (istype(C, /obj/item/weapon/weldingtool)) + if (iswelder(C)) var/obj/item/weapon/weldingtool/WT = C if(WT.remove_fuel(0, user)) user << "Slicing lattice joints ..." diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 6ff11daf91c..1dfa28bdf12 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -414,7 +414,7 @@ return /obj/structure/device/piano/attackby(obj/item/O as obj, mob/user as mob) - if (istype(O, /obj/item/weapon/wrench)) + if (iswrench(O)) if (anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "You begin to loosen \the [src]'s casters..." diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index f66a16d6ab5..ff2f614d46a 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -21,7 +21,7 @@ return /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob) //deconstruction - if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double)) + if(isscrewdriver(tool) && !istype(src, /obj/structure/sign/double)) user << "You unfasten the sign with your [tool]." unfasten() else ..() @@ -44,7 +44,7 @@ var/sign_state = "" /obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction - if(istype(tool, /obj/item/weapon/screwdriver) && isturf(user.loc)) + if(isscrewdriver(tool) && isturf(user.loc)) var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel") if(direction == "Cancel") return var/obj/structure/sign/S = new(user.loc) diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm index 3e162068f7a..b09608ff0fd 100644 --- a/code/game/objects/structures/simple_doors.dm +++ b/code/game/objects/structures/simple_doors.dm @@ -134,7 +134,7 @@ hardness -= W.force/100 user << "You hit the [name] with your [W.name]!" CheckHardness() - else if(istype(W,/obj/item/weapon/weldingtool)) + else if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(material.ignition_point && WT.remove_fuel(0, user)) TemperatureAct(150) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 2252d917195..177729e521c 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -89,7 +89,7 @@ return /obj/structure/bed/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) if(can_dismantle) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) dismantle() @@ -121,7 +121,7 @@ add_padding(padding_type) return - else if (istype(W, /obj/item/weapon/wirecutters)) + else if (iswirecutter(W)) if(!padding_material) user << "\The [src] has no padding to remove." return @@ -192,7 +192,7 @@ return // Doesn't care about material or anything else. /obj/structure/bed/roller/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench) || istype(W,/obj/item/stack) || istype(W, /obj/item/weapon/wirecutters)) + if(iswrench(W) || istype(W,/obj/item/stack) || iswirecutter(W)) return else if(istype(W,/obj/item/roller_holder)) if(buckled_mob) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 531ab35010a..dbf2724202f 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -129,7 +129,7 @@ return /obj/structure/bed/chair/office/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/stack) || istype(W, /obj/item/weapon/wirecutters)) + if(istype(W,/obj/item/stack) || iswirecutter(W)) return ..() @@ -201,7 +201,7 @@ return /obj/structure/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/stack) || istype(W, /obj/item/weapon/wirecutters)) + if(istype(W,/obj/item/stack) || iswirecutter(W)) return ..() diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index c3c77cd6050..f26f8930673 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -112,7 +112,7 @@ qdel(src) /obj/item/weapon/stool/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) dismantle() qdel(src) @@ -142,7 +142,7 @@ user << "You add padding to \the [src]." add_padding(padding_type) return - else if (istype(W, /obj/item/weapon/wirecutters)) + else if (iswirecutter(W)) if(!padding_material) user << "\The [src] has no padding to remove." return diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 30d312f7d71..39b9bb1c0ad 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -19,7 +19,7 @@ buckled_mob.set_dir(dir) /obj/structure/bed/chair/wheelchair/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench) || istype(W,/obj/item/stack) || istype(W, /obj/item/weapon/wirecutters)) + if(iswrench(W) || istype(W,/obj/item/stack) || iswirecutter(W)) return ..() diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 9a632594479..e9271426973 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -76,7 +76,7 @@ user << "[src] is full." updateUsrDialog() return - if(istype(I, /obj/item/weapon/wrench)) + if(iswrench(I)) if(anchored) user << "You lean down and unwrench [src]." anchored = 0 diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index e8d17c2f777..a64b014f4d9 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -45,7 +45,7 @@ icon_state = "toilet[open][cistern]" /obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob) - if(istype(I, /obj/item/weapon/crowbar)) + if(iscrowbar(I)) user << "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]." playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1) if(do_after(user, 30)) @@ -168,7 +168,7 @@ /obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob) if(I.type == /obj/item/device/analyzer) user << "The water temperature seems to be [watertemp]." - if(istype(I, /obj/item/weapon/wrench)) + if(iswrench(I)) var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings user << "You begin to adjust the temperature valve with \the [I]." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 76f1055ba0a..c5fd4a91d4f 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -69,7 +69,7 @@ obj/structure/windoor_assembly/Destroy() //I really should have spread this out across more states but thin little windoors are hard to sprite. switch(state) if("01") - if(istype(W, /obj/item/weapon/weldingtool) && !anchored ) + if(iswelder(W) && !anchored ) var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) user.visible_message("[user] dissassembles the windoor assembly.", "You start to dissassemble the windoor assembly.") @@ -87,7 +87,7 @@ obj/structure/windoor_assembly/Destroy() return //Wrenching an unsecure assembly anchors it in place. Step 4 complete - if(istype(W, /obj/item/weapon/wrench) && !anchored) + if(iswrench(W) && !anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user.visible_message("[user] secures the windoor assembly to the floor.", "You start to secure the windoor assembly to the floor.") @@ -101,7 +101,7 @@ obj/structure/windoor_assembly/Destroy() src.name = "Anchored Windoor Assembly" //Unwrenching an unsecure assembly un-anchors it. Step 4 undone - else if(istype(W, /obj/item/weapon/wrench) && anchored) + else if(iswrench(W) && anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user.visible_message("[user] unsecures the windoor assembly to the floor.", "You start to unsecure the windoor assembly to the floor.") @@ -132,7 +132,7 @@ obj/structure/windoor_assembly/Destroy() src.name = "Secure Windoor Assembly" //Adding cable to the assembly. Step 5 complete. - else if(istype(W, /obj/item/stack/cable_coil) && anchored) + else if(iscoil(W) && anchored) user.visible_message("[user] wires the windoor assembly.", "You start to wire the windoor assembly.") var/obj/item/stack/cable_coil/CC = W @@ -150,7 +150,7 @@ obj/structure/windoor_assembly/Destroy() if("02") //Removing wire from the assembly. Step 5 undone. - if(istype(W, /obj/item/weapon/wirecutters) && !src.electronics) + if(iswirecutter(W) && !src.electronics) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.") @@ -184,7 +184,7 @@ obj/structure/windoor_assembly/Destroy() EL.inuse = 0 //Screwdriver to remove airlock electronics. Step 6 undone. - else if(istype(W, /obj/item/weapon/screwdriver) && src.electronics) + else if(isscrewdriver(W) && src.electronics) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly.") @@ -200,7 +200,7 @@ obj/structure/windoor_assembly/Destroy() ae.loc = src.loc //Crowbar to complete the assembly, Step 7 complete. - else if(istype(W, /obj/item/weapon/crowbar)) + else if(iscrowbar(W)) if(!src.electronics) usr << "The assembly is missing electronics." return diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index a84962f6df9..1e81136f3dd 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -222,7 +222,7 @@ if(W.flags & NOBLUDGEON) return - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(reinf && state >= 1) state = 3 - state update_nearby_icons() @@ -238,11 +238,11 @@ update_nearby_icons() playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) user << (anchored ? "You have fastened the window to the floor." : "You have unfastened the window.") - else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <= 1) + else if(iscrowbar(W) && reinf && state <= 1) state = 1 - state playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) user << (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.") - else if(istype(W, /obj/item/weapon/wrench) && !anchored && (!state || !reinf)) + else if(iswrench(W) && !anchored && (!state || !reinf)) if(!glasstype) user << "You're not sure how to dismantle \the [src] properly." else diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm index 118f2277695..6ad8e5a8574 100644 --- a/code/game/turfs/simulated/floor_attackby.dm +++ b/code/game/turfs/simulated/floor_attackby.dm @@ -4,7 +4,7 @@ return 0 if(flooring) - if(istype(C, /obj/item/weapon/crowbar)) + if(iscrowbar(C)) if(broken || burnt) user << "You remove the broken [flooring.descriptor]." make_plating() @@ -18,14 +18,14 @@ return playsound(src, 'sound/items/Crowbar.ogg', 80, 1) return - else if(istype(C, /obj/item/weapon/screwdriver) && (flooring.flags & TURF_REMOVE_SCREWDRIVER)) + else if(isscrewdriver(C) && (flooring.flags & TURF_REMOVE_SCREWDRIVER)) if(broken || burnt) return user << "You unscrew and remove the [flooring.descriptor]." make_plating(1) playsound(src, 'sound/items/Screwdriver.ogg', 80, 1) return - else if(istype(C, /obj/item/weapon/wrench) && (flooring.flags & TURF_REMOVE_WRENCH)) + else if(iswrench(C) && (flooring.flags & TURF_REMOVE_WRENCH)) user << "You unwrench and remove the [flooring.descriptor]." make_plating(1) playsound(src, 'sound/items/Ratchet.ogg', 80, 1) @@ -35,12 +35,12 @@ make_plating(1) playsound(src, 'sound/items/Deconstruct.ogg', 80, 1) return - else if(istype(C, /obj/item/stack/cable_coil)) + else if(iscoil(C)) user << "You must remove the [flooring.descriptor] first." return else - if(istype(C, /obj/item/stack/cable_coil)) + if(iscoil(C)) if(broken || burnt) user << "This section is too damaged to support anything. Use a welder to fix the damage." return @@ -76,7 +76,7 @@ playsound(src, 'sound/items/Deconstruct.ogg', 80, 1) return // Repairs. - else if(istype(C, /obj/item/weapon/weldingtool)) + else if(iswelder(C)) var/obj/item/weapon/weldingtool/welder = C if(welder.isOn() && (is_plating())) if(broken || burnt) diff --git a/code/game/turfs/simulated/floor_static.dm b/code/game/turfs/simulated/floor_static.dm index e561f98620a..02a07d49be8 100644 --- a/code/game/turfs/simulated/floor_static.dm +++ b/code/game/turfs/simulated/floor_static.dm @@ -8,7 +8,7 @@ initial_flooring = null /turf/simulated/floor/fixed/attackby(var/obj/item/C, var/mob/user) - if(istype(C, /obj/item/stack) && !istype(C, /obj/item/stack/cable_coil)) + if(istype(C, /obj/item/stack) && !iscoil(C)) return return ..() diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index ed93bc3da93..d1c886b9e1a 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -108,7 +108,7 @@ burn(is_hot(W)) if(locate(/obj/effect/overlay/wallrot) in src) - if(istype(W, /obj/item/weapon/weldingtool) ) + if(iswelder(W) ) var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) user << "You burn away the fungi with \the [WT]." @@ -123,7 +123,7 @@ //THERMITE related stuff. Calls src.thermitemelt() which handles melting simulated walls and the relevant effects if(thermite) - if( istype(W, /obj/item/weapon/weldingtool) ) + if( iswelder(W) ) var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) thermitemelt(user) @@ -146,7 +146,7 @@ var/turf/T = user.loc //get user's location for delay checks - if(damage && istype(W, /obj/item/weapon/weldingtool)) + if(damage && iswelder(W)) var/obj/item/weapon/weldingtool/WT = W @@ -171,7 +171,7 @@ var/dismantle_verb var/dismantle_sound - if(istype(W,/obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(!WT.isOn()) return @@ -235,7 +235,7 @@ else switch(construction_stage) if(6) - if (istype(W, /obj/item/weapon/wirecutters)) + if (iswirecutter(W)) playsound(src, 'sound/items/Wirecutter.ogg', 100, 1) construction_stage = 5 new /obj/item/stack/rods( src ) @@ -243,7 +243,7 @@ update_icon() return if(5) - if (istype(W, /obj/item/weapon/screwdriver)) + if (isscrewdriver(W)) user << "You begin removing the support lines." playsound(src, 'sound/items/Screwdriver.ogg', 100, 1) if(!do_after(user,40) || !istype(src, /turf/simulated/wall) || construction_stage != 5) @@ -262,7 +262,7 @@ return if(4) var/cut_cover - if(istype(W,/obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(!WT.isOn()) return @@ -283,7 +283,7 @@ user << "You press firmly on the cover, dislodging it." return if(3) - if (istype(W, /obj/item/weapon/crowbar)) + if (iscrowbar(W)) user << "You struggle to pry off the cover." playsound(src, 'sound/items/Crowbar.ogg', 100, 1) if(!do_after(user,100) || !istype(src, /turf/simulated/wall) || construction_stage != 3) @@ -293,7 +293,7 @@ user << "You pry off the cover." return if(2) - if (istype(W, /obj/item/weapon/wrench)) + if (iswrench(W)) user << "You start loosening the anchoring bolts which secure the support rods to their frame." playsound(src, 'sound/items/Ratchet.ogg', 100, 1) if(!do_after(user,40) || !istype(src, /turf/simulated/wall) || construction_stage != 2) @@ -304,7 +304,7 @@ return if(1) var/cut_cover - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) cut_cover=1 @@ -324,7 +324,7 @@ user << "The support rods drop out as you cut them loose from the frame." return if(0) - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) user << "You struggle to pry off the outer sheath." playsound(src, 'sound/items/Crowbar.ogg', 100, 1) sleep(100) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 5e9dbaa9a00..8c314292f8a 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -26,7 +26,7 @@ if(istype(W, /obj/item/device/analyzer)) bombtank.attackby(W, user) return - if(istype(W, /obj/item/weapon/wrench) && !status) //This is basically bomb assembly code inverted. apparently it works. + if(iswrench(W) && !status) //This is basically bomb assembly code inverted. apparently it works. user << "You disassemble [src]." @@ -40,7 +40,7 @@ qdel(src) return - if((istype(W, /obj/item/weapon/weldingtool) && W:welding)) + if((iswelder(W) && W:welding)) if(!status) status = 1 bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]" diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index ba3103418ce..766db9acf10 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -15,7 +15,7 @@ return ..() /obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench) && !status) + if(iswrench(W) && !status) var/turf/T = loc if(ismob(T)) T = T.loc @@ -27,7 +27,7 @@ part2 = null qdel(src) return - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) status = !status user << "[src] is now [status ? "secured" : "unsecured"]!" add_fingerprint(user) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index fab99851238..ebdcc725064 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -134,7 +134,7 @@ obj/machinery/gateway/centerstation/process() /obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob) - if(istype(W,/obj/item/device/multitool)) + if(ismultitool(W)) user << "\black The gate is already calibrated, there is no work for you to do here." return @@ -229,7 +229,7 @@ obj/machinery/gateway/centerstation/process() /obj/machinery/gateway/centeraway/attackby(obj/item/device/W as obj, mob/user as mob) - if(istype(W,/obj/item/device/multitool)) + if(ismultitool(W)) if(calibrated) user << "\black The gate is already calibrated, there is no work for you to do here." return diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm index 599c368e46b..7a1fa727b14 100644 --- a/code/modules/blob/blob.dm +++ b/code/modules/blob/blob.dm @@ -231,7 +231,7 @@ switch(W.damtype) if("fire") damage = (W.force / fire_resist) - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) playsound(loc, 'sound/items/Welder.ogg', 100, 1) if("brute") if(prob(30) && !issilicon(user)) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 15b5973b568..0b7f1b8f3dd 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -241,7 +241,7 @@ BLIND // can't see anything return 0 // return 1 to cancel attack_hand() /obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel)) + if(iswirecutter(W) || istype(W, /obj/item/weapon/scalpel)) if (clipped) user << "The [src] have already been clipped!" update_icon() diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index ffd79cea362..b965ca9a558 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -5,7 +5,7 @@ item_state = "boxing" /obj/item/clothing/gloves/boxing/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel)) + if(iswirecutter(W) || istype(W, /obj/item/weapon/scalpel)) user << "That won't work." //Nope return ..() diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index a50e7a52d44..08aaa43eedb 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -120,7 +120,7 @@ checktime() attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if (clipped) //Using clipped because adding a new var for something is dumb user.visible_message("[user] screws the cover of the [src] closed.","You screw the cover of the [src] closed..") clipped = 0 @@ -131,7 +131,7 @@ return if(wired) return - if(istype(W, /obj/item/stack/cable_coil)) + if(iscoil(W)) var/obj/item/stack/cable_coil/C = W if (!clipped) user << "The [src] is not open." diff --git a/code/modules/clothing/gloves/stungloves.dm b/code/modules/clothing/gloves/stungloves.dm index 0670e8a9ef7..cb433bb77dc 100644 --- a/code/modules/clothing/gloves/stungloves.dm +++ b/code/modules/clothing/gloves/stungloves.dm @@ -9,7 +9,7 @@ return //add wires - if(istype(W, /obj/item/stack/cable_coil)) + if(iscoil(W)) var/obj/item/stack/cable_coil/C = W if (clipped) user << "The [src] are too badly mangled for wiring." @@ -45,7 +45,7 @@ user << "A [cell] is already attached to the [src]." return - else if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel)) + else if(iswirecutter(W) || istype(W, /obj/item/weapon/scalpel)) //stunglove stuff if(cell) diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm index 8df23fddda7..212253fa1b5 100644 --- a/code/modules/clothing/spacesuits/breaches.dm +++ b/code/modules/clothing/spacesuits/breaches.dm @@ -203,7 +203,7 @@ var/global/list/breach_burn_descriptors = list( repair_breaches(BURN, use_amt * repair_power, user) return - else if(istype(W, /obj/item/weapon/weldingtool)) + else if(iswelder(W)) if(istype(src.loc,/mob/living)) user << "How do you intend to patch a voidsuit while someone is wearing it?" diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index 6743c9b488d..e5a384e2da8 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -87,7 +87,7 @@ paste.use(1) return - else if(istype(W,/obj/item/stack/cable_coil)) + else if(iscoil(W)) switch(damage) if(0) diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm index c9526f16261..0f71ca33bae 100644 --- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm +++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm @@ -7,7 +7,7 @@ return // Pass repair items on to the chestpiece. - if(chest && (istype(W,/obj/item/stack/material) || istype(W, /obj/item/weapon/weldingtool))) + if(chest && (istype(W,/obj/item/stack/material) || iswelder(W))) return chest.attackby(W,user) // Lock or unlock the access panel. @@ -30,7 +30,7 @@ user << "You [locked ? "lock" : "unlock"] \the [src] access panel." return - else if(istype(W,/obj/item/weapon/crowbar)) + else if(iscrowbar(W)) if(!open && locked) user << "The access panel is locked shut." @@ -43,7 +43,7 @@ if(open) // Hacking. - if(istype(W,/obj/item/weapon/wirecutters) || istype(W,/obj/item/device/multitool)) + if(iswirecutter(W) || ismultitool(W)) if(open) wires.Interact(user) else @@ -100,7 +100,7 @@ src.cell = W return - else if(istype(W,/obj/item/weapon/wrench)) + else if(iswrench(W)) if(!air_supply) user << "There is not tank to remove." @@ -114,7 +114,7 @@ air_supply = null return - else if(istype(W,/obj/item/weapon/screwdriver)) + else if(isscrewdriver(W)) var/list/current_mounts = list() if(cell) current_mounts += "cell" diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 0e414e3b36b..53f534bde93 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -200,7 +200,7 @@ user << "You cannot modify \the [src] while it is being worn." return - if(istype(W,/obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(helmet || boots || tank) var/choice = input("What component would you like to remove?") as null|anything in list(helmet,boots,tank) if(!choice) return diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index d53052a0694..29a33355f72 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -164,11 +164,11 @@ if(W.flags & NOBLUDGEON) return - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) user << ("It's a holowindow, you can't unfasten it!") - else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <= 1) + else if(iscrowbar(W) && reinf && state <= 1) user << ("It's a holowindow, you can't pry it!") - else if(istype(W, /obj/item/weapon/wrench) && !anchored && (!state || !reinf)) + else if(iswrench(W) && !anchored && (!state || !reinf)) user << ("It's a holowindow, you can't dismantle it!") else if(W.damtype == BRUTE || W.damtype == BURN) @@ -234,7 +234,7 @@ return ..() /obj/structure/bed/chair/holochair/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) user << ("It's a holochair, you can't dismantle it!") return diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm index 50e69973412..af5dee5c91a 100644 --- a/code/modules/hydroponics/beekeeping/beehive.dm +++ b/code/modules/hydroponics/beekeeping/beehive.dm @@ -38,12 +38,12 @@ user << "The lid is open. The bees can't grow and produce honey until it's closed!" /obj/machinery/beehive/attackby(var/obj/item/I, var/mob/user) - if(istype(I, /obj/item/weapon/crowbar)) + if(iscrowbar(I)) closed = !closed user.visible_message("[user] [closed ? "closes" : "opens"] \the [src].", "You [closed ? "close" : "open"] \the [src].") update_icon() return - else if(istype(I, /obj/item/weapon/wrench)) + else if(iswrench(I)) anchored = !anchored user.visible_message("[user] [anchored ? "wrenches" : "unwrenches"] \the [src].", "You [anchored ? "wrench" : "unwrench"] \the [src].") if (!smoked && !anchored && (bee_count > 10)) @@ -103,7 +103,7 @@ if(smoked) user << "The hive is smoked." return 1 - else if(istype(I, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(I)) if(bee_count) visible_message("The bees are furious you're trying to destroy their home!") release_bees(1, 30) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 1c47da8e49a..3a27757a1e1 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -173,7 +173,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/attackby(var/obj/item/weapon/W, var/mob/user) if(seed) - if(seed.get_trait(TRAIT_PRODUCES_POWER) && istype(W, /obj/item/stack/cable_coil)) + if(seed.get_trait(TRAIT_PRODUCES_POWER) && iscoil(W)) var/obj/item/stack/cable_coil/C = W if(C.use(5)) //TODO: generalize this. diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index d3aa4e653aa..be8dab943ea 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -94,13 +94,13 @@ user << "You load [W] into [src]." return - if(istype(W,/obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) open = !open user << "You [open ? "open" : "close"] the maintenance panel." return if(open) - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) dismantle() return diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 634b10655f7..7c0e76626c4 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -295,7 +295,7 @@ else user << "There are no seeds in \the [O.name]." return - else if(istype(O, /obj/item/weapon/wrench)) + else if(iswrench(O)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored user << "You [anchored ? "wrench" : "unwrench"] \the [src]." diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 5b35a7347ab..a7c2088c5c2 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -241,7 +241,7 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) START_PROCESSING(SSplants, src) - if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel)) + if(iswirecutter(W) || istype(W, /obj/item/weapon/scalpel)) if(sampled) user << "\The [src] has already been sampled recently." return diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 3ca550cae92..c2dbe62b642 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -453,7 +453,7 @@ if (O.is_open_container()) return 0 - if(istype(O, /obj/item/weapon/wirecutters) || istype(O, /obj/item/weapon/scalpel)) + if(iswirecutter(O) || istype(O, /obj/item/weapon/scalpel)) if(!seed) user << "There is nothing to take a sample from in \the [src]." @@ -558,7 +558,7 @@ qdel(O) check_health() - else if(mechanical && istype(O, /obj/item/weapon/wrench)) + else if(mechanical && iswrench(O)) //If there's a connector here, the portable_atmospherics setup can handle it. if(locate(/obj/machinery/atmospherics/portables_connector/) in loc) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 0d1793adbf1..4f27db33322 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -37,11 +37,11 @@ return else name = ("bookcase ([newname])") - else if(istype(O,/obj/item/weapon/wrench)) + else if(iswrench(O)) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << (anchored ? "You unfasten \the [src] from the floor." : "You secure \the [src] to the floor.") anchored = !anchored - else if(istype(O,/obj/item/weapon/screwdriver)) + else if(isscrewdriver(O)) playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) user << "You begin dismantling \the [src]." if(do_after(user,25)) @@ -242,7 +242,7 @@ return scanner.computer.inventory.Add(src) user << "[W]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'" - else if(istype(W, /obj/item/weapon/material/knife) || istype(W, /obj/item/weapon/wirecutters)) + else if(istype(W, /obj/item/weapon/material/knife) || iswirecutter(W)) if(carved) return user << "You begin to carve out [title]." if(do_after(user, 30)) diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index b095ed9dbb6..898f14a2adf 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -74,7 +74,7 @@ ..() /obj/item/stack/material/attackby(var/obj/item/W, var/mob/user) - if(istype(W,/obj/item/stack/cable_coil)) + if(iscoil(W)) material.build_wired_product(user, W, src) return else if(istype(W, /obj/item/stack/rods)) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index b8db5b19a19..2ba613a389d 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -199,7 +199,7 @@ /obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W as obj, mob/user as mob) if(locked) - if (istype(W, /obj/item/device/multitool)) // Greetings Urist McProfessor, how about a nice game of cows and bulls? + if (ismultitool(W)) // Greetings Urist McProfessor, how about a nice game of cows and bulls? user << "DECA-CODE LOCK ANALYSIS:" if (attempts == 1) user << "* Anti-Tamper system will activate on the next failed access attempt." diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 8920410db7a..95c90dfe7a0 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -45,7 +45,7 @@ icon_state = "coin_adamantine" /obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/stack/cable_coil)) + if(iscoil(W)) var/obj/item/stack/cable_coil/CC = W if(string_attached) user << "There already is a string attached to this coin." @@ -57,7 +57,7 @@ else user << "This cable coil appears to be empty." return - else if(istype(W,/obj/item/weapon/wirecutters)) + else if(iswirecutter(W)) if(!string_attached) ..() return diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 8808f0ccab4..02cad3dbcfc 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -158,7 +158,7 @@ return if(active) return ..() - if(istype(O, /obj/item/weapon/crowbar)) + if(iscrowbar(O)) if (panel_open && cell) user << "You wrench out \the [cell]." cell.forceMove(get_turf(user)) @@ -375,7 +375,7 @@ if(default_deconstruction_crowbar(user, W)) return - if(istype(W,/obj/item/weapon/wrench)) + if(iswrench(W)) if(istype(get_turf(src), /turf/space)) user << "You send the [src] careening into space. Idiot." diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index f9ab9aa60ba..903061f854e 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -546,7 +546,7 @@ var/turf/T = get_turf(src) T.attackby(C, user) return - if (istype(C, /obj/item/weapon/weldingtool)) + if (iswelder(C)) var/obj/item/weapon/weldingtool/WT = C if(WT.remove_fuel(0, user)) user << "Slicing apart connectors ..." @@ -1176,7 +1176,7 @@ var/list/total_extraction_beacons = list() /obj/structure/sculpting_block/attackby(obj/item/C as obj, mob/user as mob) - if (istype(C, /obj/item/weapon/wrench)) + if (iswrench(C)) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "You [anchored ? "un" : ""]anchor the [name]." anchored = !anchored diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index 398e014da57..9ec6298e3c8 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -87,14 +87,14 @@ else user << "Access denied." return - else if(istype(O, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(O)) if(!locked) open = !open user << "Maintenance panel is now [open ? "opened" : "closed"]." else user << "You need to unlock the controls first." return - else if(istype(O, /obj/item/weapon/weldingtool)) + else if(iswelder(O)) if(health < maxHealth) if(open) health = min(maxHealth, health + 10) diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index 2b48b9018f9..57424302232 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -113,7 +113,7 @@ return 1 if(3) - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) build_step++ @@ -143,7 +143,7 @@ return 1 if(6) - if(istype(W, /obj/item/stack/cable_coil)) + if(iscoil(W)) var/obj/item/stack/cable_coil/C = W if (C.get_amount() < 1) user << "You need one coil of wire to wire [src]." @@ -168,7 +168,7 @@ return 1 if(8) - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) var/turf/T = get_turf(user) user << "Now attaching the gun to the frame..." diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 97f508526e8..b74d1b5a5d6 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -524,7 +524,7 @@ /obj/item/weapon/secbot_assembly/attackby(var/obj/item/O, var/mob/user) ..() - if(istype(O, /obj/item/weapon/weldingtool) && !build_step) + if(iswelder(O) && !build_step) var/obj/item/weapon/weldingtool/WT = O if(WT.remove_fuel(0, user)) build_step = 1 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 503964091cf..793a8d43474 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -676,7 +676,7 @@ var/list/ai_verbs_default = list( var/obj/item/weapon/aicard/card = W card.grab_ai(src, user) - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) if(anchored) user.visible_message("\The [user] starts to unbolt \the [src] from the plating...") if(!do_after(user,40)) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 4a021590db1..2fb2d2aee5a 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -182,7 +182,7 @@ user << "\The [src] is not compatible with \the [W]." return - else if (istype(W, /obj/item/weapon/crowbar)) + else if (iscrowbar(W)) user << "\The [src] is hermetically sealed. You can't open the case." return diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 4438c4bcc81..5a14424e358 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -173,7 +173,7 @@ else module_string += text("[O]: Activate
") - if((istype(O,/obj/item/weapon) || istype(O,/obj/item/device)) && !(istype(O,/obj/item/stack/cable_coil))) + if((istype(O,/obj/item/weapon) || istype(O,/obj/item/device)) && !(iscoil(O))) tools += module_string else resources += module_string diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index fb402cb94eb..7e0d4126422 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -579,7 +579,7 @@ user << "You remove \the [cell_component.wrapped]." - if (istype(W, /obj/item/weapon/weldingtool)) + if (iswelder(W)) if (src == user) user << "You lack the reach to be able to repair yourself." return @@ -603,7 +603,7 @@ user << "Need more welding fuel!" return - else if(istype(W, /obj/item/stack/cable_coil) && (wiresexposed || istype(src,/mob/living/silicon/robot/drone))) + else if(iscoil(W) && (wiresexposed || istype(src,/mob/living/silicon/robot/drone))) if (!getFireLoss()) user << "Nothing to fix here!" return @@ -615,7 +615,7 @@ for(var/mob/O in viewers(user, null)) O.show_message(text("[user] has fixed some of the burnt wires on [src]!"), 1) - else if (istype(W, /obj/item/weapon/crowbar)) // crowbar means open or close the cover + else if (iscrowbar(W)) // crowbar means open or close the cover if(opened) if(cell) user << "You close the cover." @@ -704,18 +704,18 @@ C.electronics_damage = 0 updateicon() - else if (istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/multitool)) + else if (iswirecutter(W) || ismultitool(W)) if (wiresexposed) wires.Interact(user) else user << "You can't reach the wiring." - else if(istype(W, /obj/item/weapon/screwdriver) && opened && !cell) // haxing + else if(isscrewdriver(W) && opened && !cell) // haxing wiresexposed = !wiresexposed user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]" updateicon() - else if(istype(W, /obj/item/weapon/screwdriver) && opened && cell) // radio + else if(isscrewdriver(W) && opened && cell) // radio if(radio) radio.attackby(W,user)//Push it to the radio to let it handle everything else diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index e125ca97654..0eccb4bd61c 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -92,7 +92,7 @@ src.update_icon() return 1 - if (istype(O, /obj/item/weapon/weldingtool)) + if (iswelder(O)) var/obj/item/weapon/weldingtool/WT = O if (WT.remove_fuel(0)) if(health < maxHealth) diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm index da122515809..afd809833b0 100644 --- a/code/modules/modular_computers/NTNet/NTNet_relay.dm +++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm @@ -126,12 +126,12 @@ return ..() /obj/machinery/ntnet_relay/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open user << "You [panel_open ? "open" : "close"] the maintenance hatch" return - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) if(!panel_open) user << "Open the maintenance panel first." return diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm index 6134608b1d0..ddebe497bbe 100644 --- a/code/modules/modular_computers/computers/modular_computer/interaction.dm +++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm @@ -148,7 +148,7 @@ try_install_component(user, C) else to_chat(user, "This component is too large for \the [src].") - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) var/list/components = get_all_components() if(components.len) to_chat(user, "Remove all components from \the [src] before disassembling it.") @@ -162,7 +162,7 @@ "You hear a ratchet.") qdel(src) return - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(!WT.isOn()) to_chat(user, "\The [W] is off.") @@ -179,7 +179,7 @@ to_chat(user, "You repair \the [src].") return - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) var/list/all_components = get_all_components() if(!all_components.len) to_chat(user, "This device doesn't have any components installed.") diff --git a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm index 1fb08ea1cb3..944961dad6e 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm @@ -19,7 +19,7 @@ is_holographic = TRUE /obj/item/modular_computer/telescreen/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) if(anchored) shutdown_computer() anchored = FALSE diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm index b995d36b8ce..3c99626e0e0 100644 --- a/code/modules/modular_computers/hardware/ai_slot.dm +++ b/code/modules/modular_computers/hardware/ai_slot.dm @@ -28,7 +28,7 @@ stored_card = W W.forceMove(src) update_power_usage() - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) user << "You manually remove \the [stored_card] from \the [src]." stored_card.forceMove(get_turf(src)) stored_card = null diff --git a/code/modules/modular_computers/hardware/hardware.dm b/code/modules/modular_computers/hardware/hardware.dm index 90150bc5474..bbd786caf58 100644 --- a/code/modules/modular_computers/hardware/hardware.dm +++ b/code/modules/modular_computers/hardware/hardware.dm @@ -15,7 +15,7 @@ /obj/item/weapon/computer_hardware/attackby(var/obj/item/W as obj, var/mob/living/user as mob) // Multitool. Runs diagnostics - if(istype(W, /obj/item/device/multitool)) + if(ismultitool(W)) to_chat(user, "***** DIAGNOSTICS REPORT *****") diagnostics(user) to_chat(user, "******************************") @@ -31,7 +31,7 @@ damage = 0 return 1 // Cable coil. Works as repair method, but will probably require multiple applications and more cable. - if(istype(S, /obj/item/stack/cable_coil)) + if(iscoil(S)) if(!damage) to_chat(user, "\The [src] doesn't seem to require repairs.") return 1 diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index f1ac8ebda22..915045331a9 100644 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -230,7 +230,7 @@ to_chat(user, "The plating is going to need some support.") //To lay cable. - if(istype(C, /obj/item/stack/cable_coil)) + if(iscoil(C)) var/obj/item/stack/cable_coil/coil = C coil.turf_place(src, user) return diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 5d1d11b8930..c7b1a9852d6 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -43,7 +43,7 @@ sleep(5) icon_state = initial(icon_state) updateUsrDialog() - else if(istype(P, /obj/item/weapon/wrench)) + else if(iswrench(P)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored user << "You [anchored ? "wrench" : "unwrench"] \the [src]." diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index d2aba2d4309..b76f2973aae 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -301,7 +301,7 @@ var/obj/item/weapon/flame/F = P if (!F.lit) return - else if (istype(P, /obj/item/weapon/weldingtool)) + else if (iswelder(P)) var/obj/item/weapon/weldingtool/F = P if (!F.welding)//welding tools are 0 when off return @@ -505,7 +505,7 @@ else if(istype(P, /obj/item/weapon/flame)) burnpaper(P, user) - else if(istype(P, /obj/item/weapon/weldingtool)) + else if(iswelder(P)) burnpaper(P, user) add_fingerprint(user) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 405b73f965e..7c1f62d3d99 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -122,7 +122,7 @@ updateUsrDialog() else user << "This cartridge is not yet ready for replacement! Use up the rest of the toner." - else if(istype(O, /obj/item/weapon/wrench)) + else if(iswrench(O)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored user << "You [anchored ? "wrench" : "unwrench"] \the [src]." diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 225b02d6376..b4eeb043d29 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -430,7 +430,7 @@ if (istype(user, /mob/living/silicon) && get_dist(src,user)>1) return src.attack_hand(user) src.add_fingerprint(user) - if (istype(W, /obj/item/weapon/crowbar) && opened) + if (iscrowbar(W) && opened) if (has_electronics==1) if (terminal) user << "Disconnect wires first." @@ -454,7 +454,7 @@ else if (opened!=2) //cover isn't removed opened = 0 update_icon() - else if (istype(W, /obj/item/weapon/crowbar) && !((stat & BROKEN) || hacker) ) + else if (iscrowbar(W) && !((stat & BROKEN) || hacker) ) if(coverlocked && !(stat & MAINT)) user << "The cover is locked and cannot be opened." return @@ -493,7 +493,7 @@ "You insert the power cell.") chargecount = 0 update_icon() - else if (istype(W, /obj/item/weapon/screwdriver)) // haxing + else if (isscrewdriver(W)) // haxing if(opened) if (cell) user << "Close the APC first." //Less hints more mystery! @@ -536,7 +536,7 @@ update_icon() else user << "Access denied." - else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2) + else if (iscoil(W) && !terminal && opened && has_electronics!=2) var/turf/T = loc if(istype(T) && !T.is_plating()) user << "You must remove the floor plating in front of the APC first." @@ -561,7 +561,7 @@ "You add cables to the APC frame.") make_terminal() terminal.connect_to_network() - else if (istype(W, /obj/item/weapon/wirecutters) && terminal && opened && has_electronics!=2) + else if (iswirecutter(W) && terminal && opened && has_electronics!=2) var/turf/T = loc if(istype(T) && !T.is_plating()) user << "You must remove the floor plating in front of the APC first." @@ -590,7 +590,7 @@ else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && ((stat & BROKEN))) user << "You cannot put the board inside, the frame is damaged." return - else if (istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal) + else if (iswelder(W) && opened && has_electronics==0 && !terminal) var/obj/item/weapon/weldingtool/WT = W if (!WT.isOn()) return if (WT.get_fuel() < 3) @@ -676,7 +676,7 @@ else if ((stat & BROKEN) \ && !opened \ - && istype(W, /obj/item/weapon/weldingtool) ) + && iswelder(W) ) var/obj/item/weapon/weldingtool/WT = W if (!WT.isOn()) return if (WT.get_fuel() <1) @@ -708,8 +708,8 @@ if (istype(user, /mob/living/silicon)) return src.attack_hand(user) if (!opened && wiresexposed && \ - (istype(W, /obj/item/device/multitool) || \ - istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/assembly/signaler))) + (ismultitool(W) || \ + iswirecutter(W) || istype(W, /obj/item/device/assembly/signaler))) return src.attack_hand(user) user.visible_message("The [src.name] has been hit with the [W.name] by [user.name]!", \ "You hit the [src.name] with your [W.name]!", \ diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index 8397618fc57..b6f2dfabb9c 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -64,7 +64,7 @@ /obj/machinery/power/smes/batteryrack/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) //these can only be moved by being reconstructed, solves having to remake the powernet. ..() //SMES attackby for now handles screwdriver, cable coils and wirecutters, no need to repeat that here if(open_hatch) - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) if (charge < (capacity / 100)) if (!output_attempt && !input_attempt) playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index 84f5ebe02de..58e8810f307 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -89,7 +89,7 @@ busy = 0 /obj/machinery/power/breakerbox/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(istype(W, /obj/item/device/multitool)) + if(ismultitool(W)) var/newtag = input(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") as text if(newtag) RCon_tag = newtag diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index bc720b26c77..cc8270933bb 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -136,7 +136,7 @@ var/list/possible_cable_coil_colours = list( if(!T.is_plating()) return - if(istype(W, /obj/item/weapon/wirecutters)) + if(iswirecutter(W)) if(d1 == 12 || d2 == 12) user << "You must cut this cable from above." return @@ -169,14 +169,14 @@ var/list/possible_cable_coil_colours = list( return - else if(istype(W, /obj/item/stack/cable_coil)) + else if(iscoil(W)) var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) user << "Not enough cable" return coil.cable_join(src, user) - else if(istype(W, /obj/item/device/multitool)) + else if(ismultitool(W)) if(powernet && (powernet.avail > 0)) // is it powered? user << "[powernet.avail]W in power network." @@ -924,7 +924,7 @@ obj/structure/cable/proc/cableColor(var/colorC) var/ticks = 0 /obj/structure/noose/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/weapon/wirecutters)) + if(iswirecutter(W)) user.visible_message("[user] cuts the noose.", "You cut the noose.") if(buckled_mob) buckled_mob.visible_message("[buckled_mob] falls over and hits the ground!",\ diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm index 392e778392e..659969ccc21 100644 --- a/code/modules/power/cable_heavyduty.dm +++ b/code/modules/power/cable_heavyduty.dm @@ -15,10 +15,10 @@ if(!T.is_plating()) return - if(istype(W, /obj/item/weapon/wirecutters)) + if(iswirecutter(W)) usr << "These cables are too tough to be cut with those [W.name]." return - else if(istype(W, /obj/item/stack/cable_coil)) + else if(iscoil(W)) usr << "You will need heavier cables to connect to these." return else diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 3270eead028..c86d4b33305 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -145,7 +145,7 @@ attack_hand(user) /obj/machinery/power/generator/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) anchored = !anchored user.visible_message("[user.name] [anchored ? "secures" : "unsecures"] the bolts holding [src.name] to the floor.", \ diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 649b78de121..c3cc459d8d1 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -45,7 +45,7 @@ /obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/user as mob) src.add_fingerprint(user) - if (istype(W, /obj/item/weapon/wrench)) + if (iswrench(W)) if (src.stage == 1) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) usr << "You begin deconstructing [src]." @@ -64,7 +64,7 @@ usr << "You have to unscrew the case first." return - if(istype(W, /obj/item/weapon/wirecutters)) + if(iswirecutter(W)) if (src.stage != 2) return src.stage = 1 switch(fixture_type) @@ -78,7 +78,7 @@ playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) return - if(istype(W, /obj/item/stack/cable_coil)) + if(iscoil(W)) if (src.stage != 1) return var/obj/item/stack/cable_coil/coil = W if (coil.use(1)) @@ -92,7 +92,7 @@ "You add wires to [src].") return - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if (src.stage == 2) switch(fixture_type) if ("tube") @@ -385,7 +385,7 @@ // attempt to stick weapon into light socket else if(status == LIGHT_EMPTY) - if(istype(W, /obj/item/weapon/screwdriver)) //If it's a screwdriver open it. + if(isscrewdriver(W)) //If it's a screwdriver open it. playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1) user.visible_message("[user.name] opens [src]'s casing.", \ "You open [src]'s casing.", "You hear a noise.") diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 8a43d4dcfe7..331f6f24747 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -77,7 +77,7 @@ O.loc = src user << "You add the phoron tank to the generator." else if(!active) - if(istype(O, /obj/item/weapon/wrench)) + if(iswrench(O)) anchored = !anchored playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(anchored) @@ -85,14 +85,14 @@ else user << "You unsecure the generator from the floor." SSmachinery.powernet_update_queued = TRUE - else if(istype(O, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(O)) open = !open playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(open) user << "You open the access panel." else user << "You close the access panel." - else if(istype(O, /obj/item/weapon/crowbar) && !open) + else if(iscrowbar(O) && !open) var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc) for(var/obj/item/I in component_parts) I.loc = src.loc diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index ae0c70e1fd7..efb3c70b603 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -266,7 +266,7 @@ updateUsrDialog() return else if(!active) - if(istype(O, /obj/item/weapon/wrench)) + if(iswrench(O)) if(!anchored) connect_to_network() @@ -278,14 +278,14 @@ playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) anchored = !anchored - else if(istype(O, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(O)) open = !open playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(open) user << "You open the access panel." else user << "You close the access panel." - else if(istype(O, /obj/item/weapon/crowbar) && open) + else if(iscrowbar(O) && open) var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc) for(var/obj/item/I in component_parts) I.loc = src.loc diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 3b7d88d2aeb..7d276aebfd5 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -122,7 +122,7 @@ //almost never called, overwritten by all power machines but terminal and generator /obj/machinery/power/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/stack/cable_coil)) + if(iscoil(W)) var/obj/item/stack/cable_coil/coil = W diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 71ab924494b..de4608b1962 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -67,11 +67,11 @@ var/global/list/rad_collectors = list() W.loc = src update_icons() return 1 - else if(istype(W, /obj/item/weapon/crowbar)) + else if(iscrowbar(W)) if(P && !src.locked) eject() return 1 - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) if(P) user << "Remove the phoron tank first." return 1 diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 7cdb425c66f..ba9c389dedd 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -151,7 +151,7 @@ /obj/machinery/power/emitter/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) if(active) user << "Turn off [src] first." return @@ -174,7 +174,7 @@ user << "\The [src] needs to be unwelded from the floor." return - if(istype(W, /obj/item/weapon/weldingtool)) + if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W if(active) user << "Turn off [src] first." diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 185bc4f6483..5d769a5fced 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -93,7 +93,7 @@ field_generator power level display if(active) user << "The [src] needs to be off." return - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) switch(state) if(0) state = 1 @@ -112,7 +112,7 @@ field_generator power level display if(2) user << "The [src.name] needs to be unwelded from the floor." return - else if(istype(W, /obj/item/weapon/weldingtool)) + else if(iswelder(W)) var/obj/item/weapon/weldingtool/WT = W switch(state) if(0) diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index 720bce97a9b..8cb757bdfde 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -17,7 +17,7 @@ if(src) qdel(src) /obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) anchored = !anchored playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) if(anchored) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index c84291ed84d..768b9ce165f 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -268,7 +268,7 @@ /obj/machinery/power/smes/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(!open_hatch) open_hatch = 1 user << "You open the maintenance hatch of [src]." @@ -282,7 +282,7 @@ user << "You need to open access hatch on [src] first!" return 0 - if(istype(W, /obj/item/stack/cable_coil) && !terminal && !building_terminal) + if(iscoil(W) && !terminal && !building_terminal) building_terminal = 1 var/obj/item/stack/cable_coil/CC = W if (CC.get_amount() <= 10) @@ -301,7 +301,7 @@ stat = 0 return 0 - else if(istype(W, /obj/item/weapon/wirecutters) && terminal && !building_terminal) + else if(iswirecutter(W) && terminal && !building_terminal) building_terminal = 1 var/turf/tempTDir = terminal.loc if (istype(tempTDir)) diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 53973a903f2..34a5c822eff 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -306,7 +306,7 @@ if (..()) // Multitool - change RCON tag - if(istype(W, /obj/item/device/multitool)) + if(ismultitool(W)) var/newtag = input(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") as text if(newtag) RCon_tag = newtag @@ -330,7 +330,7 @@ failure_probability = 0 // Crowbar - Disassemble the SMES. - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) if (terminal) user << "You have to disassemble the terminal first!" return diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 2afab4d146c..a392ea044f9 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -59,7 +59,7 @@ /obj/machinery/power/solar/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) user.visible_message("[user] begins to take the glass off the solar panel.") if(do_after(user, 50)) @@ -224,13 +224,13 @@ /obj/item/solar_assembly/attackby(var/obj/item/weapon/W, var/mob/user) if(!anchored && isturf(loc)) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) anchored = 1 user.visible_message("[user] wrenches the solar assembly into place.") playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) return 1 else - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) anchored = 0 user.visible_message("[user] unwrenches the solar assembly from it's place.") playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) @@ -259,7 +259,7 @@ user.visible_message("[user] inserts the electronics into the solar assembly.") return 1 else - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) new /obj/item/weapon/tracker_electronics(src.loc) tracker = 0 user.visible_message("[user] takes out the electronics from the solar assembly.") @@ -398,7 +398,7 @@ return /obj/machinery/power/solar_control/attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index e6bc9ebc046..3e4944ecc4d 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -28,7 +28,7 @@ if(default_part_replacement(user, W)) return - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "You [anchored ? "unfasten" : "fasten"] [src] to the flooring." anchored = !anchored @@ -76,7 +76,7 @@ if(default_part_replacement(user, W)) return - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "You [anchored ? "unfasten" : "fasten"] [src] to the flooring." anchored = !anchored diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index b1f3d4f8d2f..66d3fcd6261 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -59,7 +59,7 @@ /obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user) - if(istype(W, /obj/item/weapon/crowbar)) + if(iscrowbar(W)) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) user.visible_message("[user] begins to take the glass off the solar tracker.") if(do_after(user, 50)) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 3b81d1a84c5..d5e84afe973 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -229,7 +229,7 @@ /* /obj/machinery/computer/turbine_computer/attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 38cab1b1d0a..988fe23a22f 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -29,7 +29,7 @@ update_icon() /obj/item/ammo_casing/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(!BB) user << "There is no bullet in the casing to inscribe anything into." return diff --git a/code/modules/projectiles/guns/energy/mining.dm b/code/modules/projectiles/guns/energy/mining.dm index f2311454dac..80ff8fc7b4d 100644 --- a/code/modules/projectiles/guns/energy/mining.dm +++ b/code/modules/projectiles/guns/energy/mining.dm @@ -40,7 +40,7 @@ user << "There is a [M.name] mod installed, using [M.cost]% capacity." /obj/item/weapon/gun/energy/kinetic_accelerator/attackby(obj/item/A, mob/user) - if(istype(A, /obj/item/weapon/crowbar)) + if(iscrowbar(A)) if(modkits.len) user << "You pry the modifications out." playsound(loc, 100, 1) diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm index 86404cdb31c..731a606332a 100644 --- a/code/modules/projectiles/guns/launcher/crossbow.dm +++ b/code/modules/projectiles/guns/launcher/crossbow.dm @@ -162,7 +162,7 @@ else user << "[src] already has a cell installed." - else if(istype(W, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(W)) if(cell) var/obj/item/C = cell C.loc = get_turf(user) @@ -226,7 +226,7 @@ else user << "You need at least three rods to complete this task." return - else if(istype(W,/obj/item/weapon/weldingtool)) + else if(iswelder(W)) if(buildstate == 1) var/obj/item/weapon/weldingtool/T = W if(T.remove_fuel(0,user)) @@ -236,7 +236,7 @@ buildstate++ update_icon() return - else if(istype(W,/obj/item/stack/cable_coil)) + else if(iscoil(W)) var/obj/item/stack/cable_coil/C = W if(buildstate == 2) if(C.use(5)) @@ -264,7 +264,7 @@ else user << "You need at least three plastic sheets to complete this task." return - else if(istype(W,/obj/item/weapon/screwdriver)) + else if(isscrewdriver(W)) if(buildstate == 5) user << "You secure the crossbow's various parts." new /obj/item/weapon/gun/launcher/crossbow(get_turf(src)) diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index 5b4b1e5afb4..d80bd420613 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -185,7 +185,7 @@ buildstate++ update_icon() return - else if(istype(W,/obj/item/weapon/weldingtool)) + else if(iswelder(W)) if(buildstate == 1) var/obj/item/weapon/weldingtool/T = W if(T.remove_fuel(0,user)) diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm index 3cd0931e165..96944839d1c 100644 --- a/code/modules/projectiles/guns/projectile/improvised.dm +++ b/code/modules/projectiles/guns/projectile/improvised.dm @@ -121,7 +121,7 @@ buildstate++ update_icon() return - else if(istype(W,/obj/item/stack/cable_coil)) + else if(iscoil(W)) var/obj/item/stack/cable_coil/C = W if(buildstate == 3) if(C.use(10)) @@ -196,7 +196,7 @@ buildstate++ update_icon() return - else if(istype(W,/obj/item/weapon/weldingtool)) + else if(iswelder(W)) if(buildstate == 3) var/obj/item/weapon/weldingtool/T = W if(T.remove_fuel(0,user)) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 6beed789732..7b7f65c505b 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -72,7 +72,7 @@ B.loc = src user << "You add the pill bottle into the dispenser slot!" src.updateUsrDialog() - else if(istype(B, /obj/item/weapon/wrench)) + else if(iswrench(B)) anchored = !anchored user << "You [anchored ? "attach" : "detach"] the [src] [anchored ? "to" : "from"] the ground" playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) diff --git a/code/modules/reagents/dispenser/dispenser2.dm b/code/modules/reagents/dispenser/dispenser2.dm index 5edeee7eca8..54fe4f758f1 100644 --- a/code/modules/reagents/dispenser/dispenser2.dm +++ b/code/modules/reagents/dispenser/dispenser2.dm @@ -65,7 +65,7 @@ SSnanoui.update_uis(src) /obj/machinery/chemical_dispenser/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "You begin to [anchored ? "un" : ""]fasten \the [src]." if (do_after(user, 20)) @@ -80,7 +80,7 @@ else if(istype(W, /obj/item/weapon/reagent_containers/chem_disp_cartridge)) add_cartridge(W, user) - else if(istype(W, /obj/item/weapon/screwdriver)) + else if(isscrewdriver(W)) var/label = input(user, "Which cartridge would you like to remove?", "Chemical Dispenser") as null|anything in cartridges if(!label) return var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = remove_cartridge(label) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index ddceed4a7e0..ceca174c1e7 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -108,7 +108,7 @@ /obj/structure/reagent_dispensers/fueltank/attackby(obj/item/weapon/W as obj, mob/user as mob) src.add_fingerprint(user) - if (istype(W,/obj/item/weapon/wrench)) + if (iswrench(W)) user.visible_message("[user] wrenches [src]'s faucet [modded ? "closed" : "open"].", \ "You wrench [src]'s faucet [modded ? "closed" : "open"]") modded = modded ? 0 : 1 @@ -224,7 +224,7 @@ reagents.add_reagent("water",500) /obj/structure/reagent_dispensers/water_cooler/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W,/obj/item/weapon/wrench)) + if (iswrench(W)) src.add_fingerprint(user) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) if(do_after(user, 20)) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 8f6621dd56b..09e9411fffa 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -121,7 +121,7 @@ // attack with item, place item on conveyor /obj/machinery/conveyor/attackby(var/obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/crowbar)) + if(iscrowbar(I)) if(!(stat & BROKEN)) var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc) C.id = id @@ -262,7 +262,7 @@ transmitter.set_dir(position) /obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/crowbar)) + if(iscrowbar(I)) var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc) C.id = id transfer_fingerprints_to(C) diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index 31e1aa48bbe..de34084ef0d 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -227,7 +227,7 @@ var/obj/structure/disposalpipe/CP = locate() in T - if(istype(I, /obj/item/weapon/wrench)) + if(iswrench(I)) if(anchored) anchored = 0 if(ispipe) @@ -265,7 +265,7 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) update() - else if(istype(I, /obj/item/weapon/weldingtool)) + else if(iswelder(I)) if(anchored) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 6bc70c4ff08..c2be19ae4de 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -54,7 +54,7 @@ src.add_fingerprint(user) if(mode<=0) // It's off - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) if(contents.len > 0) user << "Eject the items first!" return @@ -68,7 +68,7 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You attach the screws around the power connection." return - else if(istype(I,/obj/item/weapon/weldingtool) && mode==-1) + else if(iswelder(I) && mode==-1) if(contents.len > 0) user << "Eject the items first!" return @@ -862,7 +862,7 @@ if(!T.is_plating()) return // prevent interaction with T-scanner revealed pipes src.add_fingerprint(user) - if(istype(I, /obj/item/weapon/weldingtool)) + if(iswelder(I)) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) @@ -1331,7 +1331,7 @@ if(!T.is_plating()) return // prevent interaction with T-scanner revealed pipes src.add_fingerprint(user) - if(istype(I, /obj/item/weapon/weldingtool)) + if(iswelder(I)) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) @@ -1479,7 +1479,7 @@ if(!I || !user) return src.add_fingerprint(user) - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) if(mode==0) mode=1 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) @@ -1490,7 +1490,7 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You attach the screws around the power connection." return - else if(istype(I,/obj/item/weapon/weldingtool) && mode==1) + else if(iswelder(I) && mode==1) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index cf3161489bc..e5d9bf2af28 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -429,7 +429,7 @@ if(!I || !user) return - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) if(c_mode==0) c_mode=1 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) @@ -440,7 +440,7 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You attach the screws around the power connection." return - else if(istype(I,/obj/item/weapon/weldingtool) && c_mode==1) + else if(iswelder(I) && c_mode==1) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(1,user)) user << "You start slicing the floorweld off the delivery chute." diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index 0e6c0172385..1f2c79132ce 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -235,14 +235,14 @@ istype(W,/obj/item/weapon/melee/energy) ||\ istype(W,/obj/item/weapon/melee/cultblade) ||\ istype(W,/obj/item/weapon/card/emag) ||\ - istype(W,/obj/item/device/multitool)) + ismultitool(W)) if (my_effect.trigger == TRIGGER_ENERGY) my_effect.ToggleActivate() if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25)) secondary_effect.ToggleActivate(0) else if (istype(W,/obj/item/weapon/flame) && W:lit ||\ - istype(W,/obj/item/weapon/weldingtool) && W:welding) + iswelder(W) && W:welding) if(my_effect.trigger == TRIGGER_HEAT) my_effect.ToggleActivate() if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && prob(25)) diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index 0c0254381d3..cab006af9b2 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -166,14 +166,14 @@ user << "You remove the power cell" /obj/machinery/suspension_gen/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/screwdriver)) + if (isscrewdriver(W)) if(!open) if(screwed) screwed = 0 else screwed = 1 user << "You [screwed ? "screw" : "unscrew"] the battery panel." - else if (istype(W, /obj/item/weapon/crowbar)) + else if (iscrowbar(W)) if(!locked) if(!screwed) if(!suspension_field) @@ -189,7 +189,7 @@ user << "Unscrew [src]'s battery panel first." else user << "[src]'s security locks are engaged." - else if (istype(W, /obj/item/weapon/wrench)) + else if (iswrench(W)) if(!suspension_field) if(anchored) anchored = 0 diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index a174af31c40..7af9907fd7b 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -270,7 +270,7 @@ return 1 /obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) if(is_open) user << "You close the panel." @@ -279,7 +279,7 @@ user << "You open the panel and expose the wiring." is_open = 1 - else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open) + else if(iscoil(W) && malfunction && is_open) var/obj/item/stack/cable_coil/coil = W user << "You begin to replace the wires." //if(do_after(user, min(60, round( ((maxhealth/health)*10)+(malfunction*10) ))) //Take longer to repair heavier damage @@ -290,7 +290,7 @@ user << "You repair the [src]!" update_icon() - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) if(locked) user << "The bolts are covered, unlocking this would retract the covers." return diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm index e665a0ee8b1..d5f2cb7731a 100644 --- a/code/modules/shieldgen/sheldwallgen.dm +++ b/code/modules/shieldgen/sheldwallgen.dm @@ -154,7 +154,7 @@ /obj/machinery/shieldwallgen/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) if(active) user << "Turn off the field generator first." return diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 94e815a37da..bde7ecd1e64 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -47,7 +47,7 @@ updateDialog() else user << span("alert", "Access denied.") - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) src.anchored = !src.anchored src.visible_message(span("notice", "\The [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by \the [user].")) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index a6b6bfa634a..908438d586a 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -62,7 +62,7 @@ updateDialog() else user << span("alert", "Access denied.") - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) src.anchored = !src.anchored src.visible_message(span("notice", "\The [src] has been [anchored ? "bolted to the floor":"unbolted from the floor"] by \the [user].")) diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 0bf5004c5da..47d945f1d23 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -185,7 +185,7 @@ can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if(!istype(target)) return 0 - if(istype(tool,/obj/item/weapon/weldingtool)) + if(iswelder(tool)) var/obj/item/weapon/weldingtool/welder = tool if(!welder.isOn() || !welder.remove_fuel(1,user)) return 0 diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index e625018e55d..2bfe81c0a4e 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -130,7 +130,7 @@ can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if(..()) var/obj/item/organ/external/affected = target.get_organ(target_zone) - if(istype(tool,/obj/item/weapon/weldingtool)) + if(iswelder(tool)) var/obj/item/weapon/weldingtool/welder = tool if(!welder.isOn() || !welder.remove_fuel(1,user)) return 0 diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 202b02ee807..6823961e341 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -103,7 +103,7 @@ /obj/structure/table/attackby(obj/item/weapon/W, mob/user) - if(reinforced && istype(W, /obj/item/weapon/screwdriver)) + if(reinforced && isscrewdriver(W)) remove_reinforced(W, user) if(!reinforced) update_desc() @@ -111,7 +111,7 @@ update_material() return 1 - if(carpeted && istype(W, /obj/item/weapon/crowbar)) + if(carpeted && iscrowbar(W)) user.visible_message("\The [user] removes the carpet from \the [src].", "You remove the carpet from \the [src].") new /obj/item/stack/tile/carpet(loc) @@ -130,7 +130,7 @@ else user << "You don't have enough carpet!" - if(!reinforced && !carpeted && material && istype(W, /obj/item/weapon/wrench)) + if(!reinforced && !carpeted && material && iswrench(W)) remove_material(W, user) if(!material) update_connections(1) @@ -141,11 +141,11 @@ update_material() return 1 - if(!carpeted && !reinforced && !material && istype(W, /obj/item/weapon/wrench)) + if(!carpeted && !reinforced && !material && iswrench(W)) dismantle(W, user) return 1 - if(health < maxhealth && istype(W, /obj/item/weapon/weldingtool)) + if(health < maxhealth && iswelder(W)) var/obj/item/weapon/weldingtool/F = W if(F.welding) user << "You begin reparing damage to \the [src]." diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index cc6ad954919..f26d3e6aa5a 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -32,12 +32,12 @@ return if(panel_open) - if(istype(I, /obj/item/device/multitool)) + if(ismultitool(I)) var/obj/item/device/multitool/M = I M.buffer = src user << "You save the data in the [I.name]'s buffer." else - if(istype(I, /obj/item/device/multitool)) + if(ismultitool(I)) user << "You should open [src]'s maintenance panel first." default_deconstruction_crowbar(user, I) @@ -62,7 +62,7 @@ var/stage = 0 /obj/machinery/telepad_cargo/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/wrench)) + if(iswrench(W)) anchored = 0 playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(anchored) @@ -71,7 +71,7 @@ else if(!anchored) anchored = 1 user << "\The [src] is now secured." - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(stage == 0) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) user << "You unscrew the telepad's tracking beacon." @@ -80,7 +80,7 @@ playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) user << "You screw in the telepad's tracking beacon." stage = 0 - if(istype(W, /obj/item/weapon/weldingtool) && stage == 1) + if(iswelder(W) && stage == 1) playsound(src, 'sound/items/Welder.ogg', 50, 1) user << "You disassemble the telepad." new /obj/item/stack/material/steel(get_turf(src)) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 511a86ddedb..48db1d4f2de 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -63,7 +63,7 @@ user.unEquip(W) W.loc = src user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", "You insert [W] into \the [src]'s GPS device slot.") - else if(istype(W, /obj/item/device/multitool)) + else if(ismultitool(W)) var/obj/item/device/multitool/M = W if(M.buffer && istype(M.buffer, /obj/machinery/telepad)) telepad = M.buffer diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 29be350563e..b1b669a29f6 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -63,7 +63,7 @@ return ..() /obj/vehicle/train/cargo/trolley/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(open && istype(W, /obj/item/weapon/wirecutters)) + if(open && iswirecutter(W)) passenger_allowed = !passenger_allowed user.visible_message("[user] [passenger_allowed ? "cuts" : "mends"] a cable in [src].","You [passenger_allowed ? "cut" : "mend"] the load limiter cable.") else diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 4d5682fb804..0cf8ed10a1f 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -77,17 +77,17 @@ /obj/vehicle/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/hand_labeler)) return - if(istype(W, /obj/item/weapon/screwdriver)) + if(isscrewdriver(W)) if(!locked) open = !open update_icon() user << "Maintenance panel is now [open ? "opened" : "closed"]." - else if(istype(W, /obj/item/weapon/crowbar) && cell && open) + else if(iscrowbar(W) && cell && open) remove_cell(user) else if(istype(W, /obj/item/weapon/cell) && !cell && open) insert_cell(W, user) - else if(istype(W, /obj/item/weapon/weldingtool)) + else if(iswelder(W)) var/obj/item/weapon/weldingtool/T = W if(T.welding) if(health < maxhealth) diff --git a/code/modules/virus2/centrifuge.dm b/code/modules/virus2/centrifuge.dm index 888fb8885db..7af8afbb917 100644 --- a/code/modules/virus2/centrifuge.dm +++ b/code/modules/virus2/centrifuge.dm @@ -10,7 +10,7 @@ var/datum/disease2/disease/virus2 = null /obj/machinery/computer/centrifuge/attackby(var/obj/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/screwdriver)) + if(isscrewdriver(O)) return ..(O,user) if(istype(O,/obj/item/weapon/reagent_containers/glass/beaker/vial)) diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index a21691c9e0b..019f5cc1368 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -13,7 +13,7 @@ var/scanning = 0 /obj/machinery/computer/diseasesplicer/attackby(var/obj/I as obj, var/mob/user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) + if(isscrewdriver(I)) return ..(I,user) if(istype(I,/obj/item/weapon/virusdish))