EVE ships: Difference between revisions

Line 19:

color:white;

}

.ships-matrix tr.firstprimary

.ships-matrix tr.firstprimary, .ships-matrix tr.secondprimary

{

background-color: black;

}

.ships-matrix .firstprimary th

.ships-matrix .firstprimary th, .ships-matrix .secondprimary th

{

border-bottom: 1px solid #2D2413;

Line 46:

background-color: #222222;

}

.ships-matrix .primary .collapseButton

.ships-matrix .primary .collapseButton, .ships-matrix .special .collapseButton, .ships-matrix .secondprimary .collapseButton

{

color: transparent;

Line 53:

padding: 0;

}

.ships-matrix .primary .collapseButton a

.ships-matrix .primary .collapseButton a, .ships-matrix .special .collapseButton a, .ships-matrix .secondprimary .collapseButton a

{

background-color: transparent;

Line 89:

.ships-matrix .firstcol{ width:16%; }

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

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

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

.ships-matrix .centertext{ color: gray; text-align: center; }

.ships-matrix .racialcol .img

.ships-matrix .racialcol .img, .ships-matrix .piratecol .img

{

display: inline-block;

Line 108:

Line 110:

z-index: 25;

}

.ships-matrix .primary .firstcol, .ships-matrix .primary .racialcol,

.ships-matrix .primary .firstcol, .ships-matrix .primary .racialcol, .ships-matrix .primary .piratecol, .ships-matrix .primary .widecol,

.ships-matrix .special .firstcol, .ships-matrix .special .racialcol

.ships-matrix .special .firstcol, .ships-matrix .special .racialcol, .ships-matrix .special .piratecol, .ships-matrix .special .widecol

{

border-bottom: 1px solid black;

Line 125:

Line 127:

<th class='firstcol showexplain'>~~click '~~show~~' for~~ advanced ships</th>

<th class='firstcol showexplain'>show advanced ships</th>

<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_amarr_empire.png|center|20x20px]]</div>Amarr</th>

<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_caldari_state.png|center|20x20px]]</div>Caldari</th>

Line 133:

Line 135:

<tr>

<th class='firstcol groupheader'><span class='textlabel'>Rookie Ships</span></th>

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

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

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

</tr>

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

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

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

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

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

<th class='racialcol centertext'>~~[[Velator]] ▪~~ [[Atron]] ▪ [[Navitas]] ▪ [[Tristan]] ▪ [[Maulus]] ▪ [[Incursus]] ▪ [[Imicus]]</th>

<th class='racialcol centertext'>[[Atron]] ▪ [[Navitas]] ▪ [[Tristan]] ▪ [[Maulus]] ▪ [[Incursus]] ▪ [[Imicus]]</th>

<th class='racialcol centertext'>~~[[Reaper]] ▪~~ [[Slasher]] ▪ [[Burst]] ▪ [[Breacher]] ▪ [[Vigil]] ▪ [[Rifter]] ▪ [[Probe]]</th>

<th class='racialcol centertext'>[[Slasher]] ▪ [[Burst]] ▪ [[Breacher]] ▪ [[Vigil]] ▪ [[Rifter]] ▪ [[Probe]]</th>

</tr>

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

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

<td class='centertext'>[[Imperial Navy Slicer~~]] ▪ [[Gold Magnate]] ▪ [[Silver Magnate]] ▪ [[Malice~~]]</td>

<td class='centertext'>[[Imperial Navy Slicer]]</td>

<td class='centertext'>[[Caldari Navy Hookbill~~]] ▪ [[Cambion~~]]</td>

<td class='centertext'>[[Caldari Navy Hookbill]]</td>

<td class='centertext'>[[Federation Navy Comet~~]] ▪ [[Utu~~]]</td>

<td class='centertext'>[[Federation Navy Comet]]</td>

<td class='centertext'>[[Republic Fleet Firetail~~]] ▪ [[Freki~~]]</td>

<td class='centertext'>[[Republic Fleet Firetail]]</td>

</tr>

<td class='groupheader secondindent'>Assault ~~Ships~~</td>

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

<td class='centertext'>[[Vengeance]] ▪ [[Retribution]]</td>

<td class='centertext'>[[Hawk]] ▪ [[Harpy]]</td>

Line 176:

Line 186:

<td class='centertext'>[[Claw]] ▪ [[Stiletto]]</td>

</tr>

~~</table>~~

~~<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>~~

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

Line 192:

Line 201:

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

</tr>

</~~table~~>

<~~table~~ class='~~collapsible collapsed~~' ~~cellspacing~~='0' ~~cellpadding~~='0'>

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

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

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

