From 8868a354b6e83d4fbd51a5bfb0c8a9a16f671a2c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 14 Nov 2017 13:06:43 -0600
Subject: [PATCH] Update multitool.dm

---
 code/game/objects/items/devices/multitool.dm | 106 +------------------
 1 file changed, 1 insertion(+), 105 deletions(-)

diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 3c7ed62311..e36b97b328 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -1,106 +1,3 @@
-<<<<<<< HEAD
-#define PROXIMITY_NONE ""
-#define PROXIMITY_ON_SCREEN "_red"
-#define PROXIMITY_NEAR "_yellow"
-
-/**
- * Multitool -- A multitool is used for hacking electronic devices.
- * TO-DO -- Using it as a power measurement tool for cables etc. Nannek.
- *
- */
-
-/obj/item/device/multitool
-	name = "multitool"
-	desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
-	icon_state = "multitool"
-	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
-	force = 5
-	w_class = WEIGHT_CLASS_SMALL
-	throwforce = 0
-	throw_range = 7
-	throw_speed = 3
-	materials = list(MAT_METAL=50, MAT_GLASS=20)
-	origin_tech = "magnets=1;engineering=2"
-	var/obj/machinery/buffer // simple machine buffer for device linkage
-	hitsound = 'sound/weapons/tap.ogg'
-	toolspeed = 1
-
-
-// Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby.
-
-
-/obj/item/device/multitool/ai_detect
-	var/track_cooldown = 0
-	var/track_delay = 10 //How often it checks for proximity
-	var/detect_state = PROXIMITY_NONE
-	var/rangealert = 8	//Glows red when inside
-	var/rangewarning = 20 //Glows yellow when inside
-	origin_tech = "magnets=1;engineering=2;syndicate=1"
-
-/obj/item/device/multitool/ai_detect/New()
-	..()
-	START_PROCESSING(SSobj, src)
-
-/obj/item/device/multitool/ai_detect/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	return ..()
-
-/obj/item/device/multitool/ai_detect/process()
-	if(track_cooldown > world.time)
-		return
-	detect_state = PROXIMITY_NONE
-	multitool_detect()
-	icon_state = "[initial(icon_state)][detect_state]"
-	track_cooldown = world.time + track_delay
-
-/obj/item/device/multitool/ai_detect/proc/multitool_detect()
-	var/turf/our_turf = get_turf(src)
-	for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
-		if(AI.cameraFollow == src)
-			detect_state = PROXIMITY_ON_SCREEN
-			break
-
-	if(!detect_state && GLOB.cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z))
-		var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z)
-		if(chunk)
-			if(chunk.seenby.len)
-				for(var/mob/camera/aiEye/A in chunk.seenby)
-					var/turf/detect_turf = get_turf(A)
-					if(get_dist(our_turf, detect_turf) < rangealert)
-						detect_state = PROXIMITY_ON_SCREEN
-						break
-					if(get_dist(our_turf, detect_turf) < rangewarning)
-						detect_state = PROXIMITY_NEAR
-						break
-
-/obj/item/device/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/device/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/device/multitool/cyborg
-	name = "multitool"
-	desc = "Optimised and stripped-down version of a regular multitool."
-	toolspeed = 0.5
-
-/obj/item/device/multitool/abductor
-	name = "alien multitool"
-	desc = "An omni-technological interface."
-	icon = 'icons/obj/abductor.dmi'
-	icon_state = "multitool"
-	toolspeed = 0.1
-	origin_tech = "magnets=5;engineering=5;abductor=3"
-=======
 #define PROXIMITY_NONE ""
 #define PROXIMITY_ON_SCREEN "_red"
 #define PROXIMITY_NEAR "_yellow"
@@ -267,5 +164,4 @@
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "multitool"
 	toolspeed = 0.1
-	origin_tech = "magnets=5;engineering=5;abductor=3"
->>>>>>> bdfbafd... [READY]integrated circuitry port+upgrade. (#32481)
+	origin_tech = "magnets=5;engineering=5;abductor=3"