From e587b970da790e117bcca65e4b6d401509991eb3 Mon Sep 17 00:00:00 2001 From: nemvar <47324920+nemvar@users.noreply.github.com> Date: Sun, 4 Aug 2019 07:25:57 +0200 Subject: [PATCH] Adds parent calls to almost all tool_acts (#45582) * Adds parent calls to almost all tool_acts * actually compiles --- code/game/machinery/Sleeper.dm | 2 ++ code/game/machinery/camera/camera.dm | 9 ++++++--- code/game/machinery/camera/camera_assembly.dm | 6 ++++-- code/game/machinery/defibrillator_mount.dm | 1 + code/game/machinery/pipe/construction.dm | 3 ++- code/game/machinery/pipe/pipe_dispenser.dm | 1 + code/game/machinery/shieldgen.dm | 3 ++- code/game/machinery/stasis.dm | 6 ++++-- .../items/circuitboards/computer_circuitboards.dm | 4 +++- .../objects/items/circuitboards/machine_circuitboards.dm | 1 + code/game/objects/items/robot/robot_parts.dm | 1 + code/game/objects/items/shooting_range.dm | 1 + code/game/objects/items/stacks/sheets/glass.dm | 1 + code/game/objects/items/stacks/sheets/light.dm | 1 + code/game/objects/structures/girders.dm | 4 ++-- code/game/objects/structures/guillotine.dm | 1 + code/game/objects/structures/mineral_doors.dm | 2 ++ code/game/objects/structures/mirror.dm | 1 + code/game/objects/structures/musician.dm | 1 + code/game/objects/structures/plasticflaps.dm | 5 ++--- code/game/objects/structures/shower.dm | 1 + .../transit_tubes/transit_tube_construction.dm | 1 + code/game/objects/structures/watercloset.dm | 2 ++ code/game/shuttle_engines.dm | 2 ++ code/game/turfs/simulated/floor.dm | 3 ++- code/game/turfs/simulated/floor/plating.dm | 1 + code/game/turfs/simulated/floor/reinf_floor.dm | 1 + .../clockcult/clock_structures/_trap_object.dm | 2 ++ code/modules/assembly/bomb.dm | 2 ++ code/modules/assembly/shock_kit.dm | 1 + code/modules/assembly/voice.dm | 1 + .../machinery/components/unary_devices/vent_pump.dm | 1 + .../machinery/components/unary_devices/vent_scrubber.dm | 1 + code/modules/atmospherics/machinery/other/meter.dm | 1 + code/modules/atmospherics/machinery/portable/canister.dm | 1 + code/modules/clothing/head/helmet.dm | 2 +- code/modules/clothing/head/jobs.dm | 1 + code/modules/clothing/masks/hailer.dm | 1 + code/modules/events/pirates.dm | 2 ++ .../food_and_drinks/kitchen_machinery/monkeyrecycler.dm | 1 + code/modules/mining/equipment/survival_pod.dm | 2 ++ code/modules/mining/machine_silo.dm | 3 ++- code/modules/mining/minebot.dm | 1 + code/modules/mining/ores_coins.dm | 2 ++ code/modules/modular_computers/hardware/_hardware.dm | 1 + code/modules/paperwork/ticketmachine.dm | 1 + code/modules/plumbing/ducts.dm | 1 + code/modules/plumbing/plumbers/_plumb_machinery.dm | 2 ++ code/modules/plumbing/plumbers/acclimator.dm | 1 + code/modules/plumbing/plumbers/pumps.dm | 1 + code/modules/plumbing/plumbers/synthesizer.dm | 1 + code/modules/power/apc.dm | 4 +++- code/modules/power/generator.dm | 2 ++ code/modules/power/singularity/collector.dm | 1 + code/modules/power/singularity/emitter.dm | 2 ++ code/modules/power/singularity/field_generator.dm | 2 ++ .../singularity/particle_accelerator/particle_control.dm | 2 +- code/modules/power/smes.dm | 1 + code/modules/power/supermatter/supermatter.dm | 1 + code/modules/power/terminal.dm | 1 + code/modules/reagents/reagent_dispenser.dm | 1 + code/modules/recycling/disposal/construction.dm | 2 ++ code/modules/recycling/disposal/outlet.dm | 1 + code/modules/recycling/disposal/pipe.dm | 1 + code/modules/research/rdconsole.dm | 3 ++- code/modules/research/xenobiology/xenobio_camera.dm | 1 + code/modules/shuttle/spaceship_navigation_beacon.dm | 5 +++-- code/modules/station_goals/bsa.dm | 1 + code/modules/station_goals/shield.dm | 1 + code/modules/surgery/bodyparts/robot_bodyparts.dm | 2 ++ code/modules/vehicles/scooter.dm | 2 ++ code/modules/vehicles/wheelchair.dm | 1 + code/modules/vending/_vending.dm | 3 ++- 73 files changed, 114 insertions(+), 24 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 19066176685..f8d7d385a1e 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -114,10 +114,12 @@ return FALSE /obj/machinery/sleeper/wrench_act(mob/living/user, obj/item/I) + . = ..() if(default_change_direction_wrench(user, I)) return TRUE /obj/machinery/sleeper/crowbar_act(mob/living/user, obj/item/I) + . = ..() if(default_pry_open(I)) return TRUE if(default_deconstruction_crowbar(I)) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 01459010385..f5e3c00dec8 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -196,24 +196,27 @@ return TRUE /obj/machinery/camera/wirecutter_act(mob/living/user, obj/item/I) + . = ..() if(!panel_open) - return FALSE + return toggle_cam(user, 1) obj_integrity = max_integrity //this is a pretty simplistic way to heal the camera, but there's no reason for this to be complex. I.play_tool_sound(src) return TRUE /obj/machinery/camera/multitool_act(mob/living/user, obj/item/I) + . = ..() if(!panel_open) - return FALSE + return setViewRange((view_range == initial(view_range)) ? short_range : initial(view_range)) to_chat(user, "You [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus.") return TRUE /obj/machinery/camera/welder_act(mob/living/user, obj/item/I) + . = ..() if(!panel_open) - return FALSE + return if(!I.tool_start_check(user, amount=0)) return TRUE diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 34961c2608e..7731ead88e8 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -239,8 +239,9 @@ return TRUE /obj/structure/camera_assembly/wirecutter_act(mob/user, obj/item/I) + . = ..() if(state != STATE_WIRED) - return FALSE + return new /obj/item/stack/cable_coil(drop_location(), 2) I.play_tool_sound(src) @@ -249,8 +250,9 @@ return TRUE /obj/structure/camera_assembly/wrench_act(mob/user, obj/item/I) + . = ..() if(state != STATE_WRENCHED) - return FALSE + return I.play_tool_sound(src) to_chat(user, "You detach [src] from its place.") new /obj/item/wallframe/camera(drop_location()) diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index ecd7aaacf8b..5bd8d1e125c 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -96,6 +96,7 @@ ..() /obj/machinery/defibrillator_mount/multitool_act(mob/living/user, obj/item/multitool) + ..() if(!defib) to_chat(user, "There isn't any defibrillator to clamp in!") return TRUE diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index dc2fd919ac8..81fc62f3c4c 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -127,6 +127,7 @@ Buildable meters setDir(turn(dir,-90)) /obj/item/pipe/wrench_act(mob/living/user, obj/item/wrench/W) + . = ..() if(!isturf(loc)) return TRUE @@ -196,7 +197,7 @@ Buildable meters var/piping_layer = PIPING_LAYER_DEFAULT /obj/item/pipe_meter/wrench_act(mob/living/user, obj/item/wrench/W) - + . = ..() var/obj/machinery/atmospherics/pipe/pipe for(var/obj/machinery/atmospherics/pipe/P in loc) if(P.piping_layer == piping_layer) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 9f632cfef90..e64ef7aba17 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -79,6 +79,7 @@ return FALSE /obj/machinery/pipedispenser/wrench_act(mob/living/user, obj/item/I) + ..() if(default_unfasten_wrench(user, I, 40)) user << browse(null, "window=pipedispenser") diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index ec3a56c9b40..e144f56a568 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -338,7 +338,8 @@ /obj/machinery/power/shieldwallgen/wrench_act(mob/living/user, obj/item/I) - . = default_unfasten_wrench(user, I, 0) + . = ..() + . |= default_unfasten_wrench(user, I, 0) var/turf/T = get_turf(src) update_cable_icons_on_turf(T) if(. == SUCCESSFUL_UNFASTEN && anchored) diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index c2aa00de698..f6c35756018 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -126,11 +126,13 @@ thaw_them(L_occupant) /obj/machinery/stasis/screwdriver_act(mob/living/user, obj/item/I) - . = default_deconstruction_screwdriver(user, "stasis_maintenance", "stasis", I) + . = ..() + . |= default_deconstruction_screwdriver(user, "stasis_maintenance", "stasis", I) update_icon() /obj/machinery/stasis/crowbar_act(mob/living/user, obj/item/I) - return default_deconstruction_crowbar(I) + . = ..() + return default_deconstruction_crowbar(I) || . /obj/machinery/stasis/nap_violation(mob/violator) unbuckle_mob(violator, TRUE) diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 0ff88a52b00..4587dd2624a 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -415,7 +415,7 @@ name = "Security Cameras (Computer Board)" icon_state = "security" build_path = /obj/machinery/computer/security - + /obj/item/circuitboard/computer/advanced_camera name = "Advanced Camera Console (Computer Board)" icon_state = "security" @@ -437,6 +437,7 @@ var/contraband = FALSE /obj/item/circuitboard/computer/cargo/multitool_act(mob/living/user) + . = ..() if(!(obj_flags & EMAGGED)) contraband = !contraband to_chat(user, "Receiver spectrum set to [contraband ? "Broad" : "Standard"].") @@ -454,6 +455,7 @@ build_path = /obj/machinery/computer/cargo/express /obj/item/circuitboard/computer/cargo/express/multitool_act(mob/living/user) + . = ..() if (!(obj_flags & EMAGGED)) to_chat(user, "Routing protocols are already set to: \"factory defaults\".") else diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 8e006ab2b2b..7997b97d195 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -844,6 +844,7 @@ /obj/item/stock_parts/manipulator = 1) /obj/item/circuitboard/machine/public_nanite_chamber/multitool_act(mob/living/user) + . = ..() var/new_cloud = input("Set the public nanite chamber's Cloud ID (1-100).", "Cloud ID", cloud_id) as num|null if(new_cloud == null) return diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 725efbbe704..4e97e824175 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -64,6 +64,7 @@ return 0 /obj/item/robot_suit/wrench_act(mob/living/user, obj/item/I) //Deconstucts empty borg shell. Flashes remain unbroken because they haven't been used yet + . = ..() var/turf/T = get_turf(src) if(l_leg || r_leg || chest || l_arm || r_arm || head) if(I.use_tool(src, user, 5, volume=50)) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 3e8ca31f77d..6dcf0e200bd 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -26,6 +26,7 @@ pinnedLoc.forceMove(loc) /obj/item/target/welder_act(mob/living/user, obj/item/I) + ..() if(I.use_tool(src, user, 0, volume=40)) removeOverlays() to_chat(user, "You slice off [src]'s uneven chunks of aluminium and scorch marks.") diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 10c33050a44..8d458f795c0 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -309,6 +309,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( return ..() /obj/item/shard/welder_act(mob/living/user, obj/item/I) + ..() if(I.use_tool(src, user, 0, volume=50)) var/obj/item/stack/sheet/glass/NG = new (user.loc) for(var/obj/item/stack/sheet/glass/G in user.loc) diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index c42cfbe571b..da6cc64c9e3 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -27,6 +27,7 @@ return ..() /obj/item/stack/light_w/wirecutter_act(mob/living/user, obj/item/I) + . = ..() var/atom/Tsec = user.drop_location() var/obj/item/stack/cable_coil/CC = new (Tsec, 5) CC.add_fingerprint(user) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 8e77dd9f4c1..8f21d4ad594 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -245,7 +245,7 @@ // Wirecutter behavior for girders /obj/structure/girder/wirecutter_act(mob/user, obj/item/tool) - . = FALSE + . = ..() if(state == GIRDER_REINF_STRUTS) to_chat(user, "You start removing the inner grille...") if(tool.use_tool(src, user, 40, volume=100)) @@ -257,7 +257,7 @@ return TRUE /obj/structure/girder/wrench_act(mob/user, obj/item/tool) - . = FALSE + . = ..() if(state == GIRDER_DISPLACED) if(!isfloorturf(loc)) to_chat(user, "A floor must be present to secure the girder!") diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index 09492117a4b..127776613af 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -246,6 +246,7 @@ return ..() /obj/structure/guillotine/wrench_act(mob/living/user, obj/item/I) + . = ..() if (current_action) return diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index dc0c1778963..2c636c1f510 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -136,6 +136,7 @@ air_update_turf(TRUE) /obj/structure/mineral_door/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I, 40) return TRUE @@ -155,6 +156,7 @@ deconstruct(TRUE) /obj/structure/mineral_door/welder_act(mob/living/user, obj/item/I) //override if the door is supposed to be flammable. + ..() . = TRUE if(anchored) to_chat(user, "[src] is still firmly secured to the ground!") diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 154dc9382b9..dde576a1534 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -67,6 +67,7 @@ qdel(src) /obj/structure/mirror/welder_act(mob/living/user, obj/item/I) + ..() if(user.a_intent == INTENT_HARM) return FALSE diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 4e669dd819d..cd1673dda1d 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -381,5 +381,6 @@ song.interact(user) /obj/structure/piano/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I, 40) return TRUE diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index b4e730bf4a7..c56255669e0 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -38,6 +38,7 @@ return TRUE /obj/structure/plasticflaps/wirecutter_act(mob/living/user, obj/item/W) + . = ..() if(!anchored) user.visible_message("[user] cuts apart [src].", "You start to cut apart [src].", "You hear cutting.") if(W.use_tool(src, user, 50, volume=100)) @@ -47,9 +48,7 @@ var/obj/item/stack/sheet/plastic/five/P = new(loc) P.add_fingerprint(user) qdel(src) - return TRUE - else - return TRUE + return TRUE /obj/structure/plasticflaps/proc/check_anchored_state(check_anchored) if(anchored != check_anchored) diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index cc47312f5a0..c7eead9a025 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -49,6 +49,7 @@ return ..() /obj/machinery/shower/wrench_act(mob/living/user, obj/item/I) + ..() to_chat(user, "You begin to adjust the temperature valve with \the [I]...") if(I.use_tool(src, user, 50)) switch(current_temperature) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index bb5309e1847..2f820dbe5d3 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -41,6 +41,7 @@ icon_state = "[base_icon][flipped]" /obj/structure/c_transit_tube/wrench_act(mob/living/user, obj/item/I) + ..() if(!can_wrench_in_loc(user)) return to_chat(user, "You start attaching the [name]...") diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index e86d6794c3a..7fb5a9962c9 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -404,10 +404,12 @@ return ..() /obj/structure/curtain/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I, 50) return TRUE /obj/structure/curtain/wirecutter_act(mob/living/user, obj/item/I) + ..() if(anchored) return TRUE diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index 0f68e68b7b5..33bc7d2d98b 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -35,10 +35,12 @@ state = ENGINE_UNWRENCHED /obj/structure/shuttle/engine/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I) return TRUE /obj/structure/shuttle/engine/welder_act(mob/living/user, obj/item/I) + . = ..() switch(state) if(ENGINE_UNWRENCHED) to_chat(user, "The [src.name] needs to be wrenched to the floor!") diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index bcf07bad758..be3d33956c7 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -161,7 +161,8 @@ return 0 /turf/open/floor/crowbar_act(mob/living/user, obj/item/I) - return intact ? pry_tile(I, user) : FALSE + if(intact && pry_tile(I, user)) + return TRUE /turf/open/floor/proc/try_replace_tile(obj/item/stack/tile/T, mob/user, params) if(T.turf_type == type) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index f23ddab94a8..2ec67655829 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -86,6 +86,7 @@ to_chat(user, "This section is too damaged to support a tile! Use a welder to fix the damage.") /turf/open/floor/plating/welder_act(mob/living/user, obj/item/I) + ..() if((broken || burnt) && I.use_tool(src, user, 0, volume=80)) to_chat(user, "You fix some dents on the broken plating.") icon_state = icon_plating diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm index 1bad0db7e0d..19ed5383b28 100644 --- a/code/game/turfs/simulated/floor/reinf_floor.dm +++ b/code/game/turfs/simulated/floor/reinf_floor.dm @@ -37,6 +37,7 @@ return /turf/open/floor/engine/wrench_act(mob/living/user, obj/item/I) + ..() to_chat(user, "You begin removing rods...") if(I.use_tool(src, user, 30, volume=80)) if(!istype(src, /turf/open/floor/engine)) diff --git a/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm b/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm index d09e568f25b..b611c8e940e 100644 --- a/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm +++ b/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm @@ -28,6 +28,7 @@ . += "[O] ([distance == 0 ? "same tile" : "[distance] tiles [dir2text(get_dir(src, O))]"])" /obj/structure/destructible/clockwork/trap/wrench_act(mob/living/user, obj/item/I) + ..() if(!is_servant_of_ratvar(user)) return ..() to_chat(user, "You break down the delicate components of [src] into brass.") @@ -57,6 +58,7 @@ ..() /obj/structure/destructible/clockwork/trap/wirecutter_act(mob/living/user, obj/item/I) + . = ..() if(!is_servant_of_ratvar(user)) return if(!wired_to.len) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index bf8d57ccd71..6239cb4b142 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -30,6 +30,7 @@ add_overlay("bomb_assembly") /obj/item/onetankbomb/wrench_act(mob/living/user, obj/item/I) + ..() to_chat(user, "You disassemble [src]!") if(bombassembly) bombassembly.forceMove(drop_location()) @@ -43,6 +44,7 @@ return TRUE /obj/item/onetankbomb/welder_act(mob/living/user, obj/item/I) + ..() . = FALSE if(status) to_chat(user, "[bombtank] already has a pressure hole!") diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 8d9ba9880c1..7a1c00bfc2f 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -14,6 +14,7 @@ return ..() /obj/item/assembly/shock_kit/wrench_act(mob/living/user, obj/item/I) + ..() to_chat(user, "You disassemble [src].") if(part1) part1.forceMove(drop_location()) diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index ad60c81b928..0dd79f8c772 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -71,6 +71,7 @@ . = TRUE /obj/item/assembly/voice/multitool_act(mob/living/user, obj/item/I) + ..() mode %= modes.len mode++ to_chat(user, "You set [src] into [modes[mode]] mode.") diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 4189672b142..8df70dffced 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -247,6 +247,7 @@ update_icon() /obj/machinery/atmospherics/components/unary/vent_pump/welder_act(mob/living/user, obj/item/I) + ..() if(!I.tool_start_check(user, amount=0)) return TRUE to_chat(user, "You begin welding the vent...") diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index b474df7f430..400fb8ae383 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -263,6 +263,7 @@ update_icon_nopipes() /obj/machinery/atmospherics/components/unary/vent_scrubber/welder_act(mob/living/user, obj/item/I) + ..() if(!I.tool_start_check(user, amount=0)) return TRUE to_chat(user, "Now welding the scrubber.") diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 9870a89526d..c568438af2b 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -114,6 +114,7 @@ . += status() /obj/machinery/meter/wrench_act(mob/user, obj/item/I) + ..() to_chat(user, "You begin to unfasten \the [src]...") if (I.use_tool(src, user, 40, volume=50)) user.visible_message( diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 6b1a9787782..a39fb1651a7 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -289,6 +289,7 @@ qdel(src) /obj/machinery/portable_atmospherics/canister/welder_act(mob/living/user, obj/item/I) + ..() if(user.a_intent == INTENT_HARM) return FALSE diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index cc6d2099d4e..ba0a43fe38c 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -349,7 +349,7 @@ return ..() /obj/item/clothing/head/helmet/screwdriver_act(mob/living/user, obj/item/I) - ..() + . = ..() if(can_flashlight && attached_light) //if it has a light but can_flashlight is false, the light is permanently attached. I.play_tool_sound(src) to_chat(user, "You unscrew [attached_light] from [src].") diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index d2aef786a27..badb00381d5 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -193,6 +193,7 @@ return TRUE /obj/item/clothing/head/warden/drill/wirecutter_act(mob/living/user, obj/item/I) + ..() if(mode != DRILL_CANADIAN) to_chat(user, "You broke the voice circuit!") mode = DRILL_CANADIAN diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index fa5536653bf..848fd92a292 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -62,6 +62,7 @@ return TRUE /obj/item/clothing/mask/gas/sechailer/wirecutter_act(mob/living/user, obj/item/I) + ..() if(aggressiveness != 4) to_chat(user, "You broke the restrictor!") aggressiveness = 4 diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 756b9fac4b1..8bb1fbc7e8b 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -251,6 +251,7 @@ var/cargo_hold_id /obj/machinery/piratepad/multitool_act(mob/living/user, obj/item/multitool/I) + . = ..() if (istype(I)) to_chat(user, "You register [src] in [I]s buffer.") I.buffer = src @@ -272,6 +273,7 @@ return INITIALIZE_HINT_LATELOAD /obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I) + . = ..() if (istype(I) && istype(I.buffer,/obj/machinery/piratepad)) to_chat(user, "You link [src] with [I.buffer] in [I] buffer.") pad = I.buffer diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index bf8ae8047e5..78ea4962ad1 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -95,6 +95,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) to_chat(user, "The machine needs at least 1 monkey worth of material to produce a monkey cube. It currently has [stored_matter].") /obj/machinery/monkey_recycler/multitool_act(mob/living/user, obj/item/multitool/I) + . = ..() if(istype(I)) to_chat(user, "You log [src] in the multitool's buffer.") I.buffer = src diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 7625824a90d..bfebf16ae93 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -161,6 +161,7 @@ pixel_y = -32 /obj/item/gps/computer/wrench_act(mob/living/user, obj/item/I) + ..() if(flags_1 & NODECONSTRUCT_1) return TRUE @@ -240,6 +241,7 @@ qdel(src) /obj/structure/fans/wrench_act(mob/living/user, obj/item/I) + ..() if(flags_1 & NODECONSTRUCT_1) return TRUE diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index 872f134688f..58bbda1b4ea 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -80,7 +80,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs) var/sheets = round(amount) / MINERAL_MATERIAL_AMOUNT var/ref = REF(M) if (sheets) - if (sheets >= 1) + if (sheets >= 1) ui += "Eject" else ui += "Eject" @@ -163,6 +163,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs) return TRUE /obj/machinery/ore_silo/multitool_act(mob/living/user, obj/item/multitool/I) + . = ..() if (istype(I)) to_chat(user, "You log [src] in the multitool's buffer.") I.buffer = src diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index f57a21374d7..f68de678341 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -86,6 +86,7 @@ . += "There is \a [M] installed, using [M.cost]% capacity." /mob/living/simple_animal/hostile/mining_drone/welder_act(mob/living/user, obj/item/I) + ..() . = TRUE if(mode == MINEDRONE_ATTACK) to_chat(user, "[src] can't be repaired while in attack mode!") diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 05232d6134f..49d8a1a133c 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -40,6 +40,7 @@ add_overlay(stack_overlays) /obj/item/stack/ore/welder_act(mob/living/user, obj/item/I) + ..() if(!refined_type) return TRUE @@ -451,6 +452,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ ..() /obj/item/coin/wirecutter_act(mob/living/user, obj/item/I) + ..() if(!string_attached) return TRUE diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index 219bd6b1c29..b33442f99b3 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -49,6 +49,7 @@ return ..() /obj/item/computer_hardware/multitool_act(mob/living/user, obj/item/I) + ..() to_chat(user, "***** DIAGNOSTICS REPORT *****") diagnostics(user) to_chat(user, "******************************") diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm index f2010a5f99f..2fded31edbb 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -60,6 +60,7 @@ ours.id = id /obj/machinery/button/ticket_machine/multitool_act(mob/living/user, obj/item/I) + . = ..() if(I.tool_behaviour == TOOL_MULTITOOL) var/obj/item/multitool/M = I if(M.buffer && !istype(M.buffer, /obj/machinery/ticket_machine)) diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm index 0e0fa7518ae..8f7c4e518b9 100644 --- a/code/modules/plumbing/ducts.dm +++ b/code/modules/plumbing/ducts.dm @@ -205,6 +205,7 @@ All the important duct code: /obj/machinery/duct/wrench_act(mob/living/user, obj/item/I) //I can also be the RPD + ..() add_fingerprint(user) I.play_tool_sound(src) if(anchored) diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm index 3d78d18d7f6..890921550b4 100644 --- a/code/modules/plumbing/plumbers/_plumb_machinery.dm +++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm @@ -31,6 +31,7 @@ AddComponent(/datum/component/plumbing/simple_supply) /obj/machinery/plumbing/input/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I) return TRUE @@ -46,5 +47,6 @@ AddComponent(/datum/component/plumbing/simple_demand) /obj/machinery/plumbing/output/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I) return TRUE \ No newline at end of file diff --git a/code/modules/plumbing/plumbers/acclimator.dm b/code/modules/plumbing/plumbers/acclimator.dm index 96348406498..91478068102 100644 --- a/code/modules/plumbing/plumbers/acclimator.dm +++ b/code/modules/plumbing/plumbers/acclimator.dm @@ -27,6 +27,7 @@ AddComponent(/datum/component/plumbing/acclimator) /obj/machinery/plumbing/acclimator/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I) return TRUE diff --git a/code/modules/plumbing/plumbers/pumps.dm b/code/modules/plumbing/plumbers/pumps.dm index 782540470ac..2f3ed97d457 100644 --- a/code/modules/plumbing/plumbers/pumps.dm +++ b/code/modules/plumbing/plumbers/pumps.dm @@ -35,6 +35,7 @@ return ..() /obj/machinery/power/liquid_pump/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I) return TRUE ///please note that the component has a hook in the parent call, wich handles activating and deactivating diff --git a/code/modules/plumbing/plumbers/synthesizer.dm b/code/modules/plumbing/plumbers/synthesizer.dm index b63600ca0bb..565140d8bda 100644 --- a/code/modules/plumbing/plumbers/synthesizer.dm +++ b/code/modules/plumbing/plumbers/synthesizer.dm @@ -51,6 +51,7 @@ AddComponent(/datum/component/plumbing/simple_supply) /obj/machinery/plumbing/synthesizer/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I) return TRUE diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index ec3b4c132c0..f5f39052ac1 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -525,12 +525,14 @@ update_icon() /obj/machinery/power/apc/wirecutter_act(mob/living/user, obj/item/W) + . = ..() if (terminal && opened) terminal.dismantle(user, W) return TRUE /obj/machinery/power/apc/welder_act(mob/living/user, obj/item/W) + . = ..() if (opened && !has_electronics && !terminal) if(!W.tool_start_check(user, amount=3)) return @@ -718,7 +720,7 @@ if(stat & BROKEN) to_chat(user, "[src]'s frame is too damaged to support a circuit.") return FALSE - return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) + return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) else if(!cell) if(stat & MAINT) to_chat(user, "There's no connector for a power cell.") diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index f3f960c0eec..95c17097334 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -193,6 +193,7 @@ C.generator = src /obj/machinery/power/generator/wrench_act(mob/living/user, obj/item/I) + . = ..() if(!panel_open) return anchored = !anchored @@ -204,6 +205,7 @@ return TRUE /obj/machinery/power/generator/multitool_act(mob/living/user, obj/item/I) + . = ..() if(!anchored) return find_circs() diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index d2a90378d47..45c5524c16f 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -138,6 +138,7 @@ return ..() /obj/machinery/power/rad_collector/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I) return TRUE diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 2b454ffc18a..6d19ceb6a01 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -252,10 +252,12 @@ state = EMITTER_UNWRENCHED /obj/machinery/power/emitter/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I) return TRUE /obj/machinery/power/emitter/welder_act(mob/living/user, obj/item/I) + . = ..() if(active) to_chat(user, "Turn \the [src] off first.") return TRUE diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index e94f35f0f11..fb3e4ff8bf5 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -106,10 +106,12 @@ field_generator power level display state = FG_UNSECURED /obj/machinery/field/generator/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I) return TRUE /obj/machinery/field/generator/welder_act(mob/living/user, obj/item/I) + . = ..() if(active) to_chat(user, "[src] needs to be off!") return TRUE diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index d9d24b597d5..733dcb65661 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -35,7 +35,7 @@ return ..() /obj/machinery/particle_accelerator/control_box/multitool_act(mob/living/user, obj/item/I) - ..() + . = ..() if(construction_state == PA_CONSTRUCTION_PANEL_OPEN) wires.interact(user) return TRUE diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 176ea8a8e1d..823321907d3 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -161,6 +161,7 @@ /obj/machinery/power/smes/wirecutter_act(mob/living/user, obj/item/I) //disassembling the terminal + . = ..() if(terminal && panel_open) terminal.dismantle(user, I) return TRUE diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 0c5199066bb..296e38187c9 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -640,6 +640,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) radiation_pulse(src, 150, 4) /obj/machinery/power/supermatter_crystal/wrench_act(mob/user, obj/item/tool) + ..() if (moveable) default_unfasten_wrench(user, tool, time = 20) return TRUE diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index b8d0b9d86ad..ec9d29c4c23 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -77,5 +77,6 @@ qdel(src) /obj/machinery/power/terminal/wirecutter_act(mob/living/user, obj/item/I) + ..() dismantle(user, I) return TRUE diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 69a17b7d66e..edd8819b0fb 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -191,6 +191,7 @@ desc = "A stationairy, plumbed, water tank." /obj/structure/reagent_dispensers/plumbed/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I) return TRUE diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm index 348e687e031..566228adb52 100644 --- a/code/modules/recycling/disposal/construction.dm +++ b/code/modules/recycling/disposal/construction.dm @@ -110,6 +110,7 @@ // wrench: (un)anchor // weldingtool: convert to real pipe /obj/structure/disposalconstruct/wrench_act(mob/living/user, obj/item/I) + ..() if(anchored) anchored = FALSE density = FALSE @@ -155,6 +156,7 @@ return TRUE /obj/structure/disposalconstruct/welder_act(mob/living/user, obj/item/I) + ..() if(anchored) if(!I.tool_start_check(user, amount=0)) return TRUE diff --git a/code/modules/recycling/disposal/outlet.dm b/code/modules/recycling/disposal/outlet.dm index 7655988c8ff..38c1a3e6cc0 100644 --- a/code/modules/recycling/disposal/outlet.dm +++ b/code/modules/recycling/disposal/outlet.dm @@ -67,6 +67,7 @@ qdel(H) /obj/structure/disposaloutlet/welder_act(mob/living/user, obj/item/I) + ..() if(!I.tool_start_check(user, amount=0)) return TRUE diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index 6c269e44be4..a3e9e9cc317 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -140,6 +140,7 @@ //welding tool: unfasten and convert to obj/disposalconstruct /obj/structure/disposalpipe/welder_act(mob/living/user, obj/item/I) + ..() if(!can_be_deconstructed(user)) return TRUE diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index d2cb2f9a5cd..fe1644e8b4e 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -198,9 +198,10 @@ Nothing else in the console has ID requirements. return ..() /obj/machinery/computer/rdconsole/multitool_act(mob/user, obj/item/multitool/I) + . = ..() var/lathe = linked_lathe && linked_lathe.multitool_act(user, I) var/print = linked_imprinter && linked_imprinter.multitool_act(user, I) - return lathe || print + return lathe || print || . /obj/machinery/computer/rdconsole/proc/list_categories(list/categories, menu_num as num) if(!categories) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 0ad28544497..f9beb635626 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -170,6 +170,7 @@ ..() /obj/machinery/computer/camera_advanced/xenobio/multitool_act(mob/living/user, obj/item/multitool/I) + . = ..() if (istype(I) && istype(I.buffer,/obj/machinery/monkey_recycler)) to_chat(user, "You link [src] with [I.buffer] in [I] buffer.") connected_recycler = I.buffer diff --git a/code/modules/shuttle/spaceship_navigation_beacon.dm b/code/modules/shuttle/spaceship_navigation_beacon.dm index b1572f3460a..c25a5c56853 100644 --- a/code/modules/shuttle/spaceship_navigation_beacon.dm +++ b/code/modules/shuttle/spaceship_navigation_beacon.dm @@ -13,7 +13,7 @@ idle_power_usage = 0 density = TRUE circuit = /obj/item/circuitboard/machine/spaceship_navigation_beacon - + var/locked = FALSE //Locked beacons don't allow to jump to it. @@ -40,12 +40,13 @@ obj/machinery/spaceship_navigation_beacon/emp_act() update_icon() /obj/machinery/spaceship_navigation_beacon/multitool_act(mob/living/user, obj/item/multitool/I) + ..() if(panel_open) var/new_name = "Beacon_[input("Enter the custom name for this beacon", "It be Beacon ..your input..") as text]" if(new_name && Adjacent(user)) name = new_name to_chat(user, "You change beacon name to [name].") - else + else locked =!locked to_chat(user, "You [locked ? "" : "un"]lock [src].") return TRUE diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index bfc583a309c..2c365e9d5ef 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -31,6 +31,7 @@ anchored = TRUE /obj/machinery/bsa/wrench_act(mob/living/user, obj/item/I) + ..() default_unfasten_wrench(user, I, 10) return TRUE diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm index 46855187fce..62ae8dac5a8 100644 --- a/code/modules/station_goals/shield.dm +++ b/code/modules/station_goals/shield.dm @@ -122,6 +122,7 @@ icon_state = active ? "sat_active" : "sat_inactive" /obj/machinery/satellite/multitool_act(mob/living/user, obj/item/I) + ..() to_chat(user, "// NTSAT-[id] // Mode : [active ? "PRIMARY" : "STANDBY"] //[(obj_flags & EMAGGED) ? "DEBUG_MODE //" : ""]") return TRUE diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index 29f46041814..1beb6c8a6e7 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -151,6 +151,7 @@ return ..() /obj/item/bodypart/chest/robot/wirecutter_act(mob/living/user, obj/item/I) + . = ..() if(!wired) return . = TRUE @@ -265,6 +266,7 @@ return ..() /obj/item/bodypart/head/robot/crowbar_act(mob/living/user, obj/item/I) + ..() if(flash1 || flash2) I.play_tool_sound(src) to_chat(user, "You remove the flash from [src].") diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index d8a91b46fed..40a3bf75dc3 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -12,6 +12,7 @@ /obj/vehicle/ridden/scooter/wrench_act(mob/living/user, obj/item/I) + ..() to_chat(user, "You begin to remove the handlebars...") if(I.use_tool(src, user, 40, volume=50)) var/obj/vehicle/ridden/scooter/skateboard/S = new(drop_location()) @@ -129,6 +130,7 @@ return ..() /obj/item/scooter_frame/wrench_act(mob/living/user, obj/item/I) + ..() to_chat(user, "You deconstruct [src].") new /obj/item/stack/rods(drop_location(), 10) I.play_tool_sound(src) diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index 29dee838e64..342dcc7993d 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -68,6 +68,7 @@ handle_rotation(newdir) /obj/vehicle/ridden/wheelchair/wrench_act(mob/living/user, obj/item/I) //Attackby should stop it attacking the wheelchair after moving away during decon + ..() to_chat(user, "You begin to detach the wheels...") if(I.use_tool(src, user, 40, volume=50)) to_chat(user, "You detach the wheels and deconstruct the chair.") diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 8351a41c807..e600b6d8b7f 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -64,7 +64,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C ///Last mob to shop with us var/last_shopper - + /** * List of products this machine sells * @@ -347,6 +347,7 @@ GLOBAL_LIST_EMPTY(vending_products) return TRUE /obj/machinery/vending/wrench_act(mob/living/user, obj/item/I) + ..() if(panel_open) default_unfasten_wrench(user, I, time = 60) return TRUE