Template:ShipsMatrix: Difference between revisions

Line 91:

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

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

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

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

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

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

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

{

display: inline-block;

Line 128:

Line 129:

<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_amarr_empire_clean.png|center|x20px|link=]]</div>Amarr</th>

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

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

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

<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_gallente_federation_clean.png|center|x20px|link=]]</div>Gallente</th>

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

<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_minmatar_republic_clean.png|center|x20px|link=]]</div>Minmatar</th>

</tr>

<tr>

Line 228:

Line 229:

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

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

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

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

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

<th class='racialcol centertext'>[[Celestis]] ▪ [[Exequror]] ▪ [[~~Vexor~~]] ▪ [[~~Thorax~~]]</th>

<th class='racialcol centertext'>[[Celestis]] ▪ [[Exequror]] ▪ [[Thorax]] ▪ [[Vexor]]</th>

<th class='racialcol centertext'>[[~~Stabber~~]] ▪ [[~~Rupture~~]] ▪ [[~~Bellicose~~]] ▪ [[~~Scythe~~]]</th>

<th class='racialcol centertext'>[[Bellicose]] ▪ [[Scythe]] ▪ [[Stabber]] ▪ [[Rupture]]</th>

</tr>

Line 280:

Line 281:

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

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

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

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

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

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

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

</tr>

Line 302:

Line 303:

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

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

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

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

<th class='racialcol centertext'>[[~~Hyperion~~]] ▪ [[Megathron]] ▪ [[~~Dominix~~]]</th>

<th class='racialcol centertext'>[[Dominix]] ▪ [[Megathron]] ▪ [[Hyperion]]</th>

<th class='racialcol centertext'>[[~~Tempest~~]] ▪ [[~~Typhoon~~]] ▪ [[Maelstrom]]</th>

<th class='racialcol centertext'>[[Typhoon]] ▪ [[Tempest]] ▪ [[Maelstrom]]</th>

</tr>

Line 403:

Line 404:

<td class='centertext'>[[Mastodon]] ▪ [[Prowler]]</td>

</tr>

</table>

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

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

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

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

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

</tr>

</table>

<th class='firstcol groupheader'><span class='textlabel'>Outer Ring Excavation ~~ships~~</span></th>

<th class='firstcol groupheader'><span class='textlabel'>[[Image:Logo_faction_outer_ring_excavations.png|16x16px|link=]] Outer Ring Excavation Ships</span></th>

</tr>

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

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

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

</tr>

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

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

</tr>

<td class='firstcol groupheader firstindent'>~~Barge~~</td>

<td class='firstcol groupheader firstindent'>Mining Barges</td>

<td class='piratecol centertext'>[[Covetor]] ▪ [[Retriever]] ▪ [[Procurer]] ~~▪~~ [[Hulk]] ▪ [[~~Skiff~~]] ▪ [[~~Mackinaw~~]]</td>

<td class='piratecol centertext'>[[Covetor]] ▪ [[Retriever]] ▪ [[Procurer]]</td>

</tr>

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

<td class='piratecol centertext'>[[Hulk]] ▪ [[Mackinaw]] ▪ [[Skiff]]</td>

</tr>

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

<td class='firstcol groupheader firstindent'>ORE Industrials</td>

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

</tr>

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

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

<td class='piratecol centertext'>[[Porpoise]] ▪ [[Orca]]</td>

</tr>

<td class='firstcol groupheader firstindent'>ORE ~~Freighter~~</td>

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

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

</tr>

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

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

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

</tr>

</table>

<th class='firstcol groupheader'><span class='textlabel'>Pirate Faction Ships</span></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_angel_cartel.png|center|20x20px|link=]]</div>Angel Cartel</th>

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

<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_the_blood_raider_covenant.png|center|20x20px|link=]]</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_guristas_pirates.png|center|20x20px|link=]]</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_mordus_legion.png|center|20x20px|link=]]</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_sanshas_nation.png|center|20x20px|link=]]</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_serpentis.png|center|20x20px|link=]]</div>Serpentis</th>

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

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

