shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various fixes to make the PR not conflict with clickdelays probably

Browse Source
This commit is contained in:
Keate Senior
2020-07-28 23:52:13 -04:00
parent 9a129d8683
commit 5284fbbec0
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm
+1 -1
View File
@@ -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
code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/selection_timer //Timer ID; this is canceled if the vote is canceled
var/kingmaking
/obj/structure/destructible/clockwork/eminence_spire/attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
/obj/structure/destructible/clockwork/eminence_spire/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
. = ..()
if(.)
return
code/modules/antagonists/clockcult/clock_structures/prolonging_prism.dm
+1 -1
View File
@@ -37,7 +37,7 @@
toggle()
return TRUE
/obj/structure/destructible/clockwork/powered/prolonging_prism/attack_hand(mob/living/user)
/obj/structure/destructible/clockwork/powered/prolonging_prism/on_attack_hand(mob/living/user)
if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY) && is_servant_of_ratvar(user))
if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE)
to_chat(user, "<span class='brass'>You break [src] apart, refunding some of the power used.</span>")