</tr>

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

Line 202:

Line 217:

</tr>

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

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

<td class='centertext'>~~[[Vangel]] ▪~~ [[Augoror Navy Issue]] ▪ [[Omen Navy Issue]]</td>

<td class='centertext'>[[Augoror Navy Issue]] ▪ [[Omen Navy Issue]]</td>

<td class='centertext'>~~[[Etana]] ▪~~ [[Caracal Navy Issue]] ▪ [[Osprey Navy Issue]]</td>

<td class='centertext'>[[Caracal Navy Issue]] ▪ [[Osprey Navy Issue]]</td>

<td class='centertext'>~~[[Adrestia]] ▪ [[Guardian-Vexor]] ▪~~ [[Exequror Navy Issue]] ▪ [[Vexor Navy Issue]]</td>

<td class='centertext'>[[Exequror Navy Issue]] ▪ [[Vexor Navy Issue]]</td>

<td class='centertext'>~~[[Mimir]] ▪~~ [[Scythe Fleet Issue]] ▪ [[Stabber Fleet Issue]]</td>

<td class='centertext'>[[Scythe Fleet Issue]] ▪ [[Stabber Fleet Issue]]</td>

</tr>

<td class='groupheader secondindent'>Heavy Assault ~~Ships~~</td>

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

<td class='centertext'>[[Zealot]] ▪ [[Sacrilege]]</td>

<td class='centertext'>[[Eagle]] ▪ [[Cerberus]]</td>

Line 216:

Line 231:

</tr>

<td class='groupheader secondindent'>Heavy ~~Interdictors~~</td>

<td class='groupheader secondindent'>Heavy Interdiction Cruisers</td>

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

Line 243:

Line 258:

</tr>

~~</table>~~

~~<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>~~

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

Line 251:

Line 265:

<th class='racialcol centertext'>[[Brutix]] ▪ [[Myrmidon]] ▪ [[Talos]]</th>

<th class='racialcol centertext'>[[Hurricane]] ▪ [[Cyclone]] ▪ [[Tornado]]</th>

</tr>

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

<td class='centertext'>[[Harbinger Navy Issue]]</td>

<td class='centertext'>[[Drake Navy Issue]]</td>

<td class='centertext'>[[Brutix Navy Issue]]</td>

<td class='centertext'>[[Hurricane Fleet Issue]]</td>

</tr>

Line 259:

Line 280:

<td class='centertext'>[[Claymore]] ▪ [[Sleipnir]]</td>

</tr>

~~</table>~~

~~<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>~~

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

Line 269:

Line 289:

</tr>

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

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

<td class='centertext'>[[Apocalypse Navy Issue]] ▪ [[Armageddon Navy ~~Issue]] ▪ [[Apocalypse Imperial Issue]] ▪ [[Armageddon Imperial~~ Issue]]</td>

<td class='centertext'>[[Apocalypse Navy Issue]] ▪ [[Armageddon Navy Issue]]</td>

<td class='centertext'>[[Scorpion Navy Issue]] ▪ [[Raven Navy Issue]]</td>

<td class='centertext'>[[Megathron Navy Issue]] ▪ [[Dominix Navy Issue]]</td>

Line 286:

Line 306:

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

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

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

<td class='centertext'>[[Kronos (Ship)|Kronos]]</td>

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

</tr>

~~</table>~~

~~<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>~~

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

Line 299:

Line 318:

</tr>

<td class='groupheader secondindent'>~~Supercarrier~~</td>

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

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

Line 323:

Line 342:

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

</tr>

~~</table>~~

~~<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>~~

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

Line 339:

Line 357:

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

</tr>

~~</table>~~

~~<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>~~

<th class='firstcol groupheader'><span class='textlabel'>Standard Industrial Ships</span></th>

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

<th class='racialcol centertext'>[[Badger]] ▪ [[~~Badger Mark II~~]]</th>

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

<th class='racialcol centertext'>[[~~Iteron~~]] ▪ [[~~Iteron Mark II~~]] ▪ [[~~Iteron Mark III~~]] ▪ [[~~Iteron Mark IV~~]] ▪ [[Iteron Mark V]]</th>

<th class='racialcol centertext'>[[Nereus]] ▪ [[Kryos]] ▪ [[Epithal]] ▪ [[Miasmos]] ▪ [[Iteron Mark V]]</th>

<th class='racialcol centertext'>[[Hoarder]] ▪ [[Mammoth]] ▪ [[Wreathe]]</th>

</tr>

Line 359:

Line 376:

