Template:ShipsMatrix: Difference between revisions

(14 intermediate revisions by 7 users not shown)

Line 3:

.ships-matrix

{

overflow: auto;

font-family: arial;

font-size: 12px;

Line 141:

Line 142:

.ships-matrix .racialcol { width:21%; }

.ships-matrix .piratecol { width:~~12%; }~~

.ships-matrix .piratecol { width:10.5%; }

.~~ships-matrix .othercol { width:21~~%; }

.ships-matrix .othercol { width:16.8%; }

.ships-matrix .widecol { width:84%; }

Line 198:

}}

Line 216:

<th class='firstcol groupheader'><span class='textlabel'>Corvettes</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Corvettes]]</span></th>

<th class='racialcol centertext'>[[Impairor]]</th>

Line 232:

<th class='firstcol groupheader'><span class='textlabel'>Frigates</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Frigates]]</span></th>

<th class='racialcol centertext'>[[Executioner]] ▪ [[Inquisitor]] ▪ [[Tormentor]] ▪ [[Crucifier]] ▪ [[Punisher]] ▪ [[Magnate]]</th>

<th class='racialcol centertext'>[[Condor]] ▪ [[Bantam]] ▪ [[Kestrel]] ▪ [[Griffin]] ▪ [[Merlin]] ▪ [[Heron]]</th>

Line 296:

<th class='firstcol groupheader'><span class='textlabel'>Destroyers</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Destroyers]]</span></th>

<th class='racialcol centertext'>[[Coercer]] ▪ [[Dragoon]]</th>

<th class='racialcol centertext'>[[Cormorant]] ▪ [[Corax]]</th>

Line 344:

<th class='firstcol groupheader'><span class='textlabel'>Cruisers</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Cruisers]]</span></th>

<th class='racialcol centertext'>[[Arbitrator]] ▪ [[Augoror]] ▪ [[Omen]] ▪ [[Maller]]</th>

<th class='racialcol centertext'>[[Blackbird]] ▪ [[Osprey]] ▪ [[Caracal]] ▪ [[Moa]]</th>

Line 408:

<th class='firstcol groupheader'><span class='textlabel'>Battlecruisers</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Battlecruisers]]</span></th>

<th class='racialcol centertext'>[[Prophecy]] ▪ [[Harbinger]] ▪ [[Oracle]]</th>

<th class='racialcol centertext'>[[Ferox]] ▪ [[Drake]] ▪ [[Naga]]</th>

Line 440:

<th class='firstcol groupheader'><span class='textlabel'>Battleships</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Battleships]]</span></th>

<th class='racialcol centertext'>[[Armageddon]] ▪ [[Apocalypse]] ▪ [[Abaddon]] </th>

<th class='racialcol centertext'>[[Scorpion]] ▪ [[Raven]] ▪ [[Rokh]]</th>

Line 480:

<th class='firstcol groupheader'><span class='textlabel'>Carriers</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Carriers]]</span></th>

<th class='racialcol centertext'>[[Archon]]</th>

<th class='racialcol centertext'>[[Chimera]]</th>

Line 504:

<th class='firstcol groupheader'><span class='textlabel'>Dreadnoughts</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Dreadnoughts]]</span></th>

<th class='racialcol centertext'>[[Revelation]]</th>

<th class='racialcol centertext'>[[Phoenix]]</th>

Line 532:

<th class='firstcol groupheader'><span class='textlabel'>Force Auxiliaries</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Force Auxiliaries]]</span></th>

<th class='racialcol centertext'>[[Apostle]]</th>

<th class='racialcol centertext'>[[Minokawa]]</th>

Line 544:

<th class='firstcol groupheader'><span class='textlabel'>Titans</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Titans]]</span></th>

<th class='racialcol centertext'>[[Avatar]]</th>

<th class='racialcol centertext'>[[Leviathan]]</th>

Line 560:

<th class='firstcol groupheader'><span class='textlabel'>Freighters</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Freighters]]</span></th>

<th class='racialcol centertext'>[[Providence]]</th>

<th class='racialcol centertext'>[[Charon]]</th>

Line 584:

<th class='firstcol groupheader'><span class='textlabel'>Haulers</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Haulers]]</span></th>

<th class='racialcol centertext'>[[Bestower]] ▪ [[Sigil]]</th>

<th class='racialcol centertext'>[[Badger]] ▪ [[Tayra]]</th>

Line 604:

<th class='firstcol groupheader'><span class='textlabel'>Shuttles</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Shuttles]]</span></th>

<th class='racialcol centertext'>[[Amarr Shuttle]]</th>

<th class='racialcol centertext'>[[Caldari Shuttle]]</th>

