diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index 42c3f0ca91b..2e55edc0a7d 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -114,6 +114,13 @@
 	active_power_usage = 6
 	power_channel = ENVIRON
 
+	New()
+		if(z == 1)
+			if(security_level)
+				src.overlays += image('monitors.dmi', "overlay_[get_security_level()]")
+			else
+				src.overlays += image('monitors.dmi', "overlay_green")
+
 /obj/machinery/partyalarm
 	name = "\improper Party Button"
 	desc = "Cuban Pete is in the house!"
diff --git a/code/defines/obj/window.dm b/code/defines/obj/window.dm
index 62174ece4f3..5b4bdf29698 100644
--- a/code/defines/obj/window.dm
+++ b/code/defines/obj/window.dm
@@ -23,30 +23,6 @@
 /obj/structure/window/basic
 	icon_state = "window"
 
-/obj/structure/window/basic/north
-	dir = NORTH
-
-/obj/structure/window/basic/east
-	dir = EAST
-
-/obj/structure/window/basic/west
-	dir = WEST
-
-/obj/structure/window/basic/south
-	dir = SOUTH
-
-/obj/structure/window/basic/northwest
-	dir = NORTHWEST
-
-/obj/structure/window/basic/northeast
-	dir = NORTHEAST
-
-/obj/structure/window/basic/southwest
-	dir = SOUTHWEST
-
-/obj/structure/window/basic/southeast
-	dir = SOUTHEAST
-
 // Reinforced
 
 /obj/structure/window/reinforced
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index e2f75731660..5f53a42e44c 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -217,7 +217,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 			announceAuth = 0;
 			screen = 0
 	if(href_list["sendAnnouncement"])
-		world << "<b><font size = 3> <font color = red>[department] announcement:</font color> [html_encode(message)]</font size></b>"
+		world << "<b><font size = 3><font color = red>[department] announcement:</font color> [html_encode(message)]</font size></b>"
 		announceAuth = 0
 		message = ""
 		screen = 0
diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm
index 71106b22ede..20f302dad4e 100644
--- a/code/game/objects/items/weapons/table_rack_parts.dm
+++ b/code/game/objects/items/weapons/table_rack_parts.dm
@@ -25,11 +25,12 @@ RACK PARTS
 
 // WOODEN TABLE PARTS
 /obj/item/weapon/table_parts/wood/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/wood( src.loc )
 		//SN src = null
 		del(src)
+	else
+		..()
 
 /obj/item/weapon/table_parts/wood/attack_self(mob/user as mob)
 	new /obj/structure/table/woodentable( user.loc )
diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm
index 0290c6c5f35..fd5a33e95ba 100644
--- a/maps/tgstation.2.0.8.dmm
+++ b/maps/tgstation.2.0.8.dmm
@@ -5603,9 +5603,9 @@
 "cdM" = (/obj/item/device/radio,/turf/simulated/floor/plating/airless,/area/engine/engineering)
 "cdN" = (/obj/structure/lattice,/obj/item/clothing/head/helmet/hardhat,/turf/space,/area)
 "cdO" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating/airless,/area/engine/engineering)
-"cdP" = (/obj/machinery/emitter{anchored = 1; dir = 4; state = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/camera{c_tag = "Singularity West"; dir = 4; network = "Singularity"},/turf/simulated/floor/plating/airless,/area/engine/engineering)
+"cdP" = (/obj/machinery/emitter{anchored = 1; dir = 4; state = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/camera/emp_proof{c_tag = "Singularity West"; dir = 4; network = "Singularity"},/turf/simulated/floor/plating/airless,/area/engine/engineering)
 "cdQ" = (/obj/item/weapon/screwdriver,/turf/space,/area)
-"cdR" = (/obj/machinery/emitter{anchored = 1; dir = 8; state = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/camera{c_tag = "Singularity East"; dir = 8; network = "Singularity"},/turf/simulated/floor/plating/airless,/area/engine/engineering)
+"cdR" = (/obj/machinery/emitter{anchored = 1; dir = 8; state = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/camera/emp_proof{c_tag = "Singularity East"; dir = 8; network = "Singularity"},/turf/simulated/floor/plating/airless,/area/engine/engineering)
 "cdS" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating/airless,/area/engine/engineering)
 "cdT" = (/obj/structure/cable,/obj/machinery/power/tracker,/turf/simulated/floor/plating/airless,/area/solar/starboard)
 "cdU" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 0},/turf/simulated/wall/r_wall,/area/engine/engineering)