Merging changes from pull requests. Re-adding package lock.json

This commit is contained in:
danielyxie
2018-05-09 02:21:47 -05:00
parent b0a825e0bc
commit dfb5cbf02d
16 changed files with 18519 additions and 11 deletions
+1 -1
View File
@@ -2023,7 +2023,7 @@ function NetscriptFunctions(workerScript) {
if (workerScript.checkingRam) {return 0;}
return workerScript.name;
},
getScriptRam : function (scriptname, ip=workerScript.serverIp)
getScriptRam : function (scriptname, ip=workerScript.serverIp) {
if (workerScript.checkingRam) {
if (workerScript.loadedFns.getScriptRam) {
return 0;