<th class='~~racialcol~~ centertext~~' colspan='4' style='width:84%~~'>[[~~Orca~~]] ▪ [[~~Primae~~]] ▪ [[~~Noctis~~]] ▪ [[~~Covetor~~]] ▪ [[~~Retriever~~]] ▪ [[~~Procurer~~]] ▪ [[~~Hulk~~]] ▪ [[~~Skiff~~]] ▪ [[~~Mackinaw~~]] ▪ [[~~Rorqual~~]] ▪ [[~~Venture~~]] ▪ [[~~Prospect~~]]</th>

<th class='widecol centertext'>[[Venture]] ▪ [[Prospect]] ▪ [[Covetor]] ▪ [[Retriever]] ▪ [[Procurer]] ▪ [[Hulk]] ▪ [[Skiff]] ▪ [[Mackinaw]] ▪ [[Noctis]] ▪ [[Orca]] ▪ [[Bowhead]] ▪ [[Rorqual]]</th>

</tr>

</table>

<th class='firstcol groupheader'><span class='textlabel'>Pirate Faction Ships</span></th>

<th class='~~racialcol centertext~~' ~~colspan~~='4' ~~style~~='~~width~~:~~84%~~'>[[~~Succubus~~]] ~~▪~~ [[~~Phantasm~~]] ~~▪~~ [[~~Nightmare~~]] ~~▪~~ [[Cruor]] ~~▪~~ [[~~Ashimmu~~]] ~~▪~~ [[~~Bhaalgorn~~]] ~~▪~~ [[~~Worm~~]] ~~▪~~ [[Gila]] ~~▪~~ [[~~Rattlesnake~~]] ~~▪~~ [[~~Daredevil~~]] ~~▪~~ [[Vigilant]] ~~▪~~[[~~Vindicator~~]] ~~▪~~ [[~~Dramiel~~]] ~~▪~~ [[~~Cynabal~~]] ~~▪~~ [[~~Machariel~~]] ~~▪~~ [[Revenant]]</th>

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

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

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

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

<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_sanshas_nation.png|center|20x20px]]</div>Sansha's Nation</th>

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

<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo faction sisters of eve.png|center|20x20px]]</div>Sisters of EVE</th>

</tr>

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

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

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

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

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

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

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

</tr>

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

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

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

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

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

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

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

</tr>

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

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

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

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

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

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

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

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

</tr>

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

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

</tr>

</table>

<th class='firstcol groupheader'><span class='textlabel'>~~Unique~~ Ships</span></th>

<th class='firstcol groupheader'><span class='textlabel'>Special Edition Ships</span></th>

