From 2f657009133770a44f32ab8667e768c9f4f454f6 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Wed, 7 Aug 2019 06:12:14 +0200 Subject: [PATCH 1/2] Fixes clock cult Abscond. --- .../antagonists/clockcult/clock_scriptures/scripture_drivers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm index 510c279f3c..6d6b1fa9d0 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm @@ -224,7 +224,7 @@ . = ..() /datum/clockwork_scripture/abscond/scripture_effects() - var/mob/living/pulled_mob = invoker.pulling && isliving(invoker.pulling) && get_clockwork_power(ABSCOND_ABDUCTION_COST) + var/mob/living/pulled_mob = (invoker.pulling && isliving(invoker.pulling) && get_clockwork_power(ABSCOND_ABDUCTION_COST)) ? invoker.pulling : null var/turf/T if(GLOB.ark_of_the_clockwork_justiciar) T = get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) From 9e41731ed1b09f62f5b13916c2c425bd6291e95e Mon Sep 17 00:00:00 2001 From: Ghommie Date: Wed, 7 Aug 2019 21:35:15 +0200 Subject: [PATCH 2/2] Fixes cult runes teleporting you from the source turf to the source turf. --- code/modules/antagonists/cult/runes.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index bbab86729b..a69694ced9 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -433,12 +433,12 @@ structure_check() searches for nearby cultist structures required for the invoca continue if(!A.anchored) movedsomething = TRUE - if(do_teleport(A, T, forceMove = TRUE, channel = TELEPORT_CHANNEL_CULT)) + if(do_teleport(A, target, forceMove = TRUE, channel = TELEPORT_CHANNEL_CULT)) movesuccess = TRUE if(movedsomething) ..() if(moveuserlater) - if(do_teleport(user, T, channel = TELEPORT_CHANNEL_CULT)) + if(do_teleport(user, target, channel = TELEPORT_CHANNEL_CULT)) movesuccess = TRUE if(movesuccess) visible_message("There is a sharp crack of inrushing air, and everything above the rune disappears!", null, "You hear a sharp crack.")