cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #857 from Carn/MoreGeneticsFixes

Browse Source 
Resolves #677 - Overwriting a buffer now works correctly (you no longer ...
This commit is contained in:
Giacomand
2013-06-28 04:44:17 -07:00
parent 54669a8f38 56a6f19eac
commit 0bc7f308fc
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/dna.dm
+6 -3
View File
@@ -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 += "<span class='linkOff'>Injector</span>"
else
temp_html += "<br>\tSE: No Data"
if(viable_occupant) temp_html += "<br><a href='?src=\ref[src];task=setbuffer;num[i];'>Save to Buffer</a> "
if(viable_occupant) temp_html += "<br><a href='?src=\ref[src];task=setbuffer;num=[i];'>Save to Buffer</a> "
else temp_html += "<br><span class='linkOff'>Save to Buffer</span> "
temp_html += "<a href='?src=\ref[src];task=clearbuffer;num=[i];'>Clear Buffer</a> "
if(diskette) temp_html += "<a href='?src=\ref[src];task=loaddisk;num=[i];'>Load from Disk</a> "
tools/mapmerge/clean_map.bat
+3 -1
View File
@@ -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
tools/mapmerge/prepare_map.bat
+2
View File
@@ -2,3 +2,5 @@ set MAPFILE=tgstation.2.1.2.dmm
cd ../../maps
copy %MAPFILE% %MAPFILE%.backup
pause