Merge branch 'project/ares/more_consoles' into project/ares/tm_holder

maps/map_files/USS_Almayer/USS_Almayer.dmm

@@ -34343,6 +34343,10 @@
 /obj/structure/machinery/camera/autoname/almayer/containment/ares{
 	dir = 1
 	},
+/obj/structure/machinery/computer/working_joe{
+	dir = 8;
+	pixel_x = 17
+	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
 	},
@@ -54147,20 +54151,6 @@
 	icon_state = "bluefull"
 	},
 /area/almayer/living/briefing)
-"nMq" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 1
-	},
-/obj/structure/machinery/computer/working_joe{
-	dir = 8;
-	pixel_x = 17
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "silver"
-	},
-/area/almayer/hallways/aft_hallway)
 "nMu" = (
 /turf/open/floor/almayer{
 	dir = 9;
@@ -66927,6 +66917,10 @@
 	pixel_y = 5
 	},
 /obj/item/tool/pen,
+/obj/structure/machinery/computer/working_joe{
+	dir = 8;
+	pixel_x = 17
+	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green_side"
 	},
@@ -67906,6 +67900,10 @@
 /area/almayer/command/cic)
 "tUv" = (
 /obj/structure/machinery/iv_drip,
+/obj/structure/machinery/computer/working_joe{
+	dir = 8;
+	pixel_x = 17
+	},
 /turf/open/floor/almayer{
 	dir = 4;
 	icon_state = "sterile_green_corner"
@@ -76743,6 +76741,9 @@
 	layer = 2.9;
 	pixel_x = -8
 	},
+/obj/structure/machinery/computer/working_joe{
+	pixel_y = 16
+	},
 /turf/open/floor/almayer{
 	icon_state = "mono"
 	},
@@ -116183,7 +116184,7 @@ auG
 azb
 azb
 azb
-nMq
+auG
 aDp
 apK
 cbr