Fixes ShowInterface() using usr instead of user. Thanks MrPerson.

Also added a pause to the end of both mapmerge batch files, to stop them autoclosing when doubleclicked (and hence hiding errors).
Glloyd · Jun 27, 2013 · 56a6f19 · 56a6f19
1 parent bb65dba
commit 56a6f19
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -1,3 +1,5 @@
 set MAPFILE=tgstation.2.1.2.dmm
 
-java -jar MapPatcher.jar -clean ../../maps/%MAPFILE%.backup ../../maps/%MAPFILE% ../../maps/%MAPFILE%
+java -jar MapPatcher.jar -clean ../../maps/%MAPFILE%.backup ../../maps/%MAPFILE% ../../maps/%MAPFILE%
+
+pause
diff --git 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,5 @@ set MAPFILE=tgstation.2.1.2.dmm

		cd ../../maps
		copy %MAPFILE% %MAPFILE%.backup

		pause