More actions
Add Geri and Bestla |
Proton One (talk | contribs) Whoops, it's ORE, not Upwell |
||
| (18 intermediate revisions by 3 users not shown) | |||
| Line 12: | Line 12: | ||
| Bestower | | Bestower | ||
| Crucifier | | Crucifier | ||
| Civilian Amarr Shuttle | |||
| Dragoon | | Dragoon | ||
| Executioner | | Executioner | ||
| Line 46: | Line 47: | ||
| Absolution | | Absolution | ||
| Anathema | | Anathema | ||
| Bane | |||
| Coercer | | Coercer | ||
| Crusader | | Crusader | ||
| Line 95: | Line 97: | ||
| Silver Magnate | | Silver Magnate | ||
| Tash-Murkon Magnate | | Tash-Murkon Magnate | ||
| Vangel = [[File:Isis amarr.png|{{#if: {{{width|}}}|{{{width}}}| | | Vangel = [[File:Isis amarr.png|{{#if: {{{width|}}}|{{{width}}}|22}}px|link=|Amarr]] | ||
<!--#################################### | <!--#################################### | ||
** FACTION: Caldari ** | ** FACTION: Caldari ** | ||
| Line 105: | Line 107: | ||
| Caldari Shuttle | | Caldari Shuttle | ||
| Caracal | | Caracal | ||
| Civilian Caldari Shuttle | |||
| Condor | | Condor | ||
| Corax | | Corax | ||
| Line 153: | Line 156: | ||
| Harpy | | Harpy | ||
| Hawk | | Hawk | ||
| Karura | |||
| Kirin | | Kirin | ||
| Kitsune | | Kitsune | ||
| Line 184: | Line 188: | ||
** Special Edition ** | ** Special Edition ** | ||
************************************ --> | ************************************ --> | ||
| Anhinga | |||
| Boobook | | Boobook | ||
| Cambion | | Cambion | ||
| Line 189: | Line 194: | ||
| Goru's Shuttle | | Goru's Shuttle | ||
| Raven State Issue | | Raven State Issue | ||
| Skua | |||
| Scorpion Ishukone Watch | | Scorpion Ishukone Watch | ||
| Sukuuvestaa Heron = [[File:Isis caldari.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Caldari]] | | Sukuuvestaa Heron = [[File:Isis caldari.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Caldari]] | ||
<!--#################################### | |||
** FACTION: Amarr ** | |||
** Tech ? ** | |||
************************************ --> | |||
| Tholos | |||
| Cenotaph = [[File:Logo faction deathless circle.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Deathless Circle]] | |||
<!--#################################### | <!--#################################### | ||
** FACTION: Gallente ** | ** FACTION: Gallente ** | ||
| Line 200: | Line 212: | ||
| Catalyst | | Catalyst | ||
| Celestis | | Celestis | ||
| Civilian Gallente Shuttle | |||
| Dominix | | Dominix | ||
| Epithal | | Epithal | ||
| Line 247: | Line 260: | ||
| Eris | | Eris | ||
| Helios | | Helios | ||
| Hubris | |||
| Ishkur | | Ishkur | ||
| Ishtar | | Ishtar | ||
| Line 284: | Line 298: | ||
| Adrestia | | Adrestia | ||
| Aliastra Catalyst | | Aliastra Catalyst | ||
| Cybele | |||
| Inner Zone Shipping Catalyst | | Inner Zone Shipping Catalyst | ||
| Inner Zone Shipping Imicus | | Inner Zone Shipping Imicus | ||
| Line 292: | Line 307: | ||
| Opux Luxury Yacht | | Opux Luxury Yacht | ||
| Quafe Catalyst | | Quafe Catalyst | ||
| Shapash | |||
| Utu | | Utu | ||
| Zephyr = [[File:Isis gallente.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Gallente]] | | Zephyr = [[File:Isis gallente.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Gallente]] | ||
| Line 301: | Line 317: | ||
| Breacher | | Breacher | ||
| Burst | | Burst | ||
| Civilian Minmatar Shuttle | |||
| Cyclone | | Cyclone | ||
| Hoarder | | Hoarder | ||
| Line 320: | Line 337: | ||
| Tornado | | Tornado | ||
| Typhoon | | Typhoon | ||
| Valravn | |||
| Vigil | | Vigil | ||
| Wreathe | | Wreathe | ||
| Line 397: | Line 415: | ||
| Covetor | | Covetor | ||
| Noctis | | Noctis | ||
| Pioneer | |||
| Pioneer Consortium Issue | |||
| Procurer | | Procurer | ||
| Retriever | | Retriever | ||
| Venture | | Venture | ||
| Venture Consortium Issue | |||
<!--************************************ | <!--************************************ | ||
** FACTION: ORE ** | ** FACTION: ORE ** | ||
| Line 407: | Line 428: | ||
| Hulk | | Hulk | ||
| Mackinaw | | Mackinaw | ||
| Outrider | |||
| Prospect | | Prospect | ||
| Skiff | | Skiff | ||
| Line 433: | Line 455: | ||
| Cynabal | | Cynabal | ||
| Dramiel | | Dramiel | ||
| Khizriel | |||
| Machariel | | Machariel | ||
| Mekubal | |||
| Sarathiel | |||
<!--************************************ | |||
** FACTION: Angel Cartel ** | |||
** Capital ** | |||
************************************ --> | |||
| Azariel | |||
<!--************************************ | <!--************************************ | ||
** FACTION: Angel cartel ** | ** FACTION: Angel cartel ** | ||
| Line 479: | Line 509: | ||
** Subcapital ** | ** Subcapital ** | ||
************************************ --> | ************************************ --> | ||
| Alligator | |||
| Gila | | Gila | ||
| Mamba | |||
| Rattlesnake | | Rattlesnake | ||
| Worm | | Worm | ||
| Line 494: | Line 526: | ||
************************************ --> | ************************************ --> | ||
| Chameleon | | Chameleon | ||
| Cobra | |||
| Guristas Shuttle | | Guristas Shuttle | ||
| Python | |||
| Rattlesnake Victory Edition | | Rattlesnake Victory Edition | ||
| Sidewinder | |||
| Taipan | | Taipan | ||
| Whiptail = [[File:Isis guristas.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Guristas]] | | Whiptail = [[File:Isis guristas.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Guristas]] | ||
| Line 570: | Line 605: | ||
| Astero | | Astero | ||
| Nestor | | Nestor | ||
| Odysseus | |||
| Stratios | | Stratios | ||
| Stratios Emergency Responder = [[File:Isis soe.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Sisters of EVE]] | | Stratios Emergency Responder = [[File:Isis soe.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Sisters of EVE]] | ||
| Line 580: | Line 616: | ||
| Gnosis | | Gnosis | ||
| Hydra | | Hydra | ||
| Metamorphosis | |||
| Praxis | | Praxis | ||
| Sunesis | | Sunesis | ||
| Line 601: | Line 638: | ||
** Tech 1 ** | ** Tech 1 ** | ||
************************************ --> | ************************************ --> | ||
| Babaroga | |||
| Damavik | | Damavik | ||
| Drekavac | | Drekavac | ||
| Line 616: | Line 654: | ||
| Nergal | | Nergal | ||
| Zarmazd = [[File:Logo faction triglavian collective.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Triglavian Collective]] | | Zarmazd = [[File:Logo faction triglavian collective.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Triglavian Collective]] | ||
<!--************************************ | |||
** FACTION: Upwell Consortium ** | |||
** General ** | |||
************************************ --> | |||
| Avalanche | |||
| Deluge | |||
| Pioneer Consortium Issue | |||
| Squall | |||
| Torrent = [[File:Upwell Consortium logo.png|{{#if: {{{width|}}}|{{{width}}}|20}}px|link=|Upwell Consortium]] | |||
<!--#################################### | <!--#################################### | ||
** UNCATEGORIZED ** | ** UNCATEGORIZED ** | ||