X-Git-Url: https://git.rohieb.name/stratum0-wiki.git/blobdiff_plain/75adf287d815374fd5df2eedbc22bfc0ea5b57c3..27e8fb229c0e18bb479e215a5ed54f144b2bdd18:/Captain%27s_Log.mw?ds=inline

diff --git a/Captain's_Log.mw b/Captain's_Log.mw
index 068e45243..6c2b9459f 100644
--- a/Captain's_Log.mw
+++ b/Captain's_Log.mw
@@ -1,3 +1,89 @@
+'''Termine: Jeweils Donnerstags ab 20:00 alle 2 Wochen'''
+
+Unter ''Captain's Log'' verstehen wir unsere regelmäßigen Treffen, zu denen wir gemeinsam Science Fiction gucken. Begonnen haben wir damit am Donnerstag, 16.04.2015.
+
+Wir gucken, sofern nichts anderweitiges sinnvoller erscheint, auf Englisch.
+
+== Logbuch ==
+=== Serien ===
+{| border="1" cellpadding="2" cellspacing="0" style="text-align:center;"
+|-
+! Titel !! Status !! Links !! Jahr !! Jahr !! Länge !! noteworthy
+|-
+| Ascension
+| {{Composition bar|00|06|#c0c0f0}}
+| [https://en.wikipedia.org/wiki/Ascension_(miniseries) Wikipedia]
+| 2014
+| 2014
+| 43 min
+|
+|-
+| Dark Matter
+| {{Composition bar|04|13|#1131d9}}{{Composition bar|00|13|#1131d9}}
+| [https://en.wikipedia.org/wiki/Dark_Matter_(TV_series) Wikipedia]
+| 2015-
+| ?
+| 43 min
+| 
+|-
+| Andromeda
+| {{Composition bar|22|22|#C0C0C0}}{{Composition bar|01|22|#C0C0C0}}{{Composition bar|00|22|#C0C0C0}}{{Composition bar|00|22|#C0C0C0}}{{Composition bar|00|22|#C0C0C0}}
+| [http://andromeda.wikia.com/wiki/Main_Page Andromeda Wikia]
+| 2000-2005
+| 5167
+| 45 min
+|
+|-
+| Star Trek - The Original Series
+| {{Composition bar|1|1|#f8ce3c}}{{Composition bar|14|29|#f8ce3c}}{{Composition bar|11|26|#f8ce3c}}{{Composition bar|06|24|#f8ce3c}}
+| [http://en.memory-alpha.wikia.com/wiki/Star_Trek:_The_Original_Series#Episode_list Memory Alpha] ([http://de.memory-alpha.wikia.com/wiki/Star_Trek:_The_Original_Series#Episodenliste de])
+| 1966-1969
+| 2254-2269
+| 44 min
+| Keine Kontinuität, wir gucken beliebige Folgen mit Priorisierung auf den "Besten".<br> Genaueres Tracking im [https://pad.stratum0.org/p/captainslog pad].
+|-
+| Bravest Warriors
+| {{Composition bar|11|11|#04fe01}}{{Composition bar|12|12|#04fe01}}{{Composition bar|00|06|#04fe01}}
+| [https://www.youtube.com/playlist?list=PL54sf3M635Xlm4LGmm8aVuk2AiZ3kILLD Season 1]<br>[https://www.youtube.com/playlist?list=PL2DcNkn8HAwRr71gBLs5XKBCEtuBkbLWf Season 2]
+| 2012-
+| 3085
+| 6 min
+| YouTube. Season 3 Release Date: 10.01.2017
+|-
+| Ijon Tichy: Raumpilot
+| {{Composition bar|6|6|#e000d9}}{{Composition bar|8|8|#e000d9}}
+| 
+| 2006-2007<br> 2010-2011
+| 
+| 6*15&nbsp;min<br>8*22&nbsp;min
+| Netflix. Es gibt Gerüchte über einen Film?
+|-
+| The Expanse
+| {{Composition bar|10|10|#C0C0C0}}
+| [https://en.wikipedia.org/wiki/The_Expanse_(TV_series) Wikipedia]
+| 2015
+| 2300
+| 42-44&nbsp;min
+| Zweite Staffel mit 13 Folgen soll ab 01.02.2017 erscheinen.
+|-
+| Firefly
+| {{Composition bar|14|14|#FFD700}}
+| 
+| 2002
+| 2517
+| 44 min
+| +Serenity zum Abschluss
+|}
+
+=== Filme ===
+* 2015-06-11 Matrix
+* 2015-06-25 Star Trek: The Motion Picture
+* 2016-02-14 Serenity
+* 2016-04-07 The Martian
+
+''Siehe auch [https://pad.stratum0.org/p/captainslog Pad]''
+
+== Prolog ==
  *beep beep*
  
  The emulated sun on the lighting panels had started to set some time ago, it was getting late.
@@ -5,18 +91,21 @@
  
  *beep beep*
  
- "Ugh, come in!"
+  "Ugh, come in!"
  
- The impatient intruder revealed to be a young man in a lab coat, more a tribute to his profession than a necessity, really. In his hand a tablet he was clinging to almost as much as to the concerned expression on his face.
+ The impatient intruder revealed to be a young man in a lab coat, more a tribute to his profession than a necessity, really. 
+ In his hand a tablet he was clinging to almost as much as to the concerned expression on his face.
  
- "Doctor? To what do owe the house call?"
+  "Doctor? To what do owe the house call?"
  
- "I've got the crew exams you asked for, Captain."
+  "I've got the crew exams you asked for, Captain."
  
- "You could have just sent them, is something not right?"
+  "You could have just sent them, is something not right?"
  
- "Physically, they're all fine, but there's something I wanted to discuss with you in person. During the tests, I talked to them and noticed something strange. At first I thought it was only a few of them, but it seems everyone is affected. Even me and - I went though your medical history - you!"
+  "Physically, they're all fine, but there's something I wanted to discuss with you in person. 
+ During the tests, I talked to them and noticed something strange. At first I thought it was only a few of them, 
+ but it seems everyone is affected. Even me and – I went though your medical history – you!"
  
- "Doctor…?"
+  "Doctor…?"
  
- "The entire crew shows a significant lack of Science Fiction, we need to act immediately!"
+  "The entire crew shows a significant lack of Science Fiction, we need to act immediately!"