hydroflame
fb31903966
Merge pull request #3873 from ilkecan/createProgram-cancel-message
...
createProgram: FIX #3846 Return correct message
2022-07-06 14:38:38 -04:00
Snarling
9cb58898f2
Add ilkecan fix for part time work
2022-06-29 15:03:34 -04:00
ilkecan
adda3d68cd
createProgram: Return correct message
...
It doesn't return completion message upon cancellation anymore.
2022-06-29 02:01:01 +00:00
Snarling
7acb83ba77
Fix backwards logic on quitJob
2022-06-16 07:44:32 -04:00
T.J. Eckman
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
T.J. Eckman
2defd1887d
Reduce Fulcrum Rep Requirement
2022-05-26 01:00:56 -04: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
Olivier Gagnon
27a8582df8
balance infiltrate synthoids
2022-05-20 18:18:42 -04:00
rderfler
77073836cb
Merge remote-tracking branch 'upstream/dev' into dev
2022-05-06 22:44:24 -04:00
nickofolas
7d75093989
Init work types with new None member
2022-05-04 15:03:02 -05:00
nickofolas
59982370cb
Implement CrimeType enum
2022-05-04 14:48:49 -05:00
nickofolas
f45200b25e
Implement ClassType and FactionWorkType enums
2022-05-04 14:18:12 -05:00
nickofolas
4a8e99b170
Refactor WorkType to an enum
2022-05-04 13:42:48 -05:00
hydroflame
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
hydroflame
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
hydroflame
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
phyzical
711955c112
added logic to allow quitJob to be called from singularity
2022-04-28 19:05:56 +08:00
nickofolas
a87bfb0de6
Handle grafting in singularity stop work
2022-04-26 20:11:41 -05:00
phyzical
a7a725de22
merge dev
2022-04-26 20:58:39 +08: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
rderfler
e381e857a5
Merge remote-tracking branch 'upstream/dev' into dev
2022-04-25 13:32:38 -04:00
Snarling
9fec222c61
Revert change in startWork
...
Original change was committed accidentally. PR is focused only on applyForWork.
2022-04-24 06:57:31 -04:00
Snarling
ac719dc0d2
Update PlayerObjectGeneralMethods.tsx
2022-04-23 23:55:47 -04:00
Snarling
759c57b29a
applyForJob streamline and fix logic
2022-04-23 23:48:01 -04:00
phyzical
cdfbda1379
merge dev
2022-04-23 10:26:51 +08:00
nickofolas
8b34d2776a
Implement standardized grafting time calcs
2022-04-21 21:48:18 -05:00
Olivier Gagnon
eb778aafa9
refactor bitnode multiplier code to have less side effect.
2022-04-19 17:17:08 -04:00
Snarling
bd07dea516
Fix quitting active job
...
When quitting active job, if there is another job, set the first remaining job as active.
2022-04-18 19:55:37 -04:00
phyzical
82610c0c44
Merge branch 'feature/add-infiltration-faction' into feature/refactor-augmentation
2022-04-15 14:26:00 +08:00
phyzical
8db74f343a
merge base
2022-04-15 14:25:13 +08:00
rderfler
3cd8f8a223
merged from upstream
2022-04-14 15:47:00 -04:00
rderfler
332b803332
Fmt and lint
2022-04-14 15:28:13 -04:00
Olivier Gagnon
52e27e317e
Added blood donation bonus
2022-04-14 15:17:46 -04:00
phyzical
c3a3994658
rename augmentation to static augmentation
2022-04-15 01:19:51 +08:00
rderfler
7c468663d4
Merge branch 'danielyxie:dev' into dev
2022-04-14 11:48:44 -04:00
rderfler
d1388a62aa
Merge branch 'dev' of https://github.com/rderfler/bitburner into dev
2022-04-14 11:41:02 -04:00
rderfler
2613948bad
Add bladeburner actions to sleeves
...
This adds bladeburner actions to sleeves. In addition this bulked out the IPerson functionality and updated bladeburner functions to be more sleeve compatible
2022-04-14 11:40:59 -04:00
phyzical
9c23fc89d1
merge base
2022-04-14 21:27:08 +08:00
Olivier Gagnon
62d15ff3a1
rm SourceFileFlags
2022-04-14 01:22:50 -04:00
hydroflame
ab0f89cea1
Merge pull request #3436 from Undeemiss/duplicate-programs
...
Create program action no longer creates duplicates
2022-04-13 15:43:21 -04:00
Undeemiss
87936598e2
Create program action no longer creates duplicates
2022-04-13 13:03:10 -05:00
Undeemiss
80b61ea17e
Reran npm format and lint to fix formatting
2022-04-13 12:19:58 -05:00
Olivier Gagnon
c76602a5df
rm aug woned
2022-04-13 12:24:01 -04:00
Olivier Gagnon
a029aee404
fmtlint
2022-04-13 11:18:22 -04:00
phyzical
90d1c22aca
changes all references to "heath reduction to damage reduction"
2022-04-13 18:54:13 +08:00
phyzical
7f288665d3
linting
2022-04-13 18:52:32 +08:00
phyzical
6b48ff8f21
merge base
2022-04-13 18:50:42 +08:00
Heinous Tugboat
492c7012ea
Renames SnackbarVariant to ToastVariant, adds enum to ns
2022-04-13 01:54:13 -04:00
hydroflame
eee8d3e283
Merge pull request #3381 from HeinousTugboat/htugboat/toast-enum
...
Adds SnackbarVariant enum
2022-04-13 00:34:09 -04:00
nickofolas
8da51b7e0a
Replace references to crafting with grafting
2022-04-11 11:07:15 -05:00