Line 629:

</tr>

<td class='groupheader firstindent'>Navy Faction Frigates</td>

<td class='piratecol centertext'>[[Venture Consortium Issue]]</td>

</tr>

<td class='groupheader secondindent'>Expedition Frigates</td>

<td class='piratecol centertext'>[[Prospect]] ▪ [[Endurance]]</td>

</tr>

<td class='firstcol groupheader firstindent'>Destroyers</td>

<td class='piratecol centertext'>[[Pioneer]]</td>

</tr>

<td class='groupheader firstindent'>Navy Faction Destroyers</td>

<td class='piratecol centertext'>[[Pioneer Consortium Issue]]</td>

</tr>

<td class='groupheader secondindent'>Command Destroyers</td>

<td class='piratecol centertext'>[[Outrider]]</td>

</tr>

Line 676:

Line 696:

<th class='piratecol noshowexplain'><div class='img'>[[Image:Isis_angel.png|center|20x20px|link=]]</div>Angel Cartel</th>

<th class='piratecol noshowexplain'><div class='img'>[[Image:Isis_blood_raiders.png|center|20x20px|link=]]</div>Blood Raiders</th>

<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo faction deathless circle.png|center|20x20px|link=]]</div>Deathless Circle</th>

<th class='piratecol noshowexplain'><div class='img'>[[Image:Isis_guristas.png|center|20x20px|link=]]</div>Guristas</th>

<th class='piratecol noshowexplain'><div class='img'>[[Image:Isis_mordus.png|center|20x20px|link=]]</div>Mordu's Legion</th>

Line 687:

Line 708:

<td class='piratecol centertext'>[[Dramiel]]</td>

<td class='piratecol centertext'>[[Cruor]]</td>

<td class='piratecol centertext'>[[Garmur]]</td>

Line 693:

Line 715:

<td class='piratecol centertext'>[[Astero]]</td>

</tr>

<td class='firstcol groupheader firstindent'>Destroyers</td>

<td class='piratecol centertext'>[[Mekubal]]</td>

<td class='piratecol centertext'>[[Tholos]]</td>

<td class='piratecol centertext'>[[Mamba]]</td>

</tr>

Line 698:

Line 732:

<td class='piratecol centertext'>[[Cynabal]]</td>

<td class='piratecol centertext'>[[Ashimmu]]</td>

<td class='piratecol centertext'>[[Orthrus]]</td>

Line 703:

Line 738:

<td class='piratecol centertext'>[[Vigilant]]</td>

<td class='piratecol centertext'>[[Stratios]]</td>

</tr>

<td class='firstcol groupheader firstindent'>Battlecruisers</td>

<td class='piratecol centertext'>[[Khizriel]]</td>

<td class='piratecol centertext'>[[Cenotaph]]</td>

<td class='piratecol centertext'>[[Alligator]]</td>

</tr>

<td class='firstcol groupheader secondindent'>Expedition Command Ships</td>

<td class='piratecol centertext'>[[Odysseus]]</td>

</tr>

Line 709:

Line 768:

<td class='piratecol centertext'>[[Machariel]]</td>

<td class='piratecol centertext'>[[Bhaalgorn]]</td>

<td class='piratecol centertext'>[[Rattlesnake]]</td>

<td class='piratecol centertext'>[[Barghest]]</td>

Line 718:

Line 778:

<td class='firstcol groupheader firstindent'>Dreadnoughts</td>

<td class='piratecol centertext'>[[Sarathiel]]</td>

<td class='piratecol centertext'>[[Chemosh]]</td>

~~<td class='piratecol centertext'>[[Chemosh]]</td>~~

<td class='piratecol centertext'>[[Caiman]]</td>

Line 729:

Line 790:

<td class='firstcol groupheader firstindent'>Carriers</td>

Line 740:

Line 802:

<td class='groupheader secondindent'>Supercarriers</td>

Line 753:

Line 816:

<td class='piratecol centertext'>[[Dagon]]</td>

<td class='piratecol centertext'>[[Loggerhead]]</td>

Line 762:

Line 826:

<td class='firstcol groupheader firstindent'>Titans</td>

<td class='piratecol centertext'>[[Azariel]]</td>

<td class='piratecol centertext'>[[Molok]]</td>

~~<td class='piratecol centertext'>[[Molok]]</td>~~

<td class='piratecol centertext'>[[Komodo]]</td>

Line 785:

Line 850:

<th class='othercol noshowexplain'><div class='img'>[[Image:Logo_faction_the_society.png|center|20x20px|link=]]</div>Society of Conscious Thought</th>

