From dd584fda328b033402dc87bf159fa863232f0b29 Mon Sep 17 00:00:00 2001 From: phil235 Date: Mon, 9 May 2016 20:38:42 +0200 Subject: [PATCH] Fixes wirecutters on open panel camera attacking it. Fixes missing equip_cooldown = 30 on mech mining scanner. --- code/game/machinery/camera/camera.dm | 4 +++- code/game/mecha/equipment/tools/mining_tools.dm | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 724311e6a54..6e2d45a1f1a 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -142,10 +142,12 @@ if(istype(W, /obj/item/weapon/wirecutters)) //enable/disable the camera toggle_cam(user, 1) health = initial(health) //this is a pretty simplistic way to heal the camera, but there's no reason for this to be complex. + return else if(istype(W, /obj/item/device/multitool)) //change focus setViewRange((view_range == initial(view_range)) ? short_range : initial(view_range)) user << "You [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus." + return else if(istype(W, /obj/item/weapon/weldingtool)) if(weld(W, user)) @@ -157,7 +159,7 @@ assembly.dir = src.dir assembly = null qdel(src) - return + return else if(istype(W, /obj/item/device/analyzer)) if(!isXRay()) diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index a43d273ac65..a5363b7795a 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -113,6 +113,7 @@ icon_state = "mecha_analyzer" origin_tech = "materials=3;engineering=2" selectable = 0 + equip_cooldown = 30 var/scanning = 0 /obj/item/mecha_parts/mecha_equipment/mining_scanner/New()