~~<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_triglavian_collective.png‎|center|20x20px]]</div>Triglavian Collective~~</th>

</tr>

Line 459:

Line 472:

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

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

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

</tr>

Line 470:

Line 482:

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

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

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

</tr>

Line 481:

Line 492:

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

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

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

</tr>

Line 491:

Line 501:

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

~~<td class='piratecol centertext'></td>~~

</tr>

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

~~<td class='piratecol centertext'></td>~~

Line 513:

Line 521:

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

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

~~<td class='piratecol centertext'></td>~~

</tr>

Line 521:

Line 528:

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

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

~~<td class='piratecol centertext'></td>~~

Line 535:

Line 541:

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

</tr>

</table>

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

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

<th class='othercol noshowexplain'><div class='img'>[[Image:Logo_faction_the_society.png|center|20x20px|link=]]</div>{{H:title|While all Society of Conscious Thought ships are special edition ships, they are common and cheap enough to be compared with regular ships.|Society of Conscious Thought}}</th>

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

</tr>

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

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

</tr>

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

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

</tr>

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

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

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

</tr>

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

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

</tr>

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

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

</tr>

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

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

</tr>

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

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

</tr>

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

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

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

</tr>

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

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

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

</tr>

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

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

</tr>

</table>

Line 559:

Line 631:

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

<td class='racialcol centertext'>[[Chremoas]] ▪ [[Caedes]] ▪ [[~~Pacifier~~]] ▪ [[~~Virtuoso~~]]</td>

<td class='racialcol centertext'>[[Chremoas]] ▪ [[Caedes]] ▪ [[Virtuoso]] ▪ [[Hydra]]</td>

</tr>

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

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

~~</tr>~~

~~<tr class='primary'>~~

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

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

</tr>

Line 587:

Line 655:

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

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

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

~~</tr>~~

~~<tr class='odd'>~~

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

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

~~</tr>~~

~~<tr class='primary'>~~

~~<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'>[[Apocalypse Imperial Issue]] ▪ [[Armageddon Imperial Issue]] ▪ [[Raven State Issue]] ▪ [[Megathron Federate Issue]] ▪ [[Tempest Tribal Issue~~]] ▪ [[Praxis]]</td>~~

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

~~</tr>~~

~~<tr class='even'>~~

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

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

</tr>

Line 613:

Line 669:

</tr>

</table>

</div><noinclude>

</div>

</noinclude>

@@ Line 91: / Line 91: @@
 	.ships-matrix .racialcol{ width:21%; }
 	.ships-matrix .piratecol{ width:12%; }
+	.ships-matrix .othercol{ width:28%; }
 	.ships-matrix .widecol{ width:84%; }
 	.ships-matrix .centertext{ color: gray; text-align: center; }
-	.ships-matrix .racialcol .img, .ships-matrix .piratecol .img
+	.ships-matrix .racialcol .img, .ships-matrix .piratecol .img, .ships-matrix .othercol .img
 	{
 		display: inline-block;
@@ Line 128: / Line 129: @@
 		<tr class='firstprimary'>
 			<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_amarr_empire_clean.png|center|x20px|link=]]</div>Amarr</th>
-			<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_caldari_state.png|center|20x20px]]</div>Caldari</th>
+			<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_caldari_state_clean.png|center|x20px|link=]]</div>Caldari</th>
-			<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_gallente_federation.png|center|20x20px]]</div>Gallente</th>
+			<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_gallente_federation_clean.png|center|x20px|link=]]</div>Gallente</th>
-			<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_minmatar_republic.png|center|20x20px]]</div>Minmatar</th>
+			<th class='racialcol noshowexplain'><div class='img'>[[Image:Logo_faction_minmatar_republic_clean.png|center|x20px|link=]]</div>Minmatar</th>
 		</tr>
 		<tr>
