diff --git a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm index df725db1e60..8b65392a7c5 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm @@ -44,8 +44,9 @@ /obj/structure/destructible/clockwork/massive/ratvar/Bump(atom/A) var/turf/T = get_turf(A) + if(T == loc) + T = get_step(A, A.dir) //please don't run into a window like a bird, ratvar forceMove(T) - T.ratvar_act() /obj/structure/destructible/clockwork/massive/ratvar/Process_Spacemove() return clashing @@ -76,7 +77,7 @@ Something very large and very malevolent begins lumbering its way towards you..." prey << 'sound/effects/ratvar_reveal.ogg' else - if(prob(10) || is_servant_of_ratvar(prey) || prey.z != z) + if((!istype(prey, /obj/singularity/narsie) && prob(10)) || is_servant_of_ratvar(prey) || prey.z != z) prey << "\"How dull. Leave me.\"\n\ You feel tremendous relief as a set of horrible eyes loses sight of you..." prey = null diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 9c11a4289b9..861d73fc89f 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -63,8 +63,10 @@ /obj/singularity/narsie/Bump(atom/A) - forceMove(get_turf(A)) - A.narsie_act() + var/turf/T = get_turf(A) + if(T == loc) + T = get_step(A, A.dir) //please don't slam into a window like a bird, nar-sie + forceMove(T) /obj/singularity/narsie/mezzer()