<th class='racialcol centertext' ~~colspan~~='4' ~~style~~='~~width:84%~~'>[[~~Echelon~~]] ▪ [[~~Scorpion Ishukone Watch~~]] ▪ [[~~Goru~~'~~s Shuttle~~]] ▪ [[~~Guristas Shuttle~~]] ▪ [[~~Raven State~~ Issue]] ▪ [[~~Opux Luxury Yacht~~]] ▪ [[Megathron Federate Issue]] ▪ [[~~Interbus Shuttle~~]] ▪ [[~~Zephyr~~]] ▪ [[~~Tempest Tribal Issue~~]] ▪ [[~~Apotheosis~~]]</th>

</tr>

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

<td class='widecol centertext'>[[Apotheosis]] ▪ [[Interbus Shuttle]] ▪ [[Leopard]]</td>

</tr>

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

<td class='widecol centertext'>[[Echelon]] ▪ [[Echo]] ▪ [[Hematos]] ▪ [[Immolator]] ▪ [[Taipan]] ▪ [[Violator]] ▪ [[Zephyr]] ▪ [[Gold Magnate]] ▪ [[Inner Zone Shipping Imicus]] ▪ [[Sarum Magnate]] ▪ [[Silver Magnate]] ▪ [[Sukuuvestaa Heron]] ▪ [[Tash-Murkon Magnate]] ▪ [[Vherokior Probe]]</td>

</tr>

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

<td class='widecol centertext'>[[Cambion]] ▪ [[Freki]] ▪ [[Malice]] ▪ [[Utu]]</td>

</tr>

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

<td class='racialcol centertext'>[[Chremoas]]</td>

</tr>

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

<td class='widecol centertext'>[[Whiptail]]</td>

</tr>

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

<td class='widecol centertext'>[[Aliastra Catalyst]] ▪ [[Inner Zone Shipping Catalyst]] ▪ [[Intaki Syndicate Catalyst]] ▪ [[InterBus Catalyst]] ▪ [[Nefantar Thrasher]] ▪ [[Quafe Catalyst]]</td>

</tr>

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

<td class='widecol centertext'>[[Guardian-Vexor]]</td>

</tr>

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

<td class='widecol centertext'>[[Adrestia]] ▪ [[Mimir]] ▪ [[Vangel]]</td>

</tr>

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

<td class='widecol centertext'>[[Etana]]</td>

</tr>

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

<td class='racialcol centertext'>[[Chameleon]] ▪ [[Moracha]]</td>

</tr>

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

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

</tr>

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

<td class='widecol centertext'>[[Scorpion Ishukone Watch]] ▪ [[Apocalypse Imperial Issue]] ▪ [[Armageddon Imperial Issue]] ▪ [[Raven State Issue]] ▪ [[Megathron Federate Issue]] ▪ [[Tempest Tribal Issue]]</td>

</tr>

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

<td class='widecol centertext'>[[Primae]] ▪ [[Miasmos Amastris Edition]] ▪ [[Miasmos Quafe Ultra Edition]] ▪ [[Miasmos Quafe Ultramarine Edition]]</td>

</tr>

</table>

@@ Line 19: / Line 19: @@
 		color:white;
 	}
-	.ships-matrix tr.firstprimary
+	.ships-matrix tr.firstprimary, .ships-matrix tr.secondprimary
 	{
 		background-color: black;
 	}
-	.ships-matrix .firstprimary th
+	.ships-matrix .firstprimary th, .ships-matrix .secondprimary th
 	{
 		border-bottom: 1px solid #2D2413;
@@ Line 46: / Line 46: @@
 		background-color: #222222;
 	}
-	.ships-matrix .primary .collapseButton
+	.ships-matrix .primary .collapseButton, .ships-matrix .special .collapseButton, .ships-matrix .secondprimary .collapseButton
 	{
 		color: transparent;
@@ Line 53: / Line 53: @@
 		padding: 0;
 	}
-	.ships-matrix .primary .collapseButton a
+	.ships-matrix .primary .collapseButton a, .ships-matrix .special .collapseButton a, .ships-matrix .secondprimary .collapseButton a
 	{
 		background-color: transparent;
@@ Line 89: / Line 89: @@
 	.ships-matrix .firstcol{ width:16%; }
-	.ships-matrix .racialcol{ width:21%;  }
+	.ships-matrix .racialcol{ width:21%; }
+	.ships-matrix .piratecol{ width:12%; }
+	.ships-matrix .widecol{ width:84%; }
 	.ships-matrix .centertext{ color: gray; text-align: center; }
-	.ships-matrix .racialcol .img
+	.ships-matrix .racialcol .img, .ships-matrix .piratecol .img
 	{
 		display: inline-block;
@@ Line 108: / Line 110: @@
 		z-index: 25;
 	}
-	.ships-matrix .primary .firstcol, .ships-matrix .primary .racialcol,
+	.ships-matrix .primary .firstcol, .ships-matrix .primary .racialcol, .ships-matrix .primary .piratecol, .ships-matrix .primary .widecol,
-	.ships-matrix .special .firstcol, .ships-matrix .special .racialcol
+	.ships-matrix .special .firstcol, .ships-matrix .special .racialcol, .ships-matrix .special .piratecol, .ships-matrix .special .widecol
 	{
 		border-bottom: 1px solid black;
@@ Line 125: / Line 127: @@
 	<table cellspacing='0' cellpadding='0'>
 		<tr class='firstprimary'>
-			<th class='firstcol showexplain'>click 'show' for advanced ships</th>
+			<th class='firstcol showexplain'>show advanced ships</th>
 			<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_amarr_empire.png|center|20x20px]]</div>Amarr</th>
 			<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_caldari_state.png|center|20x20px]]</div>Caldari</th>
@@ Line 133: / Line 135: @@
 		<tr>
 			<td colspan='5' style='padding:0'>
-				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
+				<table cellspacing='0' cellpadding='0'>
+					<tr class='primary'>
+						<th class='firstcol groupheader'><span class='textlabel'>Rookie Ships</span></th>
+						<th class='racialcol centertext'>[[Impairor]]</th>
+						<th class='racialcol centertext'>[[Ibis]]</th>
+						<th class='racialcol centertext'>[[Velator]]</th>
+						<th class='racialcol centertext'>[[Reaper]]</th>
+					</tr>
 					<tr class='primary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Frigates</span></th>