@@ Line 228: / Line 229: @@
 					<tr class='primary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Cruisers</span></th>
-						<th class='racialcol centertext'>[[Arbitrator]] &#9642; [[Maller]] &#9642; [[Augoror]] &#9642; [[Omen]]</th>
+						<th class='racialcol centertext'>[[Arbitrator]] &#9642; [[Augoror]] &#9642; [[Omen]] &#9642; [[Maller]]</th>
-						<th class='racialcol centertext'>[[Moa]] &#9642; [[Blackbird]] &#9642; [[Osprey]] &#9642; [[Caracal]]</th>
+						<th class='racialcol centertext'>[[Blackbird]] &#9642; [[Osprey]] &#9642; [[Caracal]] &#9642; [[Moa]]</th>
-						<th class='racialcol centertext'>[[Celestis]] &#9642; [[Exequror]] &#9642; [[Vexor]] &#9642; [[Thorax]]</th>
+						<th class='racialcol centertext'>[[Celestis]] &#9642; [[Exequror]] &#9642; [[Thorax]] &#9642; [[Vexor]]</th>
-						<th class='racialcol centertext'>[[Stabber]] &#9642; [[Rupture]] &#9642; [[Bellicose]] &#9642; [[Scythe]]</th>
+						<th class='racialcol centertext'>[[Bellicose]] &#9642; [[Scythe]] &#9642; [[Stabber]] &#9642; [[Rupture]]</th>
 					</tr>
 					<tr class='highlight'>
@@ Line 280: / Line 281: @@
 						<th class='firstcol groupheader'><span class='textlabel'>Battlecruisers</span></th>
 						<th class='racialcol centertext'>[[Prophecy]] &#9642; [[Harbinger]] &#9642; [[Oracle]]</th>
-						<th class='racialcol centertext'>[[Drake]] &#9642; [[Ferox]] &#9642; [[Naga]]</th>
+						<th class='racialcol centertext'>[[Ferox]] &#9642; [[Drake]] &#9642; [[Naga]]</th>
 						<th class='racialcol centertext'>[[Brutix]] &#9642; [[Myrmidon]] &#9642; [[Talos]]</th>
-						<th class='racialcol centertext'>[[Hurricane]] &#9642; [[Cyclone]] &#9642; [[Tornado]]</th>
+						<th class='racialcol centertext'>[[Cyclone]] &#9642; [[Hurricane]] &#9642; [[Tornado]]</th>
 					</tr>
 					<tr class='highlight'>
@@ Line 302: / Line 303: @@
 					<tr class='primary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Battleships</span></th>
-						<th class='racialcol centertext'>[[Abaddon]] &#9642; [[Apocalypse]] &#9642; [[Armageddon]]</th>
+						<th class='racialcol centertext'>[[Armageddon]] &#9642; [[Apocalypse]] &#9642; [[Abaddon]] </th>
 						<th class='racialcol centertext'>[[Scorpion]] &#9642; [[Raven]] &#9642; [[Rokh]]</th>
-						<th class='racialcol centertext'>[[Hyperion]] &#9642; [[Megathron]] &#9642; [[Dominix]]</th>
+						<th class='racialcol centertext'>[[Dominix]] &#9642; [[Megathron]] &#9642; [[Hyperion]]</th>
-						<th class='racialcol centertext'>[[Tempest]] &#9642; [[Typhoon]] &#9642; [[Maelstrom]]</th>
+						<th class='racialcol centertext'>[[Typhoon]] &#9642; [[Tempest]] &#9642; [[Maelstrom]]</th>
 					</tr>
 					<tr class='highlight'>
@@ Line 403: / Line 404: @@
 						<td class='centertext'>[[Mastodon]] &#9642; [[Prowler]]</td>
 					</tr>
