Merge pull request #4322 from VOREStation/aro-supconsole

Fixes supply console type

maps/tether/tether-07-station3.dmm

@@ -13671,9 +13671,6 @@
 /turf/simulated/floor/plating,
 /area/quartermaster/office)
 "wb" = (
-/obj/machinery/computer/supplycomp{
-	dir = 1
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -13685,6 +13682,9 @@
 /obj/effect/floor_decal/corner/brown/border{
 	dir = 8
 	},
+/obj/machinery/computer/supplycomp/control{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/office)
 "wc" = (

tools/mapmerge2/dmm2tgm.bat

@@ -1,5 +1,5 @@
 @echo off
-set MAPROOT=../../_maps/
+set MAPROOT=../../maps/
 set TGM=1
 python convert.py
 pause

tools/mapmerge2/tgm2dmm.bat

@@ -1,5 +1,5 @@
 @echo off
-set MAPROOT=../../_maps/
+set MAPROOT=../../maps/
 set TGM=0
 python convert.py
 pause