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 25d156ed13b..fa9ac5da394 100644
--- a/code/game/objects/items/robot_items.dm
+++ b/code/game/objects/items/robot_items.dm
@@ -182,21 +182,21 @@
 	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
 
-
+/*
 	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)
 
 
@@ -206,17 +206,17 @@
 		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
 
 
@@ -269,13 +269,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 e3ee53ffe48..9445e0b0d5f 100644
--- a/code/game/turf.dm
+++ b/code/game/turf.dm
@@ -142,12 +142,19 @@
 		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
 
 	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"
@@ -165,6 +172,7 @@
 
 	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"
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 3c286cfb171..0a047f4388e 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -436,7 +436,7 @@
 			else if(src.health < config.health_threshold_crit)
 				if(src.health <= 20 && prob(1)) spawn(0) emote("gasp")
 
-				//if(!src.rejuv) src.oxyloss++
+				if(!src.rejuv) src.oxyloss++	//-Nodrak
 				if(!src.reagents.has_reagent("inaprovaline")) src.adjustOxyLoss(1)
 
 				if(src.stat != 2)	src.stat = 1