<th class='othercol noshowexplain'><div class='img'>[[Image:Isis_triglavian.png|center|20x20px|link=]]</div>Triglavian Collective</th>

<th class='othercol noshowexplain'><div class='img'>[[Image:Upwell_Consortium_logo.png|center|20x20px|link=]]</div>Upwell Consortium</th>

</tr>

<td class='firstcol groupheader firstindent'>Frigates</td>

<td class='~~piratecol~~ centertext'> [[Echelon]] </td>

<td class='centertext'> [[Echelon]] </td>

<td class='~~piratecol~~ centertext'>[[Skybreaker]]</td>

<td class='centertext'>[[Skybreaker]]</td>

<td class='~~piratecol~~ centertext'> [[Metamorphosis]] </td>

<td class='centertext'> [[Metamorphosis]] </td>

<td class='~~piratecol~~ centertext'>[[Damavik]]</td>

<td class='centertext'>[[Damavik]]</td>

</tr>

<td class='firstcol groupheader secondindent'>Assault Frigates</td>

<td class='~~piratecol~~ centertext'>[[Nergal]]</td>

<td class='centertext'>[[Nergal]]</td>

</tr>

<td class='firstcol groupheader secondindent'>Covert Ops</td>

<td class='~~piratecol~~ centertext'>[[Pacifier]]</td>

<td class='centertext'>[[Pacifier]]</td>

</tr>

<td class='firstcol groupheader firstindent'>Destroyers</td>

<td class='~~piratecol~~ centertext'>[[Sunesis]]</td>

<td class='centertext'>[[Sunesis]]</td>

<td class='~~piratecol~~ centertext'>[[Kikimora]]</td>

<td class='centertext'>[[Kikimora]]</td>

</tr>

<td class='firstcol groupheader secondindent'>Command Destroyers</td>

<td class='~~piratecol~~ centertext'>[[Draugur]]</td>

<td class='centertext'>[[Draugur]]</td>

</tr>

<td class='firstcol groupheader firstindent'>Cruisers</td>

<td class='~~piratecol~~ centertext'>[[Stormbringer]]</td>

<td class='centertext'>[[Stormbringer]]</td>

<td class='~~piratecol~~ centertext'>[[Rodiva]] ▪ [[Vedmak]]</td>

<td class='centertext'>[[Rodiva]] ▪ [[Vedmak]]</td>

</tr>

<td class='firstcol groupheader secondindent'>Flag Cruisers</td>

<td class='~~piratecol~~ centertext'>[[Monitor]]</td>

<td class='centertext'>[[Monitor]]</td>

</tr>

<td class='firstcol groupheader secondindent'>Heavy Assault Cruisers</td>

<td class='~~piratecol~~ centertext'>[[Ikitursa]]</td>

<td class='centertext'>[[Ikitursa]]</td>

</tr>

<td class='firstcol groupheader secondindent'>Logistics Cruisers</td>

<td class='~~piratecol~~ centertext'>[[Zarmazd]]</td>

<td class='centertext'>[[Zarmazd]]</td>

</tr>

<td class='firstcol groupheader secondindent'>Recon Ships</td>

<td class='~~piratecol~~ centertext'>[[Enforcer]]</td>

<td class='centertext'>[[Enforcer]]</td>

</tr>

<td class='firstcol groupheader firstindent'>Battlecruisers</td>

<td class='~~piratecol~~ centertext'>[[Gnosis]]</td>

<td class='centertext'>[[Gnosis]]</td>

<td class='~~piratecol~~ centertext'>[[Drekavac]]</td>

<td class='centertext'>[[Drekavac]]</td>

</tr>

<td class='firstcol groupheader firstindent'>Battleships</td>

<td class='~~piratecol~~ centertext'>[[Thunderchild]]</td>

<td class='centertext'>[[Thunderchild]]</td>

<td class='~~piratecol~~ centertext'>[[Praxis]]</td>

<td class='centertext'>[[Praxis]]</td>

<td class='~~piratecol~~ centertext'>[[Leshak]]</td>

<td class='centertext'>[[Leshak]]</td>

</tr>

<td class='firstcol groupheader secondindent'>Black Ops</td>

<td class='~~piratecol~~ centertext'>[[Marshal]]</td>

<td class='centertext'>[[Marshal]]</td>

</tr>

<td class='firstcol groupheader secondindent'>Marauders</td>

<td class='centertext'>[[Babaroga]]</td>

</tr>

<td class='firstcol groupheader firstindent'>Dreadnoughts</td>

<td class='~~piratecol~~ centertext'>[[Zirnitra]]</td>

<td class='centertext'>[[Zirnitra]]</td>

</tr>

