Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Faction update to match wiki #2930

Merged
merged 2 commits into from
Jun 10, 2014
Merged

Conversation

bszlrd
Copy link
Contributor

@bszlrd bszlrd commented Jun 7, 2014

I've started to do some structuring on the universe fiction on the wiki, mostly based on @Thargoid's writing. I've changed the hand made factions to match it:
Removed RED, added Haber instead. Haber has only one gov type, and if something's illegal, then it's illegal for sure (100% probability)
Changed CIW name to Commonwealth of Independent Worlds. Changed the name in the system description too.
Changed SolFed to Solar Federation, also changed military and police name.

See http://pioneerspacesim.net/forum/viewtopic.php?f=3&t=217&start=10
and http://pioneerwiki.com/wiki/Pioneer_Universe

@robn
Copy link
Member

robn commented Jun 7, 2014

Nice work. Is it worth getting rid of the autogenerated factions at this point?

@bszlrd
Copy link
Contributor Author

bszlrd commented Jun 7, 2014

Thanks. :) I think it's not. The galaxy would be quite empty then. I just wanted to make a good base for further writing and fiction stuff, that matches the wiki too.

@acopland-pitbull
Copy link

Clearly you have underestimated the power of the RED team, this is a BLUE team conspiracy!!!1! :D

Also, I approve of the commit.

fluffyfreak added a commit that referenced this pull request Jun 10, 2014
Faction update to match wiki
@fluffyfreak fluffyfreak merged commit cc53f78 into pioneerspacesim:master Jun 10, 2014
@impaktor
Copy link
Member

I fixed: e03c431

impaktor added a commit that referenced this pull request Jun 10, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants