Merge branch 'patch-1' of https://github.com/jecowa/OpenComputers

src/main/resources/assets/opencomputers/robot.names

@@ -18,31 +18,83 @@ Kilobyte
 # Names of more or less famous robots, as a bit of filler material. Feel free
 # to add more via pull requests. Let's hope this won't get us sued...
 Adventure Core
+# video game "Portal 2"
 Atlas
+# animated series "Futurama"
 Bender
+# member of Robot Mafia in "Futurama"
+Clamps
+# Bender's twin brother from "Futurama"
+Flexo
+# soap opera actor in "Futurama"
+Calculon
+# film "Star Wars"
 C-3PO
 Callister Raynes
+# video game "Ratchet & Clank"
 Clank
+# video game "Borderlands"
 Claptrap
+# video game "Fallout: New Vegas"
 Deputy ANDY
+# video game "Half-Life 2"
 Dog
 Fact Core
+# video game "Portal"
 GLaDOS
+# film "2001: A Space Odyssey"
 HAL 9000
 Heron
+# graphic novel "Iron Man"
 J.A.R.V.I.S
 KARR
 KITT
+# "Hitchhiker's Guide to the Galaxy"
 Marvin
+# video game "Portal 2"
 P-Body
+# film "Star Wars"
 R2-D2
+# film "Terminator"
 Skynet
 Space Core
 Terminator T-1000
 Terminator T-800
+# video game "Portal 2"
 Wheatley
+# animated series "The Jetsons"
 Rosie
 Uniblab
+# Robin William's character's robotic pet/friend in the movie "Flubber"
+Weebo
+# first self-aware robot from book "I, Robot"
+QT-1
+# nanny robot from a short story in "I, Robot"
+Robbie
+# film "Forbidden Planet"
+Robby
+# Jake and Finn's robotic roomate from "Adventure Time" (pronounced "Beemo")
+BMO
+# android from a "Fallout 3" sidequest
+Harkness
+# tv series "Buck Rodgers"
+Twiki
+# animated series "Ghost in the Shell"
+Tachikoma
+# lunar base AI in film "Moon"
+Gerty
+# animated series "South Park"
+Awesom-O
+# film "Short Circuit"
+Johnny 5
+# a real-life vacuum robot popular with robotics enthusists
+Roomba
+# real-live robot made by Honda
+ASIMO
+# film "Wall-E"
+Wall-E
+# film "Wall-E"
+Eve
 
 # Perry Rhodan Robots, definitly not all...
 Anson Argyris