diff --git a/code/game/dna.dm b/code/game/dna.dm index cb7dbb24429..7c57b024589 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -588,7 +588,7 @@ /obj/machinery/computer/scan_consolenew/proc/ShowInterface(mob/user, last_change) if(!user) return var/datum/browser/popup = new(user, "scannernew", "DNA Modifier Console", 880, 470) // Set up the popup browser window - if(!( in_range(src, usr) || istype(usr, /mob/living/silicon) )) + if(!( in_range(src, user) || istype(user, /mob/living/silicon) )) popup.close() return popup.add_stylesheet("scannernew", 'html/browser/scannernew.css') diff --git a/tools/mapmerge/clean_map.bat b/tools/mapmerge/clean_map.bat index c495eb51cb0..736b1547276 100644 --- a/tools/mapmerge/clean_map.bat +++ b/tools/mapmerge/clean_map.bat @@ -1,3 +1,5 @@ set MAPFILE=tgstation.2.1.2.dmm -java -jar MapPatcher.jar -clean ../../maps/%MAPFILE%.backup ../../maps/%MAPFILE% ../../maps/%MAPFILE% \ No newline at end of file +java -jar MapPatcher.jar -clean ../../maps/%MAPFILE%.backup ../../maps/%MAPFILE% ../../maps/%MAPFILE% + +pause \ No newline at end of file diff --git a/tools/mapmerge/prepare_map.bat b/tools/mapmerge/prepare_map.bat index cda503345c1..bda9fc204fb 100644 --- a/tools/mapmerge/prepare_map.bat +++ b/tools/mapmerge/prepare_map.bat @@ -2,3 +2,5 @@ set MAPFILE=tgstation.2.1.2.dmm cd ../../maps copy %MAPFILE% %MAPFILE%.backup + +pause