diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm index 2d66739b4e..dbb748ef89 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -235,13 +235,25 @@ sleep(125) make_glow() animate(glow, transform = matrix() * 3, alpha = 0, time = 5) - var/turf/startpoint = get_turf(src) QDEL_IN(src, 3) sleep(3) GLOB.clockwork_gateway_activated = TRUE - var/obj/structure/destructible/clockwork/massive/ratvar/R = new(startpoint) var/turf/T = locate(round(world.maxx * 0.5, 1), round(world.maxy * 0.5, 1), ZLEVEL_STATION_PRIMARY) //approximate center of the station - R.forceMove(T) + new /obj/structure/destructible/clockwork/massive/ratvar(T) + SSticker.force_ending = TRUE + var/x0 = T.x + var/y0 = T.y + for(var/I in spiral_range_turfs(255, T, tick_checked = TRUE)) + var/turf/T2 = I + if(!T2) + continue + var/dist = cheap_hypotenuse(T2.x, T2.y, x0, y0) + if(dist < 100) + dist = TRUE + else + dist = FALSE + T.ratvar_act(dist) + CHECK_TICK diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index e3f7795f64..f77c65225f 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -338,18 +338,11 @@ /mob/living/ratvar_act() if(status_flags & GODMODE) return - if(stat != DEAD && !is_servant_of_ratvar(src)) - for(var/obj/item/implant/mindshield/M in implants) - qdel(M) - if(!add_servant_of_ratvar(src)) - to_chat(src, "A blinding light boils you alive! Run!") - adjustFireLoss(35) - if(src) - adjust_fire_stacks(1) - IgniteMob() - return FALSE - return TRUE + to_chat(src, "A blinding light boils you alive! Run!") + adjust_fire_stacks(20) + IgniteMob() + return FALSE //called when the mob receives a bright flash