From cbad29832eb52dc52dece2295eace5659d3ba2ca Mon Sep 17 00:00:00 2001
From: "petethegoat@gmail.com"
 <petethegoat@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Tue, 10 Apr 2012 23:57:23 +0000
Subject: [PATCH] Sieve committed: Adds disabled variables to borg and mech RCD
 RCDs are disabled if they are used on the escape shuttle or hyperspace around
 it This applies to what they are used on, not where the user is, so it is
 immune to teleporting issues

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3434 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/mecha/equipment/tools/tools.dm | 4 ++++
 code/game/objects/items/robot_items.dm   | 7 ++++++-
 code/game/objects/items/weapons/RCD.dm   | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index 6655dbdd2e5..98bf3925b9b 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -200,6 +200,10 @@
 	var/disabled = 0 //malf
 
 	action(atom/target)
+		if(istype(target,/area/shuttle)||istype(target, /turf/space/transit))//>implying these are ever made -Sieve
+			disabled = 1
+		else
+			disabled = 0
 		if(!istype(target, /turf) && !istype(target, /obj/machinery/door/airlock))
 			target = get_turf(target)
 		if(!action_checks(target) || disabled || get_dist(chassis, target)>3) return
diff --git a/code/game/objects/items/robot_items.dm b/code/game/objects/items/robot_items.dm
index e0daee42505..0da3953db52 100644
--- a/code/game/objects/items/robot_items.dm
+++ b/code/game/objects/items/robot_items.dm
@@ -188,6 +188,7 @@
 	//	datum/effect/effect/system/spark_spread/spark_system
 		working = 0
 		mode = 1
+		disabled = 0
 
 /*
 	New()
@@ -224,7 +225,11 @@
 
 
 	afterattack(atom/A, mob/user as mob)
-		if(!isrobot(user))	return
+		if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//No RCDs on the shuttles -Sieve
+			disabled = 1
+		else
+			disabled = 0
+		if(!isrobot(user)|| disabled == 1)	return
 		if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock)))	return
 
 		var/mob/living/silicon/robot/R = user
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 2641c63e742..818ba159f66 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -69,6 +69,10 @@ RCD
 
 
 	afterattack(atom/A, mob/user as mob)
+		if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//Nanotrasen Matter Jammer TM -Sieve
+			disabled = 1
+		else
+			disabled = 0
 		if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock)))
 			return