+				</table>
+				<table cellspacing='0' cellpadding='0'>
+					<tr class='primary'>
+						<th class='firstcol groupheader'><span class='textlabel'>Shuttles</span></th>
+						<th class='racialcol centertext'>[[Amarr Shuttle]]</th>
+						<th class='racialcol centertext'>[[Caldari Shuttle]]</th>
+						<th class='racialcol centertext'>[[Gallente Shuttle]]</th>
+						<th class='racialcol centertext'>[[Minmatar Shuttle]]</th>
+					</tr>
 				</table>
 				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
 					<tr class='special'>
-						<th class='firstcol groupheader'><span class='textlabel'>Outer Ring Excavation ships</span></th>
+						<th class='firstcol groupheader'><span class='textlabel'>[[Image:Logo_faction_outer_ring_excavations.png|16x16px|link=]] Outer Ring Excavation Ships</span></th>
 						<th class='widecol centertext'></th>
 					</tr>
+					<tr class='primary'>
-                                        <tr class='primary'>
 						<td class='firstcol groupheader firstindent'>Frigates</td>
-						<td class='piratecol centertext'>[[Venture]] &#9642; [[Prospect]] &#9642; [[Endurance]]</td>
+						<td class='piratecol centertext'>[[Venture]]</td>
+					</tr>
+					<tr class='even'>
+						<td class='groupheader secondindent'>Expedition Frigates</td>
+						<td class='piratecol centertext'>[[Prospect]] &#9642; [[Endurance]]</td>
 					</tr>
 					<tr class='primary'>
-						<td class='firstcol groupheader firstindent'>Barge</td>
+						<td class='firstcol groupheader firstindent'>Mining Barges</td>
-						<td class='piratecol centertext'>[[Covetor]] &#9642; [[Retriever]] &#9642; [[Procurer]] &#9642; [[Hulk]] &#9642; [[Skiff]] &#9642; [[Mackinaw]]</td>
+						<td class='piratecol centertext'>[[Covetor]] &#9642; [[Retriever]] &#9642; [[Procurer]]</td>
+					</tr>
+					<tr class='even'>
+						<td class='groupheader secondindent'>Exhumers</td>
+						<td class='piratecol centertext'>[[Hulk]] &#9642; [[Mackinaw]] &#9642; [[Skiff]]</td>
 					</tr>
 					<tr class='primary'>
-						<td class='firstcol groupheader firstindent'>ORE Industrial</td>
+						<td class='firstcol groupheader firstindent'>ORE Industrials</td>
 						<td class='piratecol centertext'>[[Noctis]]</td>
 					</tr>
 					<tr class='primary'>
-						<td class='firstcol groupheader firstindent'>Industrial Command</td>
+						<td class='firstcol groupheader firstindent'>Industrial Command Ships</td>
 						<td class='piratecol centertext'>[[Porpoise]] &#9642; [[Orca]]</td>
 					</tr>
 					<tr class='primary'>
-						<td class='firstcol groupheader firstindent'>ORE Freighter</td>
+						<td class='firstcol groupheader firstindent'>ORE Freighters</td>
 						<td class='piratecol centertext'>[[Bowhead]]</td>
 					</tr>
 					<tr class='primary'>
-						<td class='firstcol groupheader firstindent'>Capital Industrial</td>
+						<td class='firstcol groupheader firstindent'>Capital Industrial Ships</td>
 						<td class='piratecol centertext'>[[Rorqual]]</td>
 					</tr>
 				</table>
 				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
 					<tr class='secondprimary'>
 						<th class='firstcol groupheader'><span class='textlabel'>Pirate Faction Ships</span></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_angel_cartel.png|center|20x20px|link=]]</div>Angel Cartel</th>
