diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index d55b2ed0049..7250cc7d82a 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/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" = ( diff --git a/tools/mapmerge2/dmm2tgm.bat b/tools/mapmerge2/dmm2tgm.bat index bcf6150c2ea..b17b03afa08 100644 --- a/tools/mapmerge2/dmm2tgm.bat +++ b/tools/mapmerge2/dmm2tgm.bat @@ -1,5 +1,5 @@ @echo off -set MAPROOT=../../_maps/ +set MAPROOT=../../maps/ set TGM=1 python convert.py pause diff --git a/tools/mapmerge2/tgm2dmm.bat b/tools/mapmerge2/tgm2dmm.bat index 2748533febf..5bf5677453c 100644 --- a/tools/mapmerge2/tgm2dmm.bat +++ b/tools/mapmerge2/tgm2dmm.bat @@ -1,5 +1,5 @@ @echo off -set MAPROOT=../../_maps/ +set MAPROOT=../../maps/ set TGM=0 python convert.py pause