Merge pull request #8524 from Kyep/ert_tweak_2018

Small ERT Spawn/Dress Refactor + Unspawned ERT notice
This commit is contained in:
tigercat2000
2018-01-13 09:50:21 -08:00
committed by GitHub
4 changed files with 41 additions and 88 deletions
+20 -2
View File
@@ -1481,10 +1481,28 @@ var/list/robot_verbs_default = list(
radio.recalculateChannels()
aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
/mob/living/silicon/robot/ert/New(loc)
..()
/mob/living/silicon/robot/ert/New(loc, cyborg_unlock)
..(loc)
cell.maxcharge = 25000
cell.charge = 25000
var/rnum = rand(1,1000)
var/borgname = "ERT [rnum]"
name = borgname
custom_name = borgname
real_name = name
mind = new
mind.current = src
mind.original = src
mind.assigned_role = "MODE"
mind.special_role = SPECIAL_ROLE_ERT
if(cyborg_unlock)
crisis = 1
if(!(mind in ticker.minds))
ticker.minds += mind
ticker.mode.ert += mind
/mob/living/silicon/robot/ert/gamma
crisis = 1
/mob/living/silicon/robot/nations
base_icon = "droidpeace"