-						<th class='racialcol centertext'>[[Impairor]] &#9642; [[Executioner]] &#9642; [[Tormentor]] &#9642; [[Inquisitor]] &#9642; [[Crucifier]] &#9642; [[Punisher]] &#9642; [[Magnate]]</th>
+						<th class='racialcol centertext'>[[Executioner]] &#9642; [[Inquisitor]] &#9642; [[Tormentor]] &#9642; [[Crucifier]] &#9642; [[Punisher]] &#9642; [[Magnate]]</th>
-						<th class='racialcol centertext'>[[Ibis]] &#9642; [[Condor]] &#9642; [[Bantam]] &#9642; [[Kestrel]] &#9642; [[Griffin]] &#9642; [[Merlin]] &#9642; [[Heron]]</th>
+						<th class='racialcol centertext'>[[Condor]] &#9642; [[Bantam]] &#9642; [[Kestrel]] &#9642; [[Griffin]] &#9642; [[Merlin]] &#9642; [[Heron]]</th>
-						<th class='racialcol centertext'>[[Velator]] &#9642; [[Atron]] &#9642; [[Navitas]] &#9642; [[Tristan]] &#9642; [[Maulus]] &#9642; [[Incursus]] &#9642; [[Imicus]]</th>
+						<th class='racialcol centertext'>[[Atron]] &#9642; [[Navitas]] &#9642; [[Tristan]] &#9642; [[Maulus]] &#9642; [[Incursus]] &#9642; [[Imicus]]</th>
-						<th class='racialcol centertext'>[[Reaper]] &#9642; [[Slasher]] &#9642; [[Burst]] &#9642; [[Breacher]] &#9642; [[Vigil]] &#9642; [[Rifter]] &#9642; [[Probe]]</th>
+						<th class='racialcol centertext'>[[Slasher]] &#9642; [[Burst]] &#9642; [[Breacher]] &#9642; [[Vigil]] &#9642; [[Rifter]] &#9642; [[Probe]]</th>
 					</tr>
 					<tr class='highlight'>
-						<td class='groupheader firstindent'>Faction Frigates</td>
+						<td class='groupheader firstindent'>Navy Faction Frigates</td>
-						<td class='centertext'>[[Imperial Navy Slicer]] &#9642; [[Gold Magnate]] &#9642; [[Silver Magnate]] &#9642; [[Malice]]</td>
+						<td class='centertext'>[[Imperial Navy Slicer]]</td>
-						<td class='centertext'>[[Caldari Navy Hookbill]] &#9642; [[Cambion]]</td>
+						<td class='centertext'>[[Caldari Navy Hookbill]]</td>
-						<td class='centertext'>[[Federation Navy Comet]] &#9642; [[Utu]]</td>
+						<td class='centertext'>[[Federation Navy Comet]]</td>
-						<td class='centertext'>[[Republic Fleet Firetail]] &#9642; [[Freki]]</td>
+						<td class='centertext'>[[Republic Fleet Firetail]]</td>
 					</tr>
 					<tr class='odd'>
-						<td class='groupheader secondindent'>Assault Ships</td>
+						<td class='groupheader secondindent'>Assault Frigates</td>
 						<td class='centertext'>[[Vengeance]] &#9642; [[Retribution]]</td>
 						<td class='centertext'>[[Hawk]] &#9642; [[Harpy]]</td>
@@ Line 176: / Line 186: @@
 						<td class='centertext'>[[Claw]] &#9642; [[Stiletto]]</td>
 					</tr>
-				</table>
-				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
 					<tr class='primary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Destroyers</span></th>
@@ Line 192: / Line 201: @@
 						<td class='centertext'>[[Sabre]]</td>
 					</tr>
-				</table>
+					<tr class='highlight'>
-				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
+						<td class='groupheader firstindent'>Tactical Destroyers</td>
+						<td class='centertext'>[[Confessor]]</td>
+						<td class='centertext'>[[TBA]]</td>
+						<td class='centertext'>[[TBA]]</td>
+						<td class='centertext'>[[Svipul]]</td>
+					</tr>
 					<tr class='primary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Cruisers</span></th>
@@ Line 202: / Line 217: @@
 					</tr>
 					<tr class='highlight'>
-						<td class='groupheader firstindent'>Faction Cruisers</td>
+						<td class='groupheader firstindent'>Navy Faction Cruisers</td>
-						<td class='centertext'>[[Vangel]] &#9642; [[Augoror Navy Issue]] &#9642; [[Omen Navy Issue]]</td>
+						<td class='centertext'>[[Augoror Navy Issue]] &#9642; [[Omen Navy Issue]]</td>
-						<td class='centertext'>[[Etana]] &#9642; [[Caracal Navy Issue]] &#9642; [[Osprey Navy Issue]]</td>
+						<td class='centertext'>[[Caracal Navy Issue]] &#9642; [[Osprey Navy Issue]]</td>
-						<td class='centertext'>[[Adrestia]] &#9642; [[Guardian-Vexor]] &#9642; [[Exequror Navy Issue]] &#9642; [[Vexor Navy Issue]]</td>
+						<td class='centertext'>[[Exequror Navy Issue]] &#9642; [[Vexor Navy Issue]]</td>
-						<td class='centertext'>[[Mimir]] &#9642; [[Scythe Fleet Issue]] &#9642; [[Stabber Fleet Issue]]</td>
+						<td class='centertext'>[[Scythe Fleet Issue]] &#9642; [[Stabber Fleet Issue]]</td>
 					</tr>
 					<tr class='odd'>
