diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index b0f1f32c8f..78035ea4cc 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -5,7 +5,7 @@
 	layer = 3
 	anchored = 1.0
 	var/uses = 20
-	var/disabled = 0
+	var/disabled = 1
 	var/lethal = 0
 	var/locked = 1
 	var/cooldown_time = 0
diff --git a/maps/tgstation.1.3.1.dmm b/maps/tgstation.1.3.1.dmm
index 7888058742..d98049ac83 100644
--- a/maps/tgstation.1.3.1.dmm
+++ b/maps/tgstation.1.3.1.dmm
@@ -1683,16 +1683,16 @@
 "aGs" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 4; icon_state = "bluecorner"},/area/hallway/primary/central)
 "aGt" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/central)
 "aGu" = (/turf/simulated/wall/r_wall,/area/bridge)
-"aGv" = (/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/device/aicard,/turf/simulated/floor,/area/bridge)
-"aGw" = (/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/device/radio/signaler,/turf/simulated/floor,/area/bridge)
+"aGv" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHWEST)"; icon_state = "reinf_tabledir"; dir = 10},/obj/item/device/aicard,/turf/simulated/floor,/area/bridge)
+"aGw" = (/obj/item/device/radio/signaler,/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHEAST)"; icon_state = "reinf_tabledir"; dir = 6},/obj/item/device/radio/signaler,/turf/simulated/floor,/area/bridge)
 "aGx" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/computer/secure_data,/turf/simulated/floor,/area/bridge)
-"aGy" = (/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/weapon/storage/id_kit,/turf/simulated/floor,/area/bridge)
-"aGz" = (/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/clothing/glasses/sunglasses,/obj/item/weapon/storage/PDAbox,/turf/simulated/floor,/area/bridge)
+"aGy" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHWEST)"; icon_state = "reinf_tabledir"; dir = 10},/obj/item/weapon/storage/id_kit,/turf/simulated/floor,/area/bridge)
+"aGz" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHEAST)"; icon_state = "reinf_tabledir"; dir = 6},/obj/item/clothing/glasses/sunglasses,/obj/item/weapon/storage/id_kit,/turf/simulated/floor,/area/bridge)
 "aGA" = (/obj/machinery/computer/communications,/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/bridge)
-"aGB" = (/obj/table{icon_state = "tabledir"; dir = 10},/turf/simulated/floor,/area/bridge)
-"aGC" = (/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/device/flash,/turf/simulated/floor,/area/bridge)
+"aGB" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHWEST)"; icon_state = "reinf_tabledir"; dir = 10},/turf/simulated/floor,/area/bridge)
+"aGC" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHEAST)"; icon_state = "reinf_tabledir"; dir = 6},/obj/item/device/flash,/turf/simulated/floor,/area/bridge)
 "aGD" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/computer/crew,/turf/simulated/floor,/area/bridge)
-"aGE" = (/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/weapon/extinguisher,/turf/simulated/floor,/area/bridge)
+"aGE" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHEAST)"; icon_state = "reinf_tabledir"; dir = 6},/obj/item/weapon/extinguisher,/turf/simulated/floor,/area/bridge)
 "aGF" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central)
 "aGG" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 1; icon_state = "bluecorner"},/area/hallway/primary/central)
 "aGH" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/turf/simulated/floor/plating,/area/crew_quarters/cafeteria)
@@ -4451,12 +4451,12 @@
 "bHE" = (/obj/item/device/radio/intercom{freerange = 1; frequency = 1359; pixel_x = -30},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/light/small{dir = 8},/turf/simulated/floor{tag = "icon-caution_west"; icon_state = "caution_west"},/area/engine/engine_hallway)
 "bHF" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor,/area/engine/engine_hallway)
 "bHG" = (/turf/simulated/floor{icon_state = "yellowcorner"; tag = "icon-yellowcorner"},/area/engine/engine_hallway)
-"bHH" = (/obj/item/weapon/extinguisher,/obj/cable{icon_state = "2-4"; d1 = 2; d2 = 4},/turf/simulated/floor{dir = 6; icon_state = "yellow"; tag = "icon-yellow (SOUTHEAST)"},/area/engine/engine_hallway)
+"bHH" = (/obj/item/weapon/extinguisher,/obj/cable{icon_state = "0-4"; d2 = 4},/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/engine/engine_hallway)
 "bHI" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/cable{icon_state = "0-4"; d2 = 4},/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine/engine_hallway)
 "bHJ" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/cable{icon_state = "0-4"; d2 = 4},/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine/engine_hallway)
 "bHK" = (/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/engine_hallway)
 "bHL" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/engine/engine_hallway)
-"bHM" = (/obj/item/weapon/extinguisher,/obj/cable{icon_state = "2-8"; d1 = 2; d2 = 8},/turf/simulated/floor{dir = 10; icon_state = "yellow"; tag = "icon-yellow (SOUTHWEST)"},/area/engine/engine_hallway)
+"bHM" = (/obj/item/weapon/extinguisher,/obj/cable{d2 = 8; icon_state = "0-8"},/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/engine/engine_hallway)
 "bHN" = (/turf/simulated/floor{dir = 8; icon_state = "yellowcorner"; tag = "icon-yellowcorner (WEST)"},/area/engine/engine_hallway)
 "bHO" = (/obj/machinery/power/collector_control,/turf/simulated/floor/plating,/area/engine/engine_hallway)
 "bHP" = (/obj/machinery/field_generator,/turf/simulated/floor/plating,/area/engine/engine_hallway)