cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Guti
2024-09-18 18:33:15 +02:00
parent 06a46a237b
commit a3c7599065
19 changed files with 2 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/transform_procs.dm
-9
View File
@@ -170,21 +170,12 @@
O.key = key
O.loc = loc
<<<<<<< HEAD
O.job = "Cyborg"
if(O.mind.assigned_role == "Cyborg")
if(O.mind.role_alt_title == "Robot")
O.mmi = new /obj/item/mmi/digital/posibrain(O)
else if(O.mind.role_alt_title == "Drone")
O.mmi = new /obj/item/mmi/digital/robot(O)
=======
O.job = JOB_CYBORG
if(O.mind.assigned_role == JOB_CYBORG)
if(O.mind.role_alt_title == JOB_ALT_ROBOT)
O.mmi = new /obj/item/mmi/digital/posibrain(O)
else if(O.mind.role_alt_title == JOB_ALT_DRONE)
O.mmi = new /obj/item/mmi/digital/robot(O)
>>>>>>> master
else
O.mmi = new /obj/item/mmi(O)