Line 28: |
Line 28: |
| <!-- multiple specific ships --> | | <!-- multiple specific ships --> |
| |Saratoga, Hornet<!--| Lexington-class, Yorktown-class--> = {{ToolTip|[[Saratoga]]<br>[[Hornet]]|'''Secretary: [[Saratoga]], [[Hornet]]'''<hr>{{Ship/Banner|Saratoga}}<br>{{Ship/Banner|Hornet}} }} | | |Saratoga, Hornet<!--| Lexington-class, Yorktown-class--> = {{ToolTip|[[Saratoga]]<br>[[Hornet]]|'''Secretary: [[Saratoga]], [[Hornet]]'''<hr>{{Ship/Banner|Saratoga}}<br>{{Ship/Banner|Hornet}} }} |
− | |Jintsuu Kai Ni, Hiei Kai Ni (C) = {{ToolTip|[[Jintsuu Kai Ni]]<br>[[Hiei Kai Ni|Hiei Kai Ni/C]]|'''Secretary: [[Jintsuu Kai Ni]], [[Hiei Kai Ni|Hiei Kai Ni/C]]'''<hr>'''{{Ship/Banner|Jintsuu Kai Ni}}<br>{{Ship/Banner|Hiei Kai Ni}} }} | + | |Jintsuu Kai Ni, Hiei Kai Ni (C) = {{ToolTip|[[Jintsuu Kai Ni]]<br>[[Hiei|Hiei Kai Ni/C]]|'''Secretary: [[Jintsuu Kai Ni]], [[Hiei|Hiei Kai Ni/C]]'''<hr>'''{{Ship/Banner|Jintsuu Kai Ni}}<br>{{Ship/Banner|Hiei Kai Ni}} }} |
− | |Akitsu Maru, Shinshuu Maru, Souya (AGS) = {{ToolTip|[[Akitsu Maru]]<br>[[Shinshuu Maru]]<br>[[Kumano Maru]]???<br>[[Souya (AGS)]]<br>{{colour|red|(NOT AGL/AGB)}}|'''Secretary: [[Akitsu Maru]], [[Shinshuu Maru]],<br>[[Kumano Maru]]???, [[Souya (AGS)]] {{colour|red|(NOT {{Ship/Link|Souya/(AGL)|text=AGL}}/{{Ship/Link|Souya/(AGB)|text=AGB}})}}'''<hr>'''{{Ship/Banner|Akitsu Maru}}<br>{{Ship/Banner|Shinshuu Maru}}<br>{{ItemStack|item={{Ship/Banner|Kumano Maru}}|text=???}}<br>{{ItemStack|item={{Ship/Banner|Souya (AGS)}}|text=(AGS)}} }} | + | |Akitsu Maru, Shinshuu Maru, Souya (AGS) = {{ToolTip|[[Akitsu Maru]]<br>[[Shinshuu Maru]]<br>[[Kumano Maru]]<br>[[Souya (AGS)]]<br>{{colour|red|(NOT AGL/AGB)}}|'''Secretary: [[Akitsu Maru]], [[Shinshuu Maru]],<br>[[Kumano Maru]], [[Souya (AGS)]] {{colour|red|(NOT {{Ship/Link|Souya/(AGL)|text=AGL}}/{{Ship/Link|Souya/(AGB)|text=AGB}})}}'''<hr>'''{{Ship/Banner|Akitsu Maru}}<br>{{Ship/Banner|Shinshuu Maru}}<br>{{Ship/Banner|Kumano Maru}}<br>{{ItemStack|item={{Ship/Banner|Souya (AGS)}}|text=(AGS)}} }} |
| |Salmon, Scamp = {{ToolTip|[[Salmon]]<br>[[Scamp]]|'''Secretary: [[Salmon]], [[Scamp]]'''<hr>{{Ship/Banner|Salmon}}<br>{{Ship/Banner|Scamp}} }} | | |Salmon, Scamp = {{ToolTip|[[Salmon]]<br>[[Scamp]]|'''Secretary: [[Salmon]], [[Scamp]]'''<hr>{{Ship/Banner|Salmon}}<br>{{Ship/Banner|Scamp}} }} |
| | | |
| <!-- singular ships (with additional text) --> | | <!-- singular ships (with additional text) --> |
− | |Ise Kai (Ni) = {{ToolTip|[[Ise Kai|Ise Kai/Ni]]|'''Secretary: [[Ise Kai|Ise Kai/Ni]]'''<hr>{{Ship/Banner|Ise Kai}} }} | + | |Ise Kai (Ni) = {{ToolTip|[[Ise|Ise Kai/Ni]]|'''Secretary: [[Ise|Ise Kai/Ni]]'''<hr>{{Ship/Banner|Ise Kai}} }} |
− | |Hyuuga Kai (Ni) = {{ToolTip|[[Hyuuga Kai|Hyuuga Kai/Ni]]|'''Secretary: [[Hyuuga Kai|Hyuuga Kai/Ni]]'''<hr>{{Ship/Banner|Hyuuga Kai}} }} | + | |Hyuuga Kai (Ni) = {{ToolTip|[[Hyuuga|Hyuuga Kai/Ni]]|'''Secretary: [[Hyuuga|Hyuuga Kai/Ni]]'''<hr>{{Ship/Banner|Hyuuga Kai}} }} |
| | | |
| <!-- singular ships --> | | <!-- singular ships --> |
− | |Commandant Teste|Ark Royal|Sendai Kai Ni|Helena|Northampton|Ooyodo= {{ToolTip|[[{{{secretary|{{{1|}}}}}}]]|'''Secretary: [[{{{secretary|{{{1|}}}}}}]]'''<hr>'''{{Ship/Banner|{{{secretary|{{{1|}}}}}}}} }} | + | |Commandant Teste|Ark Royal|Sendai Kai Ni|Helena|Northampton|Ooyodo|Yamashio Maru|Amatsukaze Kai Ni= {{ToolTip|[[{{{secretary|{{{1|}}}}}}]]|'''Secretary: [[{{{secretary|{{{1|}}}}}}]]'''<hr>'''{{Ship/Banner|{{{secretary|{{{1|}}}}}}}} }} |
| | | |
| |{{ToolTip|text-align=default;background-color:{{{secretarycolour|}}}|{{#if:{{{secretary|}}}|{{{secretary|}}}|{{#if:{{{1|}}}|{{{1}}}|Empty Secretary}}}}|'''Secretary: {{#if:{{{secretary|}}}|{{{secretary|}}}|[[Template:DevelopmentSecretaryCol]]}}'''<hr>{{#if:{{{secretarydescription|}}}|{{{secretarydescription|}}}|Go here to find/edit/add secretaries<br>[[Template:DevelopmentSecretaryCol]]}}}}}}</includeonly><noinclude> | | |{{ToolTip|text-align=default;background-color:{{{secretarycolour|}}}|{{#if:{{{secretary|}}}|{{{secretary|}}}|{{#if:{{{1|}}}|{{{1}}}|Empty Secretary}}}}|'''Secretary: {{#if:{{{secretary|}}}|{{{secretary|}}}|[[Template:DevelopmentSecretaryCol]]}}'''<hr>{{#if:{{{secretarydescription|}}}|{{{secretarydescription|}}}|Go here to find/edit/add secretaries<br>[[Template:DevelopmentSecretaryCol]]}}}}}}</includeonly><noinclude> |
Line 123: |
Line 123: |
| ! {{DevelopmentSecretaryCol|Ooyodo}} | | ! {{DevelopmentSecretaryCol|Ooyodo}} |
| |- | | |- |
− | | | + | ! {{DevelopmentSecretaryCol|Yamashio Maru}} |
| + | |- |
| + | ! {{DevelopmentSecretaryCol|Amatsukaze Kai Ni}} |
| |- | | |- |
| ! {{DevelopmentSecretaryCol|}} | | ! {{DevelopmentSecretaryCol|}} |