From 4b2c5a91f9a09dc44c16a2fcfbdc4c39ba627479 Mon Sep 17 00:00:00 2001
From: Ren Erthilo <erthilo@gmail.com>
Date: Mon, 16 Apr 2012 23:33:25 +0100
Subject: [PATCH] TG: Lattice is now removed when you create plating or floor,
 from Donkieyo. Monkeys now take damage in crit, and cyborgs now have a
 supervisor defined, from Nodrak. Removed borg RCD sparks, as per Donkieyo's
 suggestion. -Borg RCD can no longer take down r-walls. Revision: r2988
 Author: 	 petethegoat

---
 code/game/jobs/job/silicon.dm          |  2 +-
 code/game/objects/items/robot_items.dm | 31 +++++++++++++-------------
 code/game/turf.dm                      |  8 +++++++
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm
index f18aa2323f9..f249ada8cbc 100644
--- a/code/game/jobs/job/silicon.dm
+++ b/code/game/jobs/job/silicon.dm
@@ -20,7 +20,7 @@
 	faction = "Station"
 	total_positions = 0
 	spawn_positions = 1
-
+	supervisors = "your laws and the AI"	//Nodrak
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
diff --git a/code/game/objects/items/robot_items.dm b/code/game/objects/items/robot_items.dm
index 23fb752b312..2680ea5e6dc 100644
--- a/code/game/objects/items/robot_items.dm
+++ b/code/game/objects/items/robot_items.dm
@@ -181,21 +181,22 @@
 	force = 5.0
 	w_class = 3.0
 	var
-		datum/effect/effect/system/spark_spread/spark_system
+	//	datum/effect/effect/system/spark_spread/spark_system
 		working = 0
 		mode = 1
+		disabled = 0
 
-
+/*
 	New()
 		src.spark_system = new /datum/effect/effect/system/spark_spread
 		spark_system.set_up(5, 0, src)
 		spark_system.attach(src)
 		return
-
+*/
 
 	proc/activate()
-		spark_system.set_up(5, 0, src)
-		src.spark_system.start()
+//		spark_system.set_up(5, 0, src)
+//		src.spark_system.start()
 		playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 
 
@@ -205,22 +206,26 @@
 		if(mode == 1)
 			mode = 2
 			user << "Changed mode to 'Airlock'"
-			src.spark_system.start()
+//			src.spark_system.start()
 			return
 		if(mode == 2)
 			mode = 3
 			user << "Changed mode to 'Deconstruct'"
-			src.spark_system.start()
+//			src.spark_system.start()
 			return
 		if(mode == 3)
 			mode = 1
 			user << "Changed mode to 'Floor & Walls'"
-			src.spark_system.start()
+//			src.spark_system.start()
 			return
 
 
 	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
@@ -268,13 +273,7 @@
 							A:ReplaceWithPlating()
 						return
 
-					if(istype(A, /turf/simulated/wall/r_wall))
-						if(!cell.use(300))	return
-						user << "Deconstructing RWall..."
-						playsound(src.loc, 'click.ogg', 50, 1)
-						if(do_after(user, 60))
-							activate()
-							A:ReplaceWithWall()
+					if(istype(A, /turf/simulated/wall/r_wall))	//by order of muskets -pete
 						return
 
 					if(istype(A, /turf/simulated/floor))
diff --git a/code/game/turf.dm b/code/game/turf.dm
index e1e51e5a8fa..7b0d2324573 100644
--- a/code/game/turf.dm
+++ b/code/game/turf.dm
@@ -136,6 +136,12 @@
 		if(O.level == 1)
 			O.hide(0)
 
+// Removes all signs of lattice on the pos of the turf -Donkieyo
+/turf/proc/RemoveLattice()
+	var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
+	if(L)
+		del L
+
 /turf/proc/ReplaceWithFloor(explode=0)
 	var/prior_icon = icon_old
 	var/old_dir = dir
@@ -144,6 +150,7 @@
 		del(L)
 	var/turf/simulated/floor/W = new /turf/simulated/floor( locate(src.x, src.y, src.z) )
 
+	W.RemoveLattice()
 	W.dir = old_dir
 	if(prior_icon) W.icon_state = prior_icon
 	else W.icon_state = "floor"
@@ -164,6 +171,7 @@
 		del(L)
 	var/turf/simulated/floor/plating/W = new /turf/simulated/floor/plating( locate(src.x, src.y, src.z) )
 
+	W.RemoveLattice()
 	W.dir = old_dir
 	if(prior_icon) W.icon_state = prior_icon
 	else W.icon_state = "plating"