-						<td class='groupheader secondindent'>Heavy Assault Ships</td>
+						<td class='groupheader secondindent'>Heavy Assault Cruisers</td>
 						<td class='centertext'>[[Zealot]] &#9642; [[Sacrilege]]</td>
 						<td class='centertext'>[[Eagle]] &#9642; [[Cerberus]]</td>
@@ Line 216: / Line 231: @@
 					</tr>
 					<tr class='even'>
-						<td class='groupheader secondindent'>Heavy Interdictors</td>
+						<td class='groupheader secondindent'>Heavy Interdiction Cruisers</td>
 						<td class='centertext'>[[Devoter]]</td>
 						<td class='centertext'>[[Onyx]]</td>
@@ Line 243: / Line 258: @@
 						<td class='centertext'>[[Loki]]</td>
 					</tr>
-				</table>
-				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
 					<tr class='primary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Battlecruisers</span></th>
@@ Line 251: / Line 265: @@
 						<th class='racialcol centertext'>[[Brutix]] &#9642; [[Myrmidon]] &#9642; [[Talos]]</th>
 						<th class='racialcol centertext'>[[Hurricane]] &#9642; [[Cyclone]] &#9642; [[Tornado]]</th>
+					</tr>
+					<tr class='highlight'>
+						<td class='groupheader firstindent'>Navy Faction Battlecruisers</td>
+						<td class='centertext'>[[Harbinger Navy Issue]]</td>
+						<td class='centertext'>[[Drake Navy Issue]]</td>
+						<td class='centertext'>[[Brutix Navy Issue]]</td>
+						<td class='centertext'>[[Hurricane Fleet Issue]]</td>
 					</tr>
 					<tr class='odd'>
@@ Line 259: / Line 280: @@
 						<td class='centertext'>[[Claymore]] &#9642; [[Sleipnir]]</td>
 					</tr>
-				</table>
-				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
 					<tr class='primary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Battleships</span></th>
@@ Line 269: / Line 289: @@
 					</tr>
 					<tr class='highlight'>
-						<td class='groupheader firstindent'>Faction Battleships</td>
+						<td class='groupheader firstindent'>Navy Faction Battleships</td>
-						<td class='centertext'>[[Apocalypse Navy Issue]] &#9642; [[Armageddon Navy Issue]] &#9642; [[Apocalypse Imperial Issue]] &#9642; [[Armageddon Imperial Issue]]</td>
+						<td class='centertext'>[[Apocalypse Navy Issue]] &#9642; [[Armageddon Navy Issue]]</td>
 						<td class='centertext'>[[Scorpion Navy Issue]] &#9642; [[Raven Navy Issue]]</td>
 						<td class='centertext'>[[Megathron Navy Issue]] &#9642; [[Dominix Navy Issue]]</td>
@@ Line 286: / Line 306: @@
 						<td class='centertext'>[[Paladin]]</td>
 						<td class='centertext'>[[Golem]]</td>
-						<td class='centertext'>[[Kronos]]</td>
+						<td class='centertext'>[[Kronos (Ship)|Kronos]]</td>
 						<td class='centertext'>[[Vargur]]</td>
 					</tr>
-				</table>
-				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
 					<tr class='primary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Carriers</span></th>
@@ Line 299: / Line 318: @@
 					</tr>
 					<tr class='odd'>
-						<td class='groupheader secondindent'>Supercarrier</td>
+						<td class='groupheader secondindent'>Supercarriers</td>
 						<td class='centertext'>[[Aeon]]</td>
 						<td class='centertext'>[[Wyvern]]</td>
@@ Line 323: / Line 342: @@
 						<th class='racialcol centertext'>[[Ragnarok]]</th>
 					</tr>
-				</table>
-				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
 					<tr class='primary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Freighters</span></th>
@@ Line 339: / Line 357: @@
 						<td class='centertext'>[[Nomad]]</td>
 					</tr>
