cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 04:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
jack-fractal
2013-11-17 16:30:42 -05:00
parent 923a969eaf bad8dbf695
commit cf5012ce1d
199 changed files with 16877 additions and 14848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/transform_procs.dm
+8 -3
View File
@@ -235,9 +235,14 @@
O.loc = loc
O.job = "Cyborg"
O.mmi = new /obj/item/device/mmi(O)
O.mmi.transfer_identity(src)//Does not transfer key/client.
if(O.mind.assigned_role == "Cyborg")
if(O.mind.role_alt_title == "Android")
O.mmi = new /obj/item/device/mmi/posibrain(O)
if(O.mind.role_alt_title == "Robot")
O.mmi = new /obj/item/device/mmi/posibrain(O) //Ravensdale wants a circuit based brain for another robot class, this is a placeholder.
else
O.mmi = new /obj/item/device/mmi(O)
O.mmi.transfer_identity(src)//Does not transfer key/client.
O.Namepick()