<td class='firstcol groupheader firstindent'>Freighters</td>

<td class='centertext'> [[Avalanche]] </td>

</tr>

<td class='firstcol groupheader firstindent'>Haulers</td>

<td class='centertext'> [[Squall]] </td>

</tr>

<td class='firstcol groupheader secondindent'>Transport Ships</td>

<td class='centertext'> [[Deluge]] ▪ [[Torrent]] </td>

</tr>

<td class='firstcol groupheader firstindent'>Shuttles</td>

<td class='~~piratecol~~ centertext'> [[Council Diplomatic Shuttle]] </td>

<td class='centertext'> [[Council Diplomatic Shuttle]] </td>

<td class='~~piratecol~~ centertext'> [[Apotheosis]] </td>

<td class='centertext'> [[Apotheosis]] </td>

</tr>

Line 937:

Line 1,054:

<td class='groupheader secondindent'>Covert Ops</td>

<td class='racialcol centertext'>{{Sh|Caedes}} ▪ {{Sh|Chremoas}} ▪ {{Sh|Hydra}} ▪ {{Sh|Virtuoso}}</td>

<td class='racialcol centertext'>{{Sh|Caedes}} ▪ {{Sh|Chremoas}} ▪ {{Sh|Hydra}} ▪ {{Sh|Sidewinder}} ▪ {{Sh|Virtuoso}}</td>

</tr>

Line 977:

Line 1,094:

<td class='groupheader secondindent'>Recon Ships</td>

<td class='racialcol centertext'>{{Sh|Chameleon}} ▪ {{Sh|Moracha}} ▪ {{Sh|Victor}} ▪ {{Sh|Tiamat}}</td>

<td class='racialcol centertext'>{{Sh|Chameleon}} ▪ {{Sh|Cobra}} ▪ {{Sh|Moracha}} ▪ {{Sh|Victor}} ▪ {{Sh|Tiamat}}</td>

</tr>

Line 983:

Line 1,100:

<td class='firstcol groupheader firstindent'>Battleships</td>

<td class='widecol centertext'>{{Sh|Apocalypse Imperial Issue}} ▪ {{Sh|Armageddon Imperial Issue}} ▪ {{Sh|Megathron Federate Issue}} ▪ {{Sh|Rattlesnake Victory Edition}} ▪ {{Sh|Raven State Issue}} ▪ {{Sh|Scorpion Ishukone Watch}} ▪ {{Sh|Tempest Tribal Issue}}</td>

</tr>

<td class='groupheader secondindent'>Black Ops</td>

<td class='racialcol centertext'>{{Sh|Python}}</td>

</tr>

Line 992:

Line 1,114:

<td class='firstcol groupheader firstindent'>Shuttles</td>

<td class='widecol centertext'> {{Sh|Boobook}} ▪ {{Sh|Civilian Caldari Shuttle}} ▪ {{Sh|Goru's Shuttle}} ▪ {{Sh|Guristas Shuttle}} ▪ {{Sh|InterBus Shuttle}} ▪ {{Sh|Leopard}}</td>

<td class='widecol centertext'> {{Sh|Boobook}} ▪ {{Sh|Civilian Amarr Shuttle}} ▪ {{Sh|Civilian Caldari Shuttle}} ▪ {{Sh|Civilian Gallente Shuttle}} ▪ {{Sh|Civilian Minmatar Shuttle}} ▪ {{Sh|Goru's Shuttle}} ▪ {{Sh|Guristas Shuttle}} ▪ {{Sh|InterBus Shuttle}} ▪ {{Sh|Leopard}}</td>

</tr>

@@ Line 3: / Line 3: @@
 .ships-matrix
   {
+  overflow: auto;
    font-family: arial;
    font-size: 12px;
@@ Line 141: / Line 142: @@
 .ships-matrix .racialcol { width:21%; }
-.ships-matrix .piratecol { width:12%; }
+.ships-matrix .piratecol { width:10.5%; }
-.ships-matrix .othercol { width:21%; }
+.ships-matrix .othercol { width:16.8%; }
 .ships-matrix .widecol { width:84%; }
@@ Line 198: / Line 198: @@
 }}
-<div class='ships-matrix'>
+<div class='ships-matrix nowraplinks'> <!-- nowraplinks is located in MediaWiki:Common.css -->
   <table cellspacing='0' cellpadding='0'>
@@ Line 216: / Line 216: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Corvettes</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Corvettes]]</span></th>
        <th class='racialcol centertext'>[[Impairor]]</th>
        <th class='racialcol centertext'>[[Ibis]]</th>
@@ Line 232: / Line 232: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Frigates</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Frigates]]</span></th>
        <th class='racialcol centertext'>[[Executioner]] &#9642; [[Inquisitor]] &#9642; [[Tormentor]] &#9642; [[Crucifier]] &#9642; [[Punisher]] &#9642; [[Magnate]]</th>
        <th class='racialcol centertext'>[[Condor]] &#9642; [[Bantam]] &#9642; [[Kestrel]] &#9642; [[Griffin]] &#9642; [[Merlin]] &#9642; [[Heron]]</th>