-				</table>
-				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
 					<tr class='primary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Standard Industrial Ships</span></th>
 						<th class='racialcol centertext'>[[Bestower]] &#9642; [[Sigil]]</th>
-						<th class='racialcol centertext'>[[Badger]] &#9642; [[Badger Mark II]]</th>
+						<th class='racialcol centertext'>[[Badger]] &#9642; [[Tayra]]</th>
-						<th class='racialcol centertext'>[[Iteron]] &#9642; [[Iteron Mark II]] &#9642; [[Iteron Mark III]] &#9642; [[Iteron Mark IV]] &#9642; [[Iteron Mark V]]</th>
+						<th class='racialcol centertext'>[[Nereus]] &#9642; [[Kryos]] &#9642; [[Epithal]] &#9642; [[Miasmos]] &#9642; [[Iteron Mark V]]</th>
 						<th class='racialcol centertext'>[[Hoarder]] &#9642; [[Mammoth]] &#9642; [[Wreathe]]</th>
 					</tr>
@@ Line 359: / Line 376: @@
 					<tr class='special'>
 						<th class='firstcol groupheader'><span class='textlabel'>ORE</span></th>
-						<th class='racialcol centertext' colspan='4' style='width:84%'>[[Orca]] &#9642; [[Primae]] &#9642; [[Noctis]] &#9642; [[Covetor]] &#9642; [[Retriever]] &#9642; [[Procurer]] &#9642; [[Hulk]] &#9642; [[Skiff]] &#9642; [[Mackinaw]] &#9642; [[Rorqual]] &#9642; [[Venture]] &#9642; [[Prospect]]</th>
+						<th class='widecol centertext'>[[Venture]] &#9642; [[Prospect]] &#9642; [[Covetor]] &#9642; [[Retriever]] &#9642; [[Procurer]] &#9642; [[Hulk]] &#9642; [[Skiff]] &#9642; [[Mackinaw]] &#9642; [[Noctis]] &#9642; [[Orca]] &#9642; [[Bowhead]] &#9642; [[Rorqual]]</th>
 					</tr>
 				</table>
-				<table cellspacing='0' cellpadding='0'>
+				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
-					<tr class='special'>
+					<tr class='secondprimary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Pirate Faction Ships</span></th>
-						<th class='racialcol centertext' colspan='4' style='width:84%'>[[Succubus]] &#9642; [[Phantasm]] &#9642; [[Nightmare]] &#9642; [[Cruor]] &#9642; [[Ashimmu]] &#9642; [[Bhaalgorn]] &#9642; [[Worm]] &#9642; [[Gila]] &#9642; [[Rattlesnake]] &#9642; [[Daredevil]] &#9642; [[Vigilant]] &#9642;[[Vindicator]] &#9642; [[Dramiel]] &#9642; [[Cynabal]] &#9642; [[Machariel]] &#9642; [[Revenant]]</th>
+						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_angel_cartel.png|center|20x20px]]</div>Angel Cartel</th>
+						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_blood_raiders.png|center|20x20px]]</div>Blood Raiders</th>
+						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_guristas_pirates.png|center|20x20px]]</div>Guristas</th>
+						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_mordus_legion.png|center|20x20px]]</div>Mordu's Legion</th>
+						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_sanshas_nation.png|center|20x20px]]</div>Sansha's Nation</th>
+						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_serpentis.png|center|20x20px]]</div>Serpentis</th>
+						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo faction sisters of eve.png|center|20x20px]]</div>Sisters of EVE</th>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Frigates</td>
+						<td class='piratecol centertext'>[[Dramiel]]</td>
+						<td class='piratecol centertext'>[[Cruor]]</td>
+						<td class='piratecol centertext'>[[Worm]]</td>
+						<td class='piratecol centertext'>[[Garmur]]</td>
+						<td class='piratecol centertext'>[[Succubus]]</td>
+						<td class='piratecol centertext'>[[Daredevil]]</td>
+						<td class='piratecol centertext'>[[Astero]]</td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Cruisers</td>
+						<td class='piratecol centertext'>[[Cynabal]]</td>
+						<td class='piratecol centertext'>[[Ashimmu]]</td>
+						<td class='piratecol centertext'>[[Gila]]</td>
+						<td class='piratecol centertext'>[[Orthrus]]</td>
+						<td class='piratecol centertext'>[[Phantasm]]</td>
+						<td class='piratecol centertext'>[[Vigilant]]</td>
+						<td class='piratecol centertext'>[[Stratios]]</td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Battleships</td>
+						<td class='piratecol centertext'>[[Machariel]]</td>
+						<td class='piratecol centertext'>[[Bhaalgorn]]</td>
+						<td class='piratecol centertext'>[[Rattlesnake]]</td>
+						<td class='piratecol centertext'>[[Barghest]]</td>
+						<td class='piratecol centertext'>[[Nightmare]]</td>
+						<td class='piratecol centertext'>[[Vindicator]]</td>
+						<td class='piratecol centertext'>[[Nestor]]</td>
+					</tr>
+					<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>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'>[[Revenant]]</td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'></td>
 					</tr>
 				</table>
