From bb65dba88ae2fec1b55e581456adb3541861f685 Mon Sep 17 00:00:00 2001 From: carnie Date: Tue, 25 Jun 2013 05:41:12 +0100 Subject: [PATCH 1/2] Resolves #677 - Overwriting a buffer now works correctly (you no longer have to clear it first). This was due to a bad link (one missing '=' after the buffer's num parameter. Resolves #730 - The dna-modifier window will not refresh if you move away from the console whilst it is busy pulsing a dna string. It will close instead. Reduced irradiation multiplier due to (continued) complaints Increased accuracy. Spoon-fed-station13 :baby_bottle: Modified code/game/dna.dm --- code/game/dna.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/dna.dm b/code/game/dna.dm index 659df15b465..cb7dbb24429 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, usr) || istype(usr, /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 " From 56a6f19eac884df992eb584ae1045c5c64e2f886 Mon Sep 17 00:00:00 2001 From: carnie Date: Thu, 27 Jun 2013 03:49:00 +0100 Subject: [PATCH 2/2] 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). --- code/game/dna.dm | 2 +- tools/mapmerge/clean_map.bat | 4 +++- tools/mapmerge/prepare_map.bat | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) 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