-						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_the_blood_raider_covenant.png|center|20x20px]]</div>Blood Raiders</th>
+						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_the_blood_raider_covenant.png|center|20x20px|link=]]</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_guristas_pirates.png|center|20x20px|link=]]</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_mordus_legion.png|center|20x20px|link=]]</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_sanshas_nation.png|center|20x20px|link=]]</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_serpentis.png|center|20x20px|link=]]</div>Serpentis</th>
-						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo faction sisters of eve.png|center|20x20px]]</div>Sisters of EVE</th>
+						<th class='piratecol noshowexplain'><div class='img'>[[Image:Logo faction sisters of eve.png|center|20x20px|link=]]</div>Sisters of EVE</th>
-                                                <th class='piratecol noshowexplain'><div class='img'>[[Image:Logo_faction_triglavian_collective.png‎|center|20x20px]]</div>Triglavian Collective</th>
 					</tr>
 					<tr class='primary'>
@@ Line 459: / Line 472: @@
 						<td class='piratecol centertext'>[[Daredevil]]</td>
 						<td class='piratecol centertext'>[[Astero]]</td>
-						<td class='piratecol centertext'>[[Damavik]]</td>
 					</tr>
 					<tr class='primary'>
@@ Line 470: / Line 482: @@
 						<td class='piratecol centertext'>[[Vigilant]]</td>
 						<td class='piratecol centertext'>[[Stratios]]</td>
-						<td class='piratecol centertext'>[[Vedmak]]</td>
 					</tr>
 					<tr class='primary'>
@@ Line 481: / Line 492: @@
 						<td class='piratecol centertext'>[[Vindicator]]</td>
 						<td class='piratecol centertext'>[[Nestor]]</td>
-						<td class='piratecol centertext'>[[Leshak]]</td>
 					</tr>
 					<tr class='primary'>
@@ Line 491: / Line 501: @@
 						<td class='piratecol centertext'></td>
 						<td class='piratecol centertext'>[[Vehement]]</td>
-						<td class='piratecol centertext'></td>
 						<td class='piratecol centertext'></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>
@@ Line 513: / Line 521: @@
 						<td class='piratecol centertext'>[[Revenant]]</td>
 						<td class='piratecol centertext'>[[Vendetta]]</td>
-						<td class='piratecol centertext'></td>
 						<td class='piratecol centertext'></td>
 					</tr>
@@ Line 521: / Line 528: @@
 						<td class='piratecol centertext'>[[Dagon]]</td>
 						<td class='piratecol centertext'>[[Loggerhead]]</td>
-						<td class='piratecol centertext'></td>
 						<td class='piratecol centertext'></td>
 						<td class='piratecol centertext'></td>
@@ Line 535: / Line 541: @@
 						<td class='piratecol centertext'></td>
 						<td class='piratecol centertext'>[[Vanquisher]]</td>
+						<td class='piratecol centertext'></td>
+					</tr>
+				</table>
+<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
+					<tr class='secondprimary'>
+						<th class='firstcol groupheader'><span class='textlabel'>Other Faction Ships</span></th>
+						<th class='othercol noshowexplain'><div class='img'>[[Image:Logo_faction_concord_assembly.png|center|20x20px|link=]]</div>CONCORD</th>
+						<th class='othercol noshowexplain'><div class='img'>[[Image:Logo_faction_the_society.png|center|20x20px|link=]]</div>{{H:title|While all Society of Conscious Thought ships are special edition ships, they are common and cheap enough to be compared with regular ships.|Society of Conscious Thought}}</th>
+						<th class='othercol noshowexplain'><div class='img'>[[Image:Logo_faction_triglavian_collective.png|center|20x20px|link=]]</div>Triglavian Collective</th>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Frigates</td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'>[[Damavik]]</td>
+					</tr>
+					<tr class='even'>
+						<td class='firstcol groupheader secondindent'>Covert Ops</td>
+						<td class='piratecol centertext'>[[Pacifier]]</td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'></td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Destroyers</td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'>[[Sunesis]]</td>
+						<td class='piratecol centertext'>[[Kikimora]]</td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Cruisers</td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'>[[Rodiva]] &#9642; [[Vedmak]]</td>
+					</tr>
+					<tr class='even'>
+						<td class='firstcol groupheader secondindent'>Logistics Cruisers</td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'>[[Zarmazd]]</td>
+					</tr>
+					<tr class='odd'>
+						<td class='firstcol groupheader secondindent'>Recon Ships</td>
+						<td class='piratecol centertext'>[[Enforcer]]</td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'></td>
+					</tr>
+					<tr class='even'>
+						<td class='firstcol groupheader secondindent'>Flag Cruisers</td>
+						<td class='piratecol centertext'>[[Monitor]]</td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'></td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Battlecruisers</td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'>[[Gnosis]]</td>
+						<td class='piratecol centertext'>[[Drekavac]]</td>
+					</tr>
+					<tr class='primary'>
+						<td class='firstcol groupheader firstindent'>Battleships</td>
+						<td class='piratecol centertext'></td>
+						<td class='piratecol centertext'>[[Praxis]]</td>
+						<td class='piratecol centertext'>[[Leshak]]</td>
+					</tr>
+					<tr class='even'>
+						<td class='firstcol groupheader secondindent'>Black Ops</td>
+						<td class='piratecol centertext'>[[Marshal]]</td>
 						<td class='piratecol centertext'></td>
 						<td class='piratecol centertext'></td>
 					</tr>
 				</table>
 				<table class='collapsible collapsed' cellspacing='0' cellpadding='0'>
