From ac8a61aca4d587d40cbea9d2ddad4dd18a644721 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 18 Jul 2016 18:59:58 -0400 Subject: [PATCH] Clockcult tweaks (#19357) * Clockcult tweaks * sea * lake --- code/game/gamemodes/clock_cult/clock_ratvar.dm | 5 +++-- .../living/simple_animal/friendly/drone/extra_drone_types.dm | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_ratvar.dm b/code/game/gamemodes/clock_cult/clock_ratvar.dm index ed929947504..c8a931403b2 100644 --- a/code/game/gamemodes/clock_cult/clock_ratvar.dm +++ b/code/game/gamemodes/clock_cult/clock_ratvar.dm @@ -75,7 +75,8 @@ glow.linked = src /obj/structure/clockwork/massive/celestial_gateway/ex_act(severity) - return 0 //Nice try, Toxins! + var/damage = max((health * 0.70) / severity, 100) //requires multiple bombs to take down + take_damage(damage, BRUTE) /obj/structure/clockwork/massive/celestial_gateway/process() if(!progress_in_seconds || prob(7)) @@ -175,7 +176,7 @@ var/image/alert_overlay = image('icons/effects/clockwork_effects.dmi', "ratvar_alert") var/area/A = get_area(src) notify_ghosts("The Justiciar's light calls to you! Reach out to Ratvar in [A.name] to be granted a shell to spread his glory!", null, source = src, alert_overlay = alert_overlay) - addtimer(SSshuttle.emergency, "request", 50, FALSE, null, 0.3) + addtimer(SSshuttle.emergency, "request", 50, FALSE, null, 0.1) /obj/structure/clockwork/massive/ratvar/Destroy() diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 9fbe6e4cfbb..d9624ff171b 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -97,8 +97,9 @@ picked = TRUE languages_spoken = RATVAR languages_understood = HUMAN|RATVAR - health = 60 - maxHealth = 60 + pass_flags = PASSTABLE + health = 50 + maxHealth = 50 hacked = 1 density = TRUE ventcrawler = 0