Merge branch 'master' into dev

This commit is contained in:
Olivier Gagnon 2021-09-18 02:23:04 -04:00
commit 9471e8d4a0
4 changed files with 8 additions and 9 deletions

File diff suppressed because one or more lines are too long

@ -26,8 +26,8 @@ commitCrime() Netscript Function
This function is used to automatically attempt to commit crimes. If you are already in the middle of some 'working' action
(such as working for a company or training at a gym), then running this function will automatically cancel that action and give you your earnings.
This function returns the number of seconds it takes to attempt the specified crime (e.g It takes 60 seconds to attempt the 'Rob Store' crime,
so running ``commitCrime('rob store')`` will return 60).
This function returns the number of milliseconds it takes to attempt the specified crime (e.g It takes 60 seconds to attempt the 'Rob Store' crime,
so running ``commitCrime('rob store')`` will return 60000).
Warning: I do not recommend using the time returned from this function to try and schedule your crime attempts.
Instead, I would use the :doc:`isBusy<isBusy>` Singularity function to check whether you have finished attempting a crime.

@ -33,12 +33,10 @@ export function cat(
showLiterature(file);
return;
} else if (filename.endsWith(".msg")) {
const file = server.messages[i];
if (typeof file === "string") throw new Error(".msg file should not be a .lit");
if (file.filename === filename) {
showMessage(file);
return;
}
const file = server.messages[i] as Message;
if (file.filename !== filename) continue;
showMessage(file);
return;
}
}
} else if (filename.endsWith(".txt")) {

@ -31,6 +31,7 @@ const useStyles = makeStyles((theme: Theme) =>
},
preformatted: {
whiteSpace: "pre-wrap",
overflowWrap: "anywhere",
margin: theme.spacing(0),
},
list: {