Differences
This shows you the differences between two versions of the page.
megamanx:universe [2013/09/18 19:33] admin [Technology/Terms] |
megamanx:universe [2016/04/27 15:19] (current) |
||
---|---|---|---|
Line 15: | Line 15: | ||
* [[:megamanx:redalert|Red Alert Bounty Hunters]] | * [[:megamanx:redalert|Red Alert Bounty Hunters]] | ||
* [[:megamanx:humans|Humans]] | * [[:megamanx:humans|Humans]] | ||
+ | * [[:megamanx:united_nations|United Nations / World Government / World Federation]] | ||
Line 29: | Line 30: | ||
* [[:megamanx:locations:cyberspace|Cyber Space]] | * [[:megamanx:locations:cyberspace|Cyber Space]] | ||
* [[:megamanx:locations:aurora_station|Aurora Space Station]] | * [[:megamanx:locations:aurora_station|Aurora Space Station]] | ||
+ | * [[:megamanx:locations:world_senate|World Senate]] | ||
===== Important People ===== | ===== Important People ===== | ||
Line 44: | Line 46: | ||
* [[:megamanx:people:alia|Alia]] | * [[:megamanx:people:alia|Alia]] | ||
* [[:megamanx:people:sigma|Sigma]] | * [[:megamanx:people:sigma|Sigma]] | ||
+ | * [[:megamanx:people:vile|Vile]] | ||
* [[:megamanx:people:dynamo|Dynamo]] | * [[:megamanx:people:dynamo|Dynamo]] | ||
* [[:megamanx:people:dr_doppler|Dr. Doppler]] | * [[:megamanx:people:dr_doppler|Dr. Doppler]] | ||
Line 91: | Line 94: | ||
* [[:megamanx:history:x8|Jacob's Elevator]] | * [[:megamanx:history:x8|Jacob's Elevator]] | ||
* [[:megamanx:history:x_cm|Rebellion in Giga City]] | * [[:megamanx:history:x_cm|Rebellion in Giga City]] | ||
- |