diff --git a/code/game/dna.dm b/code/game/dna.dm
index 659df15b465..7c57b024589 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -7,9 +7,9 @@
#define RADIATION_STRENGTH_MULTIPLIER 1 //larger has a more range
#define RADIATION_DURATION_MAX 30
-#define RADIATION_ACCURACY_MULTIPLIER 4 //larger is less accurate
+#define RADIATION_ACCURACY_MULTIPLIER 3 //larger is less accurate
-#define RADIATION_IRRADIATION_MULTIPLIER 0.3 //multiplier for how much radiation a test subject recieves
+#define RADIATION_IRRADIATION_MULTIPLIER 0.2 //multiplier for how much radiation a test subject recieves
#define BAD_MUTATION_DIFFICULTY 2
#define GOOD_MUTATION_DIFFICULTY 4
@@ -588,6 +588,9 @@
/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, user) || istype(user, /mob/living/silicon) ))
+ popup.close()
+ return
popup.add_stylesheet("scannernew", 'html/browser/scannernew.css')
var/mob/living/carbon/viable_occupant
@@ -703,7 +706,7 @@
else temp_html += "Injector"
else
temp_html += "
\tSE: No Data"
- if(viable_occupant) temp_html += "
Save to Buffer "
+ if(viable_occupant) temp_html += "
Save to Buffer "
else temp_html += "
Save to Buffer "
temp_html += "Clear Buffer "
if(diskette) temp_html += "Load from Disk "
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