-				<table cellspacing='0' cellpadding='0'>
+				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
 					<tr class='special'>
-						<th class='firstcol groupheader'><span class='textlabel'>Unique Ships</span></th>
+						<th class='firstcol groupheader'><span class='textlabel'>Special Edition Ships</span></th>
-						<th class='racialcol centertext' colspan='4' style='width:84%'>[[Echelon]] &#9642; [[Scorpion Ishukone Watch]] &#9642; [[Goru's Shuttle]] &#9642; [[Guristas Shuttle]] &#9642; [[Raven State Issue]] &#9642; [[Opux Luxury Yacht]] &#9642; [[Megathron Federate Issue]] &#9642; [[Interbus Shuttle]] &#9642; [[Zephyr]] &#9642; [[Tempest Tribal Issue]] &#9642; [[Apotheosis]]</th>
+						<th class='widecol centertext'></th>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Shuttles</td>
+						<td class='widecol centertext'>[[Apotheosis]] &#9642; [[Interbus Shuttle]] &#9642; [[Leopard]]</td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Frigates</td>
+						<td class='widecol centertext'>[[Echelon]] &#9642; [[Echo]] &#9642; [[Hematos]] &#9642; [[Immolator]] &#9642; [[Taipan]] &#9642; [[Violator]] &#9642; [[Zephyr]] &#9642; [[Gold Magnate]] &#9642; [[Inner Zone Shipping Imicus]] &#9642; [[Sarum Magnate]] &#9642; [[Silver Magnate]] &#9642; [[Sukuuvestaa Heron]] &#9642; [[Tash-Murkon Magnate]] &#9642; [[Vherokior Probe]]</td>
+					</tr>
+					<tr class='even'>
+						<td class='groupheader secondindent'>Assault Frigates</td>
+						<td class='widecol centertext'>[[Cambion]] &#9642; [[Freki]] &#9642; [[Malice]] &#9642; [[Utu]]</td>
+					</tr>
+					<tr class='odd'>
+						<td class='groupheader secondindent'>Covert Ops</td>
+						<td class='racialcol centertext'>[[Chremoas]]</td>
+					</tr>
+					<tr class='even'>
+						<td class='groupheader secondindent'>Interceptors</td>
+						<td class='widecol centertext'>[[Whiptail]]</td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Destroyers</td>
+						<td class='widecol centertext'>[[Aliastra Catalyst]] &#9642; [[Inner Zone Shipping Catalyst]] &#9642; [[Intaki Syndicate Catalyst]] &#9642; [[InterBus Catalyst]] &#9642; [[Nefantar Thrasher]] &#9642; [[Quafe Catalyst]]</td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Cruisers</td>
+						<td class='widecol centertext'>[[Guardian-Vexor]]</td>
+					</tr>
+					<tr class='even'>
+						<td class='groupheader secondindent'>Heavy Assault Cruisers</td>
+						<td class='widecol centertext'>[[Adrestia]] &#9642; [[Mimir]] &#9642; [[Vangel]]</td>
+					</tr>
+					<tr class='odd'>
+						<td class='groupheader secondindent'>Logistics</td>
+						<td class='widecol centertext'>[[Etana]]</td>
+					</tr>
+					<tr class='even'>
+						<td class='groupheader secondindent'>Recon Ships</td>
+						<td class='racialcol centertext'>[[Chameleon]] &#9642; [[Moracha]]</td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Battlecruisers</td>
+						<td class='widecol centertext'>[[Gnosis]]</td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Battleships</td>
+						<td class='widecol centertext'>[[Scorpion Ishukone Watch]] &#9642; [[Apocalypse Imperial Issue]] &#9642; [[Armageddon Imperial Issue]] &#9642; [[Raven State Issue]] &#9642; [[Megathron Federate Issue]] &#9642; [[Tempest Tribal Issue]]</td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Industrial</td>
+						<td class='widecol centertext'>[[Primae]] &#9642; [[Miasmos Amastris Edition]] &#9642; [[Miasmos Quafe Ultra Edition]] &#9642; [[Miasmos Quafe Ultramarine Edition]]</td>
 					</tr>
 				</table>