Commit Graph

6552 Commits

Author SHA1 Message Date
nickofolas
47abdffb1c Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/infiltration-ui 2022-04-29 16:51:10 -05:00
nickofolas
c613021e8f Better centering and change arrows 2022-04-29 15:56:34 -05:00
Alexander Tsao
ee57e5be11
Minor grammatical fixes in GameOptions
Updated grammar in explainer text for "Force kill all scripts" and "Diagnose files."
2022-04-28 20:55:42 -04:00
Staszek Welsh
55d9810727 Handle edge case in LZ compression code and fix docs 2022-04-28 19:50:17 +01:00
phyzical
bd2d5396a6 prettier 2022-04-28 19:22:37 +08:00
phyzical
facab1d264 make bonustime for gang in miliseconds 2022-04-28 19:20:53 +08:00
phyzical
711955c112 added logic to allow quitJob to be called from singularity 2022-04-28 19:05:56 +08:00
phyzical
033154a32d linting 2022-04-28 18:02:50 +08:00
David Grinberg
b2abec7424 Expose sales cost on NSMaterial interface 2022-04-27 22:37:19 -04:00
Undeemiss
138a945707 Fixed typo in exceptionAlert.ts 2022-04-27 18:45:25 -05:00
Undeemiss
584bc095c1 Fixes bb skill point achievement name ingame
Corrects "You should really spent those." to
"You should really spend those."

I don't think it does anything to the steam achievement name
because I don't know how to test that.
2022-04-27 17:14:56 -05:00
DavidGrinberg
828629b713
Update src/NetscriptFunctions/Corporation.ts
Co-authored-by: Jack <phyzicaly@hotmail.com>
2022-04-27 09:37:02 -04:00
phyzical
af8284381c merge base 2022-04-27 19:00:42 +08:00
David Grinberg
d7ac7f8399 Expose makeProducts on NSDivision interface 2022-04-27 00:55:15 -04:00
Undeemiss
7fab3d8b30 Remove comments that describe nonexistent augs 2022-04-26 23:41:58 -05:00
nickofolas
a87bfb0de6 Handle grafting in singularity stop work 2022-04-26 20:11:41 -05:00
nickofolas
ed711c5d5c Fix isSpecial check letting augs slip through 2022-04-26 10:52:58 -05:00
hydroflame
9c805dabb8
Merge pull request #3540 from taralx/patch-1
MISC: add better typing to Electron.tsx
2022-04-26 11:17:36 -04:00
hydroflame
d0d700077a
Merge pull request #3545 from nickofolas/improvement/purchase-augs-ui
UI: Redesign purchasable Augmentations
2022-04-26 11:16:13 -04:00
hydroflame
a9c2faaab1
Merge pull request #3537 from Undeemiss/breaking-contract-capitalization
CODINGCONTRACT: FIX #3484 BREAKING Fixed capitalization in contract name
2022-04-26 11:15:42 -04:00
hydroflame
44475aaac9
Merge branch 'dev' into breaking-contract-capitalization 2022-04-26 11:15:37 -04:00
hydroflame
633d8b582b
Merge pull request #3562 from nickofolas/fix/infiltration-rep-reward
INFILTRATION: Fix rep reward being substantially higher than intended
2022-04-26 11:11:59 -04:00
hydroflame
0db65f64ac
Merge pull request #3564 from phyzical/bugfix/mark-soa-as-special
REFACTOR: augmentation isSpecial adjustments
2022-04-26 11:11:48 -04:00
phyzical
a7a725de22 merge dev 2022-04-26 20:58:39 +08:00
phyzical
8a9a206895 one more lint 2022-04-26 20:52:57 +08:00
phyzical
21a105eb49 linting 2022-04-26 20:49:12 +08:00
phyzical
510a2c2ff7 augmentation isSpecial adjustments
* adjust faction helper to not longer require blacklisting, instead rely on isSpecial
* added neruflux and TRP as special augs
* made SOA augs special
2022-04-26 20:44:09 +08:00
JP Sugarbroad
6b7be9f87b fix typing conflict between jest and cypress
Cypress and Jest both define "expect", but they come from different
libraries (Cypress uses Chai, Jest uses its own thing). So we can't
include both of them in the tsconfig.json. Conveniently, however, we
don't need any of the test code to be part of the main project, so
it suffices to give cypress its own tsconfig.json file.

