Merge pull request #458 from Markolie/master

Magistrate/Psych Office shutter fixes, telescience console UI update, camera fixes, borg movement fix, security windoor fix, CentComm identification computer fix, locker fixes
This commit is contained in:
Fox-McCloud
2014-11-06 03:18:14 -05:00
9 changed files with 185 additions and 161 deletions
@@ -37,7 +37,8 @@
if (is_component_functioning("power cell") && cell)
if(src.cell.charge <= 0)
uneq_all()
src.stat = 1
src.stat = 1
Paralyse(3)
else
if(src.module_state_1)
src.cell.use(3)
@@ -56,7 +57,8 @@
src.stat = 0
else
uneq_all()
src.stat = 1
src.stat = 1
Paralyse(3)
/mob/living/silicon/robot/proc/handle_regular_status_updates()
@@ -129,12 +131,12 @@
if (src.stat != 0)
uneq_all()
if(!is_component_functioning("radio"))
if(!is_component_functioning("radio") || src.stat == 1)
radio.on = 0
else
radio.on = 1
if(is_component_functioning("camera"))
if(is_component_functioning("camera") && src.stat == 0)
src.blinded = 0
else
src.blinded = 1
@@ -23,4 +23,9 @@
return tally+config.robot_delay
/mob/living/silicon/robot/Move()
..()
if (!is_component_functioning("actuator") || !is_component_functioning("power cell") || !cell)
return
else
if (src.cell.charge > 0)
..()