Commit Graph

6303 Commits

Author SHA1 Message Date
hydroflame
d7abbb1885
Merge pull request #3715 from PathToLife/patch-2
UI: FIX #3714 Add tprintf to RamCostGenerator
2022-05-23 12:16:03 -04:00
hydroflame
ad1fadd976
Merge pull request #3712 from SebassNoob/english-fixes-patch
MISC: fix augmentation typos, sentence structure and grammar
2022-05-23 12:15:48 -04:00
PathToLife
3f1cb27ec1
Add tprintf to RamCostGenerator 2022-05-23 19:57:23 +12:00
hydroflame
e4903f27f8
Merge pull request #3693 from borisflagell/FIX2555
MISC: FIX #2555 ManualHackMoney Bitnode multiplier being "orphaned"
2022-05-22 21:36:01 -04:00
Olivier Gagnon
de64424740 allbuild commit 837cceba 2022-05-22 20:44:40 -04:00
hydroflame
837cceba5b
Merge pull request #3694 from borisflagell/FIX2721
WORK: FIX #2721 Singularity faction work logging.
2022-05-22 20:38:49 -04:00
hydroflame
9f73f9b392
Merge pull request #3698 from borisflagell/#3685
BLADEBURNER: FIX #3685 Error being thrown when finishing a BlackOps
2022-05-22 20:37:30 -04:00
SebassNoob
774eced317
grammar 2022-05-23 00:05:40 +08:00
SebassNoob
cd8f0cdbda
more ss fixes 2022-05-23 00:03:51 +08:00
SebassNoob
0bc486afcd
fix typos, grammar and sentence structure 2022-05-22 23:51:12 +08:00
borisflagell
3ee37bfde5 BLADEBURNER: FIX #3685 Error being thrown when finishing a BlackOps
fixes #3685 - Bladeburner.action property was reset before being used for the last time in Bladeburner.processAction().

Moving
const action = this.getActionObject(this.action);
before the call to
const retValue = this.completeAction(player, player, this.action);
2022-05-22 01:16:20 +02:00
borisflagell
8e94878380 WORK: FIX #2721 Singularity faction work logging.
fixes #2721

Player's faction-work-related property were reset to 0 before the singularity's log message was formatted.

