Additional tweaks

- Now supports Shadowling's Veil ability.
- Fixed lamp button not updating properly when forcibly disabled.
- (Poorly) fixed cyborg eyes not glowing after recovering from a stun.
This commit is contained in:
GunHog
2015-07-18 21:39:31 -05:00
parent 1f7fa1aff1
commit e305dafdfa
4 changed files with 11 additions and 6 deletions
@@ -27,7 +27,7 @@
update_canmove()
if(camera)
camera.status = 0
update_headlamp() //So borg lights are disabled when killed.
update_headlamp(1) //So borg lights are disabled when killed.
uneq_all() // particularly to ensure sight modes are cleared
@@ -30,7 +30,7 @@
else
uneq_all()
stat = UNCONSCIOUS
update_headlamp()
update_headlamp(1)
/mob/living/silicon/robot/handle_regular_status_updates()
@@ -723,7 +723,7 @@
/mob/living/silicon/robot/update_icons()
overlays.Cut()
if(stat == CONSCIOUS)
if(stat != DEAD && !(paralysis || stunned || weakened)) //Not dead, not stunned.
var/state_name = icon_state //For easy conversion and/or different names
switch(icon_state)
if("robot")
@@ -1001,12 +1001,16 @@
update_headlamp()
/mob/living/silicon/robot/proc/update_headlamp()
/mob/living/silicon/robot/proc/update_headlamp(var/turn_off = 0)
SetLuminosity(0)
if(stat && lamp_intensity)
if(lamp_intensity && (turn_off || stat))
src << "<span class='danger'>Your headlamp has been deactivated.</span>"
lamp_intensity = 0
if(client)
var/obj/screen/robot/lamp/button = locate(/obj/screen/robot/lamp) in client.screen
if(button)
button.icon_state = "lamp0"
else
AddLuminosity(lamp_intensity)
update_icons()