Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-22 22:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/engine.bundle.js vendored
View File

File diff suppressed because one or more lines are too long

4
doc/source/netscript/singularityfunctions/commitCrime.rst
View File

@ -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.

6
src/Terminal/commands/cat.ts
View File

@ -33,14 +33,12 @@ 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) {
const file = server.messages[i] as Message;
if (file.filename !== filename) continue;
showMessage(file);
return;
}
}
}
} else if (filename.endsWith(".txt")) {
const txt = terminal.getTextFile(player, filename);
if (txt != null) {

1
src/Terminal/ui/TerminalRoot.tsx
View File

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