I anticipate (really) minor conflict with Work System rework PR.
2022-05-21 23:18:12 +02:00
borisflagell
12ec35823e MISC: FIX #2555 ManualHackMoney Bitnode multiplier being orphaned
Apply the BitnodeMultipliers.ManualHackMoney to money gained via Terminal's hack program.
2022-05-21 22:53:31 +02:00
hydroflame
b2659318c8
Merge pull request #3691 from steven-r/fix-3690
MISC: FIX 3690 Add missing function to RamCostGenerator
2022-05-21 12:44:19 -04:00
Stephen Reindl
35978689f9
Fix #3690 by adding missing function RamCostGenerator 2022-05-21 17:24:20 +02:00
hydroflame
b10f11b390
Merge pull request #3682 from nickofolas/fix/unavailable-augs-color
AUGMENTATIONS: Use disabled text color for non-buyable augs
2022-05-20 23:53:34 -04:00
Olivier Gagnon
3699b3aa25 allbuild commit b71418b0 2022-05-20 23:50:28 -04:00
nickofolas
38c1388735 Use disabled color for non-buyable augs 2022-05-20 19:39:19 -05:00
Olivier Gagnon
b71418b08f allbuild commit 8d204138 2022-05-20 18:25:45 -04:00
hydroflame
8d2041389e
Merge pull request #3680 from danielyxie/sleeve-blade
SLEEVE: Can now perform bladeburner actions
2022-05-20 18:23:00 -04:00
Olivier Gagnon
0d437e5b73 lint 2022-05-20 18:20:04 -04:00
Olivier Gagnon
27a8582df8 balance infiltrate synthoids 2022-05-20 18:18:42 -04:00
Olivier Gagnon
34b099c050 rm reviver from person 2022-05-20 17:44:20 -04:00
Olivier Gagnon
58478f7858 Merge branch 'dev' into sleeve-blade 2022-05-20 17:37:02 -04:00
Olivier Gagnon
5f03378411 allbuild commit 1d1099cd 2022-05-20 17:31:24 -04:00
Olivier Gagnon
1d1099cd9e fix sing purchaseTor 2022-05-20 17:28:59 -04:00
Olivier Gagnon
42dcbf889e fix typo 2022-05-20 17:28:21 -04:00
Olivier Gagnon
fd7593f13d allbuild commit 1c3d4fe1 2022-05-20 16:07:07 -04:00
Olivier Gagnon
7eb4494ac1 fix mc 2022-05-20 15:58:33 -04:00
Olivier Gagnon
1c3d4fe1b5 re-merge 3575 2022-05-20 15:46:45 -04:00
Olivier Gagnon
3574f5df3f re-merge 3576 2022-05-20 15:44:49 -04:00
Olivier Gagnon
413dbfdf85 allbuild commit f5efdfa8 2022-05-20 15:36:53 -04:00
Olivier Gagnon
f5efdfa807 allbuild commit 4cc518f3 2022-05-20 15:19:36 -04:00
Olivier Gagnon
4cc518f377 fix lint 2022-05-19 02:49:49 -04:00
Olivier Gagnon
40d53c2d1b Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2022-05-19 02:48:58 -04:00
Olivier Gagnon
c2b4a5b52a Update codebase for stanek 2022-05-19 02:48:50 -04:00
hydroflame
084a29dfe4
Merge pull request #3474 from Hoekstraa/mvfix
UI: FIX #3473 'mv' now says destination script is running instead of returning an error
2022-05-19 02:16:33 -04:00
hydroflame
4c33ad444b
Merge pull request #3644 from taralx/patch-1
MISC: fix typing conflict between jest and cypress
2022-05-19 02:13:11 -04:00
hydroflame
e6ce9a9c03
Merge pull request #3622 from borisflagell/#1754---stanek
UI: FIX #1754  Stanek effect summary & slight tweak.
2022-05-19 02:12:50 -04:00
hydroflame
18cb1bd4f9
Merge pull request #3653 from Dane-Horn/3651-valid-folder-names-are-not-valid
TERMINAL: FIX #3651 Make directory name regex more flexible
2022-05-19 02:10:38 -04:00
Olivier Gagnon
9af553f63c Fix 2022-05-19 02:09:00 -04:00
Olivier Gagnon
ca1a2aad33 fix conflicts 2022-05-19 01:43:54 -04:00
hydroflame
2cb02bf445
Merge pull request #3660 from Undeemiss/stanek-error
STANEK: Stanek NS functions correctly throw errors when stanek not installed
2022-05-19 01:40:48 -04:00
hydroflame
a6048cdd84
Merge pull request #3627 from danielyxie/wrap-api
MISC: Wrap most of the API in the new api wrapper
2022-05-19 01:37:11 -04:00
hydroflame
b80e2d5fd1
Merge branch 'dev' into wrap-api 2022-05-19 01:37:06 -04:00
Olivier Gagnon
fda3f02d73 Fix stanek leaking classes 2022-05-19 01:34:36 -04:00
hydroflame
8f3fc22ae6
Merge pull request #3654 from nickofolas/improvement/grafting-sorting
GRAFTING: Implement sorting options
2022-05-19 01:19:37 -04:00
hydroflame
0ba0ccff4f
Merge pull request #3662 from nickofolas/fix/bn-mults-agility-mult
UI: Fix Agility BitNode multiplier not appearing in UI
2022-05-19 01:18:14 -04:00
hydroflame
6aac4de458
Merge pull request #3673 from nickofolas/fix/stanek-entropy
STANEK: Properly reapply entropy in Stanek's Gift
2022-05-19 01:18:03 -04:00
nickofolas
18120362cd Reapply entropy properly in stanek 2022-05-18 17:32:37 -05:00