Commit Graph

516 Commits

Author SHA1 Message Date
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
Olivier Gagnon
f6e5f719d1 infiltration API fixes. 2022-04-22 17:12:14 -04:00
phyzical
8e1300d69d Merge branch 'dev' into feature/add-infiltration-faction
# Conflicts:
#	src/Netscript/RamCostGenerator.ts
2022-04-20 20:10:05 +08:00
Undeemiss
46a90e6271 Added ns function stanek.acceptGift
Added a new ns function stanek.acceptGift to the game, with a ram
cost of 2gb. The function attempts to join the CotMG and install
the gift, then returns true iff the player is in the CotMG and has
the gift installed.
2022-04-19 12:08:38 -05:00
phyzical
8db74f343a merge base 2022-04-15 14:25:13 +08:00
hydroflame
6ce1bab5fe
Merge pull request #3461 from Hoekstraa/3263
API: Add repFromDonation() to the Formula API
2022-04-14 18:26:38 -04:00
Zoë Hoekstra
accb9f7e23
Add repFromDonation formula to the API 2022-04-14 20:01:31 +02:00
phyzical
9c23fc89d1 merge base 2022-04-14 21:27:08 +08:00
Olivier Gagnon
a6ed2b9ed1 doc 2022-04-13 23:53:50 -04:00
hydroflame
5e111df832
Merge pull request #3438 from nickofolas/feature/monaco-theme-editor
[Feature] Monaco Theme Editor
2022-04-13 17:43:59 -04:00
Olivier Gagnon
9281cbe559 ns func to flume and destroy wd 2022-04-13 17:34:02 -04:00
hydroflame
244bb5737e
Merge branch 'dev' into bugfix/corp-updates 2022-04-13 16:20:22 -04:00
nickofolas
e69e45c283 Better imports 2022-04-13 14:52:30 -05:00
nickofolas
58c4861c56 lint 2022-04-13 14:45:26 -05:00
nickofolas
567fcf8fb6 prettier 2022-04-13 14:42:07 -05:00
nickofolas
1f9414fd0e Resolve conflict 2022-04-13 14:32:30 -05:00
nickofolas
137539c1db Add missing newline at end of file 2022-04-13 14:32:30 -05:00
nickofolas
d1edbe9a43 Save data sanitization
- Run in `Editor.beforeMount`, as well as when the
options modal is closed
- Recursively validates all token colors and
replaces them with bright red if they're invalid
2022-04-13 14:32:30 -05:00
nickofolas
739ca27ab9 Add Paper styling to modal 2022-04-13 14:32:30 -05:00
nickofolas
6f60589779 Tie up loose ends
- Ensure that customTheme is redefined whenever the options modal
is closed, regardless of saved or not
- Reset the pending value for the theme editor whenever modal is clsoed
2022-04-13 14:32:30 -05:00
nickofolas
10513ba5bc Update label for common.accent 2022-04-13 14:32:30 -05:00
nickofolas
16cf227498 Implement Monaco theme editor 2022-04-13 14:32:30 -05:00
nickofolas
b3f37b2583 Add types token 2022-04-13 14:32:30 -05:00
nickofolas
881d4816cc Theme attribute cleanup 2022-04-13 14:32:30 -05:00
nickofolas
ec0f20b14f Framework for custom theme 2022-04-13 14:32:30 -05:00
hydroflame
cca8aa45d6
Merge pull request #3425 from Chris380/bugfix/3111_growthAnalyzeSecurity_thread_limit
Bugfix/3111 growthAnalyzeSecurity thread limit
2022-04-13 11:26:22 -04:00
Olivier Gagnon
a029aee404 fmtlint 2022-04-13 11:18:22 -04:00
nickofolas
51e5d38c7b Add grafting API function to get graftable augs 2022-04-13 09:43:27 -05:00
Chris380
baa14f7b4d
Update src/ScriptEditor/NetscriptDefinitions.d.ts
Co-authored-by: Nikolai Korolev <CrafterKolyan@mail.ru>
2022-04-13 15:48:44 +02:00
Chris380
04abb60708
Update src/ScriptEditor/NetscriptDefinitions.d.ts
Co-authored-by: Nikolai Korolev <CrafterKolyan@mail.ru>
2022-04-13 15:48:29 +02:00
phyzical
6b48ff8f21 merge base 2022-04-13 18:50:42 +08:00
Jack
2f9ab67cd2
Merge branch 'dev' into bugfix/corp-updates 2022-04-13 16:35:18 +08:00
chris380
4c113c19eb take into account max threads needed 2022-04-13 09:16:59 +02:00
Olivier Gagnon
e1a56f9270 typos 2022-04-13 02:04:51 -04:00
Alexander Jarman
dd6d4ec104
Merge branch 'dev' into htugboat/toast-part-deux 2022-04-13 01:55:13 -04:00
Heinous Tugboat
492c7012ea Renames SnackbarVariant to ToastVariant, adds enum to ns 2022-04-13 01:54:13 -04:00
Olivier Gagnon
f555c4567b update doc 2022-04-13 01:35:35 -04:00
hydroflame
03b05f53fe
Revert "[Feature] Script Editor Theme Customization" 2022-04-13 01:12:56 -04:00
hydroflame
413576100a
Merge pull request #2876 from nickofolas/feature/monaco-theme-editor
[Feature] Script Editor Theme Customization
2022-04-13 01:12:15 -04:00
Olivier Gagnon
729fdf7510 fk it 2022-04-13 01:00:00 -04:00
hydroflame
eee8d3e283
Merge pull request #3381 from HeinousTugboat/htugboat/toast-enum
Adds SnackbarVariant enum
2022-04-13 00:34:09 -04:00
Olivier Gagnon
eaf0098cc7 move singularity to its own namespace but still support the old. 2022-04-12 20:55:28 -04:00
hydroflame
b017fd2300
Merge pull request #3000 from JonathanBeverley/corp-expose-things-in-ui
Expose product and material details in API match UI
2022-04-12 17:49:29 -04:00
Olivier Gagnon
52e01fc026 fix a few things about getRecentScritps 2022-04-12 14:45:48 -04:00
hydroflame
68abd27d2c
Merge branch 'dev' into add-ns-getRecentScripts 2022-04-12 14:21:18 -04:00
hydroflame
aa1ab030a3
Merge pull request #3404 from Chris380/bugfix/3057_hashCost_example_code
Fixed hashCost() example code
2022-04-12 13:37:32 -04:00
chris380
fa29d2d9a8 take into account max thread needed 2022-04-12 17:42:49 +02:00
chris380
a49f68b0de Fixed hashCost() example code 2022-04-12 16:23:05 +02:00
hydroflame
674f3b0c9f
Merge pull request #3318 from smmalis37/empjobs
Fix docs for employeeProd and add employeeJobs.
2022-04-11 20:48:17 -04:00
phyzical
a66b5bfb69 fixes and pr comments 2022-04-11 21:54:50 +08:00