@@ Line 559: / Line 631: @@
 					<tr class='odd'>
 						<td class='groupheader secondindent'>Covert Ops</td>
-						<td class='racialcol centertext'>[[Chremoas]] &#9642; [[Caedes]] &#9642; [[Pacifier]] &#9642; [[Virtuoso]]</td>
+						<td class='racialcol centertext'>[[Chremoas]] &#9642; [[Caedes]] &#9642; [[Virtuoso]] &#9642; [[Hydra]]</td>
 					</tr>
 					<tr class='even'>
 						<td class='groupheader secondindent'>Interceptors</td>
 						<td class='widecol centertext'>[[Imp]] &#9642; [[Whiptail]]</td>
-					</tr>
-					<tr class='primary'>
-						<td class='firstcol groupheader firstindent'>Destroyers</td>
-						<td class='widecol centertext'>[[Sunesis]]</td>
 					</tr>
 					<tr class='primary'>
@@ Line 587: / Line 655: @@
 					<tr class='odd'>
 						<td class='groupheader secondindent'>Recon Ships</td>
-						<td class='racialcol centertext'>[[Chameleon]] &#9642; [[Moracha]] &#9642; [[Enforcer]] &#9642; [[Victor]]</td>
+						<td class='racialcol centertext'>[[Chameleon]] &#9642; [[Moracha]] &#9642; [[Victor]] &#9642; [[Tiamat]]</td>
-					</tr>
-					<tr class='odd'>
-						<td class='groupheader secondindent'>Flag Ships</td>
-						<td class='racialcol centertext'>[[Monitor]]</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'>[[Apocalypse Imperial Issue]] &#9642; [[Armageddon Imperial Issue]] &#9642; [[Raven State Issue]] &#9642; [[Megathron Federate Issue]] &#9642; [[Tempest Tribal Issue]]  &#9642; [[Praxis]]</td>
+						<td class='widecol centertext'>[[Apocalypse Imperial Issue]] &#9642; [[Armageddon Imperial Issue]] &#9642; [[Raven State Issue]] &#9642; [[Megathron Federate Issue]] &#9642; [[Tempest Tribal Issue]]</td>
-					</tr>
-                                        <tr class='even'>
-						<td class='groupheader secondindent'>Black Ops</td>
-						<td class='widecol centertext'>[[Marshal]]</td>
 					</tr>
 					<tr class='primary'>
@@ Line 613: / Line 669: @@
 		</tr>
 	</table>
-</div><noinclude>
+</div>
+<noinclude>
 {{documentation}}
 </noinclude>