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

Fixed mege conflicts

Browse Source
This commit is contained in:
Daniel Xie
2016-11-17 09:34:38 -06:00
parent 62fbb5452d 40b0b585e1
commit a4f92f7520
7 changed files with 220 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Faction.js
+3 -1
View File
@@ -43,10 +43,12 @@ Factions = {
NiteSec: new Faction("NiteSec");
//City factions, essentially governments
Newerth: new Faction("Newerth");
Chongqing: new Faction("Chongqing");
Sector12: new Faction("Sector-12");
HongKong: new Faction("New Tokyo");
Aevum: new Faction("Aevum");
Ishima: new Faction("Ishima");
Volhaven: new Faction("Volhaven");
//Criminal Organizations/Gangs