@@ Line 296: / Line 296: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Destroyers</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Destroyers]]</span></th>
        <th class='racialcol centertext'>[[Coercer]] &#9642; [[Dragoon]]</th>
        <th class='racialcol centertext'>[[Cormorant]] &#9642; [[Corax]]</th>
@@ Line 344: / Line 344: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Cruisers</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Cruisers]]</span></th>
        <th class='racialcol centertext'>[[Arbitrator]] &#9642; [[Augoror]] &#9642; [[Omen]] &#9642; [[Maller]]</th>
        <th class='racialcol centertext'>[[Blackbird]] &#9642; [[Osprey]] &#9642; [[Caracal]] &#9642; [[Moa]]</th>
@@ Line 408: / Line 408: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Battlecruisers</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Battlecruisers]]</span></th>
        <th class='racialcol centertext'>[[Prophecy]] &#9642; [[Harbinger]] &#9642; [[Oracle]]</th>
        <th class='racialcol centertext'>[[Ferox]] &#9642; [[Drake]] &#9642; [[Naga]]</th>
@@ Line 440: / Line 440: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Battleships</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Battleships]]</span></th>
        <th class='racialcol centertext'>[[Armageddon]] &#9642; [[Apocalypse]] &#9642; [[Abaddon]] </th>
        <th class='racialcol centertext'>[[Scorpion]] &#9642; [[Raven]] &#9642; [[Rokh]]</th>
@@ Line 480: / Line 480: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Carriers</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Carriers]]</span></th>
        <th class='racialcol centertext'>[[Archon]]</th>
        <th class='racialcol centertext'>[[Chimera]]</th>
@@ Line 504: / Line 504: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Dreadnoughts</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Dreadnoughts]]</span></th>
        <th class='racialcol centertext'>[[Revelation]]</th>
        <th class='racialcol centertext'>[[Phoenix]]</th>
@@ Line 532: / Line 532: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Force Auxiliaries</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Force Auxiliaries]]</span></th>
        <th class='racialcol centertext'>[[Apostle]]</th>
        <th class='racialcol centertext'>[[Minokawa]]</th>
@@ Line 544: / Line 544: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Titans</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Titans]]</span></th>
        <th class='racialcol centertext'>[[Avatar]]</th>
        <th class='racialcol centertext'>[[Leviathan]]</th>
@@ Line 560: / Line 560: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Freighters</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Freighters]]</span></th>
        <th class='racialcol centertext'>[[Providence]]</th>
        <th class='racialcol centertext'>[[Charon]]</th>
@@ Line 584: / Line 584: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Haulers</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Haulers]]</span></th>
        <th class='racialcol centertext'>[[Bestower]] &#9642; [[Sigil]]</th>
        <th class='racialcol centertext'>[[Badger]] &#9642; [[Tayra]]</th>
@@ Line 604: / Line 604: @@
       <tr class='primary'>
-       <th class='firstcol groupheader'><span class='textlabel'>Shuttles</span></th>
+       <th class='firstcol groupheader'><span class='textlabel'>[[Shuttles]]</span></th>
        <th class='racialcol centertext'>[[Amarr Shuttle]]</th>
        <th class='racialcol centertext'>[[Caldari Shuttle]]</th>
@@ Line 629: / Line 629: @@
       </tr>
-      <tr class='even'>
+      <tr class='highlight'>
+      <td class='groupheader firstindent'>Navy Faction Frigates</td>
+      <td class='piratecol centertext'>[[Venture Consortium Issue]]</td>
+     </tr>
+     <tr class='odd'>
        <td class='groupheader secondindent'>Expedition Frigates</td>
        <td class='piratecol centertext'>[[Prospect]] &#9642; [[Endurance]]</td>
+     </tr>
+     <tr class='primary'>
+      <td class='firstcol groupheader firstindent'>Destroyers</td>
+      <td class='piratecol centertext'>[[Pioneer]]</td>
+     </tr>
+     <tr class='highlight'>
+      <td class='groupheader firstindent'>Navy Faction Destroyers</td>
+      <td class='piratecol centertext'>[[Pioneer Consortium Issue]]</td>
+     </tr>
+     <tr class='even'>
+      <td class='groupheader secondindent'>Command Destroyers</td>
+      <td class='piratecol centertext'>[[Outrider]]</td>
       </tr>
