fb31903966
Merge pull request #3873 from ilkecan/createProgram-cancel-message
...
createProgram: FIX #3846 Return correct message
2022-07-06 14:38:38 -04:00
4f617e7d3d
Merge pull request #3818 from ApamNapat/fixed_some_typos_and_style_issues
...
MISC: Fixed some typos and style issues
2022-07-06 14:35:31 -04:00
9cb58898f2
Add ilkecan fix for part time work
2022-06-29 15:03:34 -04:00
adda3d68cd
createProgram: Return correct message
...
It doesn't return completion message upon cancellation anymore.
2022-06-29 02:01:01 +00:00
7acb83ba77
Fix backwards logic on quitJob
2022-06-16 07:44:32 -04:00
de01ae20b9
Fixed some typos and style issues
2022-06-07 15:26:33 +02:00
734f1167df
Restore Fulcrum Rep Requirement to Default
...
Instead of setting it specifically to 200e3, removed the argument entirely so it will use the default, which currently happens to be 200e3.
2022-05-26 01:12:40 -04:00
2defd1887d
Reduce Fulcrum Rep Requirement
2022-05-26 01:00:56 -04:00
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
0d437e5b73
lint
2022-05-20 18:20:04 -04:00
27a8582df8
balance infiltrate synthoids
2022-05-20 18:18:42 -04:00
34b099c050
rm reviver from person
2022-05-20 17:44:20 -04:00
42dcbf889e
fix typo
2022-05-20 17:28:21 -04:00
7eb4494ac1
fix mc
2022-05-20 15:58:33 -04:00
9af553f63c
Fix
2022-05-19 02:09:00 -04:00
685c93b06d
Add sorting buttons to grafting UI
2022-05-14 09:15:01 -05:00
b683bc0340
fmt
2022-05-08 14:14:05 -04:00
77073836cb
Merge remote-tracking branch 'upstream/dev' into dev
2022-05-06 22:44:24 -04:00
1a8e31ed09
fix formating
2022-05-06 01:06:53 +02:00
5378e8cc38
sort and color grafting list
2022-05-06 00:44:05 +02:00
7d75093989
Init work types with new None member
2022-05-04 15:03:02 -05:00
59982370cb
Implement CrimeType enum
2022-05-04 14:48:49 -05:00
f45200b25e
Implement ClassType and FactionWorkType enums
2022-05-04 14:18:12 -05:00
4a8e99b170
Refactor WorkType to an enum
2022-05-04 13:42:48 -05:00
bcb6176952
Merge branch 'dev' into improvement/work-in-progress-ui
2022-05-04 12:28:33 -05:00
44641fee07
Merge pull request #3544 from phyzical/feature/refactor-augmentation
...
REFACTOR: augmentation cost, rep cost and level to be calculated in place
2022-05-04 12:08:24 -04:00
fc3d89e51f
Merge pull request #3552 from Snarling/jobSwitchFix
...
COMPANY: Fix #3551 Applying for a new job will not change active employer if player is performing company work
2022-05-04 12:08:03 -04:00
5d4241b120
Merge pull request #3568 from nickofolas/fix/grafting-stop-work
...
GRAFTING: Fix Grafting not being handled in singularity stop work
2022-05-04 12:02:29 -04:00
bffa166fc3
Merge pull request #3577 from phyzical/feature/WEB-3567
...
FEATURE: added logic to allow quitJob to be called from singularity
2022-05-04 11:57:39 -04:00
0767043166
added logic to avoid stale object reference on sleeve during augmentation
2022-05-03 19:22:05 +08:00
d942d27a85
Reduce component usage in sleeve element
2022-05-02 17:49:10 -05:00
57673ae281
Add new progress bar to sleeve UI
2022-05-02 17:48:49 -05:00
2f320d00a2
Merge branch 'danielyxie:dev' into dev
2022-04-30 15:26:18 -04:00
7cf21629a7
Address review
...
Add ns function setToBladeburnerAction
Formatting updates
fix sleeves using player stamina
Correct supporting sleeve causing error
2022-04-30 15:25:36 -04:00
711955c112
added logic to allow quitJob to be called from singularity
2022-04-28 19:05:56 +08:00
af8284381c
merge base
2022-04-27 19:00:42 +08:00
a87bfb0de6
Handle grafting in singularity stop work
2022-04-26 20:11:41 -05:00
d0d700077a
Merge pull request #3545 from nickofolas/improvement/purchase-augs-ui
...
UI: Redesign purchasable Augmentations
2022-04-26 11:16:13 -04:00
a7a725de22
merge dev
2022-04-26 20:58:39 +08:00
8a9a206895
one more lint
2022-04-26 20:52:57 +08:00
21a105eb49
linting
2022-04-26 20:49:12 +08:00
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
46c6884c89
Make Infiltrate synthoids a little more clear
...
By adding a short description
2022-04-25 15:48:02 -04:00
5f46775950
Cant stop wont stop studying
...
Correct merge, and known bug that prevents stopping studying
2022-04-25 13:41:43 -04:00
e381e857a5
Merge remote-tracking branch 'upstream/dev' into dev
2022-04-25 13:32:38 -04:00
9f001b25d2
Merge branch 'dev' into improvement/purchase-augs-ui
2022-04-25 12:11:51 -05:00
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
6e9f33470b
Merge pull request #3528 from borisflagell/FIX-#3415-Manage-Gang-button-improvements.-
...
UI: FIX #3415 Tweak Manage Gang button visibility
2022-04-25 11:27:45 -04:00
8e222fd58e
Merge pull request #3539 from nickofolas/fix/ns-aug-graft-time
...
API: Fix inconsistent return value in `ns.grafting.getAugmentationGraftTime`
2022-04-25 11:27:09 -04:00
684f4126e5
Update GraftingRoot.tsx
...
Fixes #3313
Add rerendering to the GraftingRoot page. => Graft button will now dynamically enable/disable when player's money update above/below aug's price.
2022-04-25 05:36:45 +02:00
hydroflame
Snarling
ilkecan
BB
T.J. Eckman
borisflagell
Olivier Gagnon
nickofolas
rderfler
jaype87
nickofolas
phyzical