From e4b2f8d870af8bad8936063566c68c96e0a52b7c Mon Sep 17 00:00:00 2001 From: Meisaka Yukara Date: Thu, 21 Apr 2016 11:23:08 +0900 Subject: [PATCH] Fix the light toggles on drones and guardians. --- code/game/gamemodes/miniantags/guardian/guardian.dm | 8 +++++--- .../mob/living/silicon/robot/drone/drone_abilities.dm | 7 +++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index b987f2eb6f6..cf99940da0f 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -29,6 +29,8 @@ var/summoned = FALSE var/cooldown = 0 var/damage_transfer = 1 //how much damage from each attack we transfer to the owner + var/light_on = 0 + var/luminosity_on = 3 var/mob/living/summoner var/range = 10 //how far from the user the spirit can be var/playstyle_string = "You are a standard Guardian. You shouldn't exist!" @@ -202,13 +204,13 @@ /mob/living/simple_animal/hostile/guardian/proc/ToggleLight() - if(!luminosity) - set_light(3) + if(!light_on) + set_light(luminosity_on) to_chat(src, "You activate your light.") else set_light(0) to_chat(src, "You deactivate your light.") - + light_on = !light_on //////////////////////////TYPES OF GUARDIANS diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm index 305c89e87cb..151fc6de51d 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm @@ -38,10 +38,9 @@ set desc = "Activate a low power omnidirectional LED. Toggled on or off." set category = "Drone" - if(luminosity) - set_light(0) - return - set_light(2) + if(lamp_intensity) + lamp_intensity = lamp_max // setting this to lamp_max will make control_headlamp shutoff the lamp + control_headlamp() //Actual picking-up event. /mob/living/silicon/robot/drone/attack_hand(mob/living/carbon/human/M as mob)