diff --git a/code/modules/mob/living/simple_animal/revenant/revenant.dm b/code/modules/mob/living/simple_animal/revenant/revenant.dm index 21a646a6563..c89969aabac 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant.dm @@ -39,8 +39,8 @@ var/essence_regen_amount = 5 //How much essence regenerates var/essence_accumulated = 0 //How much essence the revenant has stolen var/revealed = 0 //If the revenant can take damage from normal sources. - var/reveal_duration = 0 //How long the revenant is revealed for, is about 2 seconds times this var. - var/stun_duration = 0 //How long the revenant is stunned for, is about 2 seconds times this var. + var/unreveal_time = 0 //How long the revenant is revealed for, is about 2 seconds times this var. + var/unstun_time = 0 //How long the revenant is stunned for, is about 2 seconds times this var. var/inhibited = 0 //If the revenant's abilities are blocked by a chaplain's power. var/essence_drained = 0 //How much essence the revenant will drain from the corpse it's feasting on. var/draining = 0 //If the revenant is draining someone. @@ -50,19 +50,15 @@ /mob/living/simple_animal/revenant/Life() if(revealed && essence <= 0) death() - if(reveal_duration) - reveal_duration -- - if(reveal_duration <= 0) - reveal_duration = 0 - revealed = 0 - invisibility = INVISIBILITY_REVENANT - src << "You are once more concealed." - if(stun_duration) - stun_duration -- - if(stun_duration <= 0) - stun_duration = 0 - notransform = 0 - src << "You can move again!" + if(unreveal_time && world.time >= unreveal_time) + unreveal_time = 0 + revealed = 0 + invisibility = INVISIBILITY_REVENANT + src << "You are once more concealed." + if(unstun_time && world.time >= unstun_time) + unstun_time = 0 + notransform = 0 + src << "You can move again!" if(essence_regenerating && !inhibited && essence < essence_regen_cap) //While inhibited, essence will not regenerate essence = min(essence_regen_cap, essence+essence_regen_amount) @@ -74,11 +70,11 @@ return revealed = 1 invisibility = 0 - if(!reveal_duration) + if(!unreveal_time) src << "You have been revealed!" else src << "You have been revealed!" - reveal_duration += time + unreveal_time = world.time + time /mob/living/simple_animal/revenant/proc/stun(time) if(!src) @@ -86,12 +82,11 @@ if(time <= 0) return notransform = 1 - if(!stun_duration) + if(!unstun_time) src << "You cannot move!" else src << "You cannot move!" - stun_duration += time - + unstun_time = world.time + time /mob/living/simple_animal/revenant/ex_act(severity, target) return 1 //Immune to the effects of explosions. @@ -162,8 +157,8 @@ if(target.stat != DEAD) target << "You feel a horribly unpleasant draining sensation as your grip on life weakens..." icon_state = "revenant_draining" - reveal(3) - stun(3) + reveal(30) + stun(30) target.visible_message("[target] suddenly rises slightly into the air, their skin turning an ashy gray.") target.Beam(src,icon_state="drain_life",icon='icons/effects/effects.dmi',time=30) if(target && in_range(src, target)) //As one cannot prove the existance of ghosts, ghosts cannot prove the existance of the target they were draining. diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm index 59fd7278f9c..d4ec045926e 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm @@ -31,8 +31,8 @@ range = 5 var/shock_range = 1 var/shock_damage = 20 - var/reveal = 8 - var/stun = 2 + var/reveal = 80 + var/stun = 40 var/locked = 1 action_icon_state = "overload_lights" action_background_icon_state = "bg_revenant" @@ -86,8 +86,8 @@ charge_max = 200 clothes_req = 0 range = 3 - var/reveal = 6 - var/stun = 2 + var/reveal = 80 + var/stun = 20 var/locked = 1 action_icon_state = "defile" action_background_icon_state = "bg_revenant" @@ -139,8 +139,8 @@ charge_max = 250 clothes_req = 0 range = 4 - var/reveal = 4 - var/stun = 2 + var/reveal = 80 + var/stun = 20 var/locked = 1 action_icon_state = "malfunction" action_background_icon_state = "bg_revenant"