Merge pull request #554 from JoshTheEnder/patch-1

Update robot.names
This commit is contained in:
Florian "Sangar" Nücke 2014-09-09 20:08:38 +02:00
commit a0349da4dd

View File

@ -26,6 +26,7 @@ Claptrap # Borderlands
Crypto # Kodos
Dalek Sec # Doctor Who
Deputy ANDY # Eureka
Death Trap # Borderlands 2's Mechromancer
Dog # Half-Life
Donald Duck # Perry Rhodan
Elmer # One of the first two robots developed by William Gray Walter.
@ -40,6 +41,7 @@ Harkness # Fallout 3
Heron # Vexatos
Homunk # Perry Rhodan
J.A.R.V.I.S # Iron Man
JoshTheEnder # Contributor
Johnny 5 # Short Circuit
K-9 # Doctor Who
KARR # Knight Rider
@ -54,6 +56,7 @@ P-Body # Portal
PixelToast # Contributor
QT-1 # I, Robot
R2-D2 # Star Wars
Replicator # Stargate
Robby # Forbidden Planet
Roomba # Under your couch... wait.
Rosie # The Jetsons