@@ Line 676: / Line 696: @@
        <th class='piratecol noshowexplain'><div class='img'>[[Image:Isis_angel.png|center|20x20px|link=]]</div>Angel Cartel</th>
        <th class='piratecol noshowexplain'><div class='img'>[[Image:Isis_blood_raiders.png|center|20x20px|link=]]</div>Blood Raiders</th>
+      <th class='piratecol noshowexplain'><div class='img'>[[Image:Logo faction deathless circle.png|center|20x20px|link=]]</div>Deathless Circle</th>
        <th class='piratecol noshowexplain'><div class='img'>[[Image:Isis_guristas.png|center|20x20px|link=]]</div>Guristas</th>
        <th class='piratecol noshowexplain'><div class='img'>[[Image:Isis_mordus.png|center|20x20px|link=]]</div>Mordu's Legion</th>
@@ Line 687: / Line 708: @@
        <td class='piratecol centertext'>[[Dramiel]]</td>
        <td class='piratecol centertext'>[[Cruor]]</td>
+      <td class='piratecol centertext'></td>
        <td class='piratecol centertext'>[[Worm]]</td>
        <td class='piratecol centertext'>[[Garmur]]</td>
@@ Line 693: / Line 715: @@
        <td class='piratecol centertext'>[[Astero]]</td>
       </tr>
+     <tr class='primary'>
+      <td class='firstcol groupheader firstindent'>Destroyers</td>
+      <td class='piratecol centertext'>[[Mekubal]]</td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'>[[Tholos]]</td>
+      <td class='piratecol centertext'>[[Mamba]]</td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+    </tr>
       <tr class='primary'>
@@ Line 698: / Line 732: @@
        <td class='piratecol centertext'>[[Cynabal]]</td>
        <td class='piratecol centertext'>[[Ashimmu]]</td>
+      <td class='piratecol centertext'></td>
        <td class='piratecol centertext'>[[Gila]]</td>
        <td class='piratecol centertext'>[[Orthrus]]</td>
@@ Line 703: / Line 738: @@
        <td class='piratecol centertext'>[[Vigilant]]</td>
        <td class='piratecol centertext'>[[Stratios]]</td>
+     </tr>
+     <tr class='primary'>
+      <td class='firstcol groupheader firstindent'>Battlecruisers</td>
+      <td class='piratecol centertext'>[[Khizriel]]</td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'>[[Cenotaph]]</td>
+      <td class='piratecol centertext'>[[Alligator]]</td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+     </tr>
+     <tr class='odd'>
+      <td class='firstcol groupheader secondindent'>Expedition Command Ships</td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'></td>
+      <td class='piratecol centertext'>[[Odysseus]]</td>
       </tr>
@@ Line 709: / Line 768: @@
        <td class='piratecol centertext'>[[Machariel]]</td>
        <td class='piratecol centertext'>[[Bhaalgorn]]</td>
+      <td class='piratecol centertext'></td>
        <td class='piratecol centertext'>[[Rattlesnake]]</td>
        <td class='piratecol centertext'>[[Barghest]]</td>
@@ Line 718: / Line 778: @@
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Dreadnoughts</td>
+      <td class='piratecol centertext'>[[Sarathiel]]</td>
+      <td class='piratecol centertext'>[[Chemosh]]</td>
        <td class='piratecol centertext'></td>
-      <td class='piratecol centertext'>[[Chemosh]]</td>
        <td class='piratecol centertext'>[[Caiman]]</td>
        <td class='piratecol centertext'></td>
@@ Line 729: / Line 790: @@
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Carriers</td>
+      <td class='piratecol centertext'></td>
        <td class='piratecol centertext'></td>
        <td class='piratecol centertext'></td>
@@ Line 740: / Line 802: @@
       <tr class='even'>
        <td class='groupheader secondindent'>Supercarriers</td>
+      <td class='piratecol centertext'></td>
        <td class='piratecol centertext'></td>
        <td class='piratecol centertext'></td>
@@ Line 753: / Line 816: @@
        <td class='piratecol centertext'></td>
        <td class='piratecol centertext'>[[Dagon]]</td>
+      <td class='piratecol centertext'></td>
        <td class='piratecol centertext'>[[Loggerhead]]</td>
        <td class='piratecol centertext'></td>
@@ Line 762: / Line 826: @@
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Titans</td>
+      <td class='piratecol centertext'>[[Azariel]]</td>
+      <td class='piratecol centertext'>[[Molok]]</td>
        <td class='piratecol centertext'></td>
