From 674621a4ac7a7af68bede9fb3537a4e3f8f37505 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 7 Jun 2018 09:51:38 -0400 Subject: [PATCH 1/2] Merge pull request #38288 from Jalleo/Removes_Admin_detect Removes a defect concerning a simple tool in the admin toolset --- code/game/objects/items/devices/multitool.dm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 063676ea62..a059c06284 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -142,20 +142,6 @@ detect_state = PROXIMITY_NEAR break -/obj/item/multitool/ai_detect/admin - desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'." //What else should I say for a meme item? - track_delay = 5 - -/obj/item/multitool/ai_detect/admin/multitool_detect() - var/turf/our_turf = get_turf(src) - for(var/mob/J in urange(rangewarning,our_turf)) - if(GLOB.admin_datums[J.ckey]) - detect_state = PROXIMITY_NEAR - var/turf/detect_turf = get_turf(J) - if(get_dist(our_turf, detect_turf) < rangealert) - detect_state = PROXIMITY_ON_SCREEN - break - /obj/item/multitool/cyborg name = "multitool" desc = "Optimised and stripped-down version of a regular multitool."