felixfoertsch/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2026-04-22 17:23:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into bugfix/3348

Browse Source 
# Conflicts:
#	src/Faction/FactionInfo.tsx
#	src/NetscriptFunctions/Singularity.ts
This commit is contained in:
phyzical
2022-04-07 16:17:28 +08:00
parent 2ee73cc8d6 7d4bf90b40
commit a4e1b73b19
188 changed files with 4016 additions and 3210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Augmentation/AugmentationHelpers.tsx
+6 -6
View File
@@ -15,9 +15,9 @@ import { clearObject } from "../utils/helpers/clearObject";
import { FactionNames } from "../Faction/data/FactionNames";
import {
bladeburnerAugmentations,
churchOfTheMachineGodAugmentations,
generalAugmentations,
initBladeburnerAugmentations,
initChurchOfTheMachineGodAugmentations,
initGeneralAugmentations,
initNeuroFluxGovernor,
initUnstableCircadianModulator,
} from "./AugmentationCreator";
@@ -50,9 +50,9 @@ function createAugmentations(): void {
[
initNeuroFluxGovernor(),
initUnstableCircadianModulator(),
...generalAugmentations,
...(factionExists(FactionNames.Bladeburners) ? bladeburnerAugmentations : []),
...(factionExists(FactionNames.ChurchOfTheMachineGod) ? churchOfTheMachineGodAugmentations : []),
...initGeneralAugmentations(),
...(factionExists(FactionNames.Bladeburners) ? initBladeburnerAugmentations() : []),
...(factionExists(FactionNames.ChurchOfTheMachineGod) ? initChurchOfTheMachineGodAugmentations() : []),
].map(resetAugmentation);
}