-      <td class='piratecol centertext'>[[Molok]]</td>
        <td class='piratecol centertext'>[[Komodo]]</td>
        <td class='piratecol centertext'></td>
@@ Line 785: / Line 850: @@
        <th class='othercol noshowexplain'><div class='img'>[[Image:Logo_faction_the_society.png|center|20x20px|link=]]</div>Society of Conscious Thought</th>
        <th class='othercol noshowexplain'><div class='img'>[[Image:Isis_triglavian.png|center|20x20px|link=]]</div>Triglavian Collective</th>
+      <th class='othercol noshowexplain'><div class='img'>[[Image:Upwell_Consortium_logo.png|center|20x20px|link=]]</div>Upwell Consortium</th>
       </tr>
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Frigates</td>
-       <td class='piratecol centertext'> [[Echelon]] </td>
+       <td class='centertext'> [[Echelon]] </td>
-       <td class='piratecol centertext'>[[Skybreaker]]</td>
+       <td class='centertext'>[[Skybreaker]]</td>
-       <td class='piratecol centertext'> [[Metamorphosis]] </td>
+       <td class='centertext'> [[Metamorphosis]] </td>
-       <td class='piratecol centertext'>[[Damavik]]</td>
+       <td class='centertext'>[[Damavik]]</td>
+      <td class='centertext'></td>
       </tr>
       <tr class='even'>
        <td class='firstcol groupheader secondindent'>Assault Frigates</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'>[[Nergal]]</td>
+       <td class='centertext'>[[Nergal]]</td>
+      <td class='centertext'></td>
       </tr>
       <tr class='odd'>
        <td class='firstcol groupheader secondindent'>Covert Ops</td>
-       <td class='piratecol centertext'>[[Pacifier]]</td>
+       <td class='centertext'>[[Pacifier]]</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
+      <td class='centertext'></td>
       </tr>
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Destroyers</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'>[[Sunesis]]</td>
+       <td class='centertext'>[[Sunesis]]</td>
-       <td class='piratecol centertext'>[[Kikimora]]</td>
+       <td class='centertext'>[[Kikimora]]</td>
+      <td class='centertext'></td>
       </tr>
       <tr class='even'>
        <td class='firstcol groupheader secondindent'>Command Destroyers</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'>[[Draugur]]</td>
+       <td class='centertext'>[[Draugur]]</td>
+      <td class='centertext'></td>
       </tr>
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Cruisers</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'>[[Stormbringer]]</td>
+       <td class='centertext'>[[Stormbringer]]</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'>[[Rodiva]] &#9642; [[Vedmak]]</td>
+       <td class='centertext'>[[Rodiva]] &#9642; [[Vedmak]]</td>
+      <td class='centertext'></td>
       </tr>
       <tr class='even'>
        <td class='firstcol groupheader secondindent'>Flag Cruisers</td>
-       <td class='piratecol centertext'>[[Monitor]]</td>
+       <td class='centertext'>[[Monitor]]</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
+      <td class='centertext'></td>
       </tr>
       <tr class='odd'>
        <td class='firstcol groupheader secondindent'>Heavy Assault Cruisers</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'>[[Ikitursa]]</td>
+       <td class='centertext'>[[Ikitursa]]</td>
+      <td class='centertext'></td>
       </tr>
       <tr class='even'>
        <td class='firstcol groupheader secondindent'>Logistics Cruisers</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'>[[Zarmazd]]</td>
+       <td class='centertext'>[[Zarmazd]]</td>
+      <td class='centertext'></td>
       </tr>
       <tr class='odd'>
        <td class='firstcol groupheader secondindent'>Recon Ships</td>
-       <td class='piratecol centertext'>[[Enforcer]]</td>
+       <td class='centertext'>[[Enforcer]]</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
+      <td class='centertext'></td>
       </tr>
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Battlecruisers</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'>[[Gnosis]]</td>
+       <td class='centertext'>[[Gnosis]]</td>
-       <td class='piratecol centertext'>[[Drekavac]]</td>
+       <td class='centertext'>[[Drekavac]]</td>
+      <td class='centertext'></td>
       </tr>
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Battleships</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'>[[Thunderchild]]</td>
+       <td class='centertext'>[[Thunderchild]]</td>
-       <td class='piratecol centertext'>[[Praxis]]</td>
+       <td class='centertext'>[[Praxis]]</td>
-       <td class='piratecol centertext'>[[Leshak]]</td>
+       <td class='centertext'>[[Leshak]]</td>
+      <td class='centertext'></td>
       </tr>
       <tr class='even'>
        <td class='firstcol groupheader secondindent'>Black Ops</td>