That being done, adding "jest" to the global types lets us remove all
those imports.
2022-04-25 22:10:27 -07:00
Undeemiss
8e4ac7be6b Save migration for old contract names
Rename old "HammingCodes: Integer to encoded Binary" contracts to
"HammingCodes: Integer to Encoded Binary" on file load if the save
is old.
2022-04-25 20:12:46 -05:00
nickofolas
4cae862fd2 Fix Infiltration victory rep 2022-04-25 19:39:59 -05:00
rderfler
47ce4f4927 Merge branch 'dev' of https://github.com/rderfler/bitburner into dev 2022-04-25 15:48:42 -04:00
rderfler
46c6884c89 Make Infiltrate synthoids a little more clear
By adding a short description
2022-04-25 15:48:02 -04:00
nickofolas
09458b39e6 Merge branch 'dev' into improvement/purchase-augs-ui 2022-04-25 13:35:58 -05:00
rderfler
f187343fa1
Merge branch 'danielyxie:dev' into dev 2022-04-25 14:08:38 -04:00
rderfler
d345188cce Address blackops error
Address blackops error by removing incorrect check for type
2022-04-25 13:57:54 -04:00
hydroflame
686f458064
Merge pull request #3561 from danielyxie/dev
Keeping up to date.
2022-04-25 13:52:20 -04:00
Olivier Gagnon
ee4201c957 allbuild commit ad938b15 2022-04-25 13:50:52 -04:00
Olivier Gagnon
ad938b1525 casino roulette actually advances the seed now. 2022-04-25 13:46:09 -04:00
rderfler
5f46775950 Cant stop wont stop studying
Correct merge, and known bug that prevents stopping studying
2022-04-25 13:41:43 -04:00
Olivier Gagnon
75de6c665d Moved window.print redefining at top level to prevent naming collision 2022-04-25 13:37:24 -04:00
Olivier Gagnon
2be1d5ff15 Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2022-04-25 13:37:09 -04:00
rderfler
e381e857a5 Merge remote-tracking branch 'upstream/dev' into dev 2022-04-25 13:32:38 -04:00
Olivier Gagnon
58555c0baf remove pre-defined print in .js files. 2022-04-25 13:29:59 -04:00
nickofolas
9f001b25d2 Merge branch 'dev' into improvement/purchase-augs-ui 2022-04-25 12:11:51 -05:00
hydroflame
2c08eec40c
Merge pull request #3560 from PSEUDOSTAGE/patch-1
DOCUMENTATION: Clarify definition for installAugmentations()
2022-04-25 13:11:19 -04:00
PSEUDOSTAGE
ab388777b5
Clarify definition for installAugmentations()
Adds the sentence, "If you do not own uninstalled Augmentations then the game will not reset." to the description for installAugmentations().
2022-04-25 13:02:49 -04:00
hydroflame
41932928af
Merge pull request #3559 from stalefishies/compression-contract-docs
DOCUMENTATION: Add descriptions for compression contracts
2022-04-25 12:32:10 -04:00
hydroflame
11da3106ec
Merge pull request #3557 from nickofolas/fix/sleeve-gangs-crash
SLEEVES: Fix issues with Sleeve UI crashing when Sleeve task faction becomes gang faction
2022-04-25 12:03:43 -04:00
Olivier Gagnon
5dae3314e6 upgrade blood donations 2022-04-25 12:03:00 -04:00
Olivier Gagnon
bab57fb4de make gang button a component 2022-04-25 12:02:37 -04:00