Merge remote-tracking branch 'upstream/master' into borger-tweaks

This commit is contained in:
SteelSlayer
2020-08-18 11:09:48 -05:00
371 changed files with 4484 additions and 8606 deletions
+2 -5
View File
@@ -92,14 +92,11 @@
O.job = "Cyborg"
if(O.mind && O.mind.assigned_role == "Cyborg")
if(O.mind.role_alt_title == "Android")
if(O.mind.role_alt_title == "Robot")
O.mmi = new /obj/item/mmi/robotic_brain(O)
else if(O.mind.role_alt_title == "Robot")
O.mmi = null //Robots do not have removable brains.
else
O.mmi = new /obj/item/mmi(O)
if(O.mmi) O.mmi.transfer_identity(src) //Does not transfer key/client.
O.mmi.transfer_identity(src) //Does not transfer key/client.
O.update_pipe_vision()