-       <td class='piratecol centertext'>[[Marshal]]</td>
+       <td class='centertext'>[[Marshal]]</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
+      <td class='centertext'></td>
+     </tr>
+     <tr class='even'>
+      <td class='firstcol groupheader secondindent'>Marauders</td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'>[[Babaroga]]</td>
+      <td class='centertext'></td>
       </tr>
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Dreadnoughts</td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'>[[Zirnitra]]</td>
+       <td class='centertext'>[[Zirnitra]]</td>
+      <td class='centertext'></td>
+     </tr>
+     <tr class='primary'>
+      <td class='firstcol groupheader firstindent'>Freighters</td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'> [[Avalanche]] </td>
+     </tr>
+     <tr class='primary'>
+      <td class='firstcol groupheader firstindent'>Haulers</td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'> [[Squall]] </td>
+     </tr>
+     <tr class='even'>
+      <td class='firstcol groupheader secondindent'>Transport Ships</td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'></td>
+      <td class='centertext'> [[Deluge]] &#9642; [[Torrent]] </td>
       </tr>
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Shuttles</td>
-       <td class='piratecol centertext'> [[Council Diplomatic Shuttle]] </td>
+       <td class='centertext'> [[Council Diplomatic Shuttle]] </td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
-       <td class='piratecol centertext'> [[Apotheosis]] </td>
+       <td class='centertext'> [[Apotheosis]] </td>
-       <td class='piratecol centertext'></td>
+       <td class='centertext'></td>
+      <td class='centertext'></td>
       </tr>
@@ Line 937: / Line 1,054: @@
       <tr class='odd'>
        <td class='groupheader secondindent'>Covert Ops</td>
-       <td class='racialcol centertext'>{{Sh|Caedes}} &#9642; {{Sh|Chremoas}} &#9642; {{Sh|Hydra}} &#9642; {{Sh|Virtuoso}}</td>
+       <td class='racialcol centertext'>{{Sh|Caedes}} &#9642; {{Sh|Chremoas}} &#9642; {{Sh|Hydra}} &#9642; {{Sh|Sidewinder}} &#9642; {{Sh|Virtuoso}}</td>
       </tr>
@@ Line 977: / Line 1,094: @@
       <tr class='odd'>
        <td class='groupheader secondindent'>Recon Ships</td>
-       <td class='racialcol centertext'>{{Sh|Chameleon}} &#9642; {{Sh|Moracha}} &#9642; {{Sh|Victor}} &#9642; {{Sh|Tiamat}}</td>
+       <td class='racialcol centertext'>{{Sh|Chameleon}} &#9642; {{Sh|Cobra}} &#9642; {{Sh|Moracha}} &#9642; {{Sh|Victor}} &#9642; {{Sh|Tiamat}}</td>
       </tr>
@@ Line 983: / Line 1,100: @@
        <td class='firstcol groupheader firstindent'>Battleships</td>
        <td class='widecol centertext'>{{Sh|Apocalypse Imperial Issue}} &#9642; {{Sh|Armageddon Imperial Issue}} &#9642; {{Sh|Megathron Federate Issue}} &#9642; {{Sh|Rattlesnake Victory Edition}} &#9642; {{Sh|Raven State Issue}} &#9642; {{Sh|Scorpion Ishukone Watch}} &#9642; {{Sh|Tempest Tribal Issue}}</td>
+     </tr>
+     <tr class='odd'>
+      <td class='groupheader secondindent'>Black Ops</td>
+      <td class='racialcol centertext'>{{Sh|Python}}</td>
       </tr>
@@ Line 992: / Line 1,114: @@
       <tr class='primary'>
        <td class='firstcol groupheader firstindent'>Shuttles</td>
-       <td class='widecol centertext'> {{Sh|Boobook}} &#9642; {{Sh|Civilian Caldari Shuttle}} &#9642; {{Sh|Goru's Shuttle}} &#9642; {{Sh|Guristas Shuttle}} &#9642; {{Sh|InterBus Shuttle}} &#9642; {{Sh|Leopard}}</td>
+       <td class='widecol centertext'> {{Sh|Boobook}} &#9642; {{Sh|Civilian Amarr Shuttle}} &#9642; {{Sh|Civilian Caldari Shuttle}} &#9642; {{Sh|Civilian Gallente Shuttle}} &#9642; {{Sh|Civilian Minmatar Shuttle}} &#9642; {{Sh|Goru's Shuttle}} &#9642; {{Sh|Guristas Shuttle}} &#9642; {{Sh|InterBus Shuttle}} &#9642; {{Sh|Leopard}}</td>
       </tr>