From 0e6fe357da0f8ca372e3218a894b27f23d75ef72 Mon Sep 17 00:00:00 2001 From: Keate Senior Date: Tue, 28 Jul 2020 04:07:01 -0400 Subject: [PATCH] Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834"" This reverts commit 4b876ef9fb1049bd7e55db5326fa2908adc8799d. yo hol up I gotta see if the confliction is fixed first --- .../antagonists/clockcult/clock_structures/clockwork_obelisk.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm b/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm index f4fa92df78..2b4b797b4d 100644 --- a/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm +++ b/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm @@ -46,7 +46,7 @@ SG.ex_act(EXPLODE_DEVASTATE) return ..() -/obj/structure/destructible/clockwork/powered/clockwork_obelisk/attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags) +/obj/structure/destructible/clockwork/powered/clockwork_obelisk/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags) . = ..() if(.) return