From 79f6030ebaaa67762fdc712bfa8b92299d162139 Mon Sep 17 00:00:00 2001 From: tralezab <40974010+tralezab@users.noreply.github.com> Date: Sat, 18 Sep 2021 14:10:20 -0700 Subject: [PATCH] Post Sparring Sect Merge MISTAKE (#61527) I forgot to push one last review, without it there will be like 2 runtimes but no real problem gamewise --- code/datums/components/unbreakable.dm | 2 +- code/datums/elements/tenacious.dm | 2 +- code/modules/religion/sparring/sparring_contract.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/components/unbreakable.dm b/code/datums/components/unbreakable.dm index 8d75c563d57..8261dd6d3cb 100644 --- a/code/datums/components/unbreakable.dm +++ b/code/datums/components/unbreakable.dm @@ -7,8 +7,8 @@ ADD_TRAIT(parent, TRAIT_UNBREAKABLE, INNATE_TRAIT) /datum/component/unbreakable/Destroy(force, silent) - . = ..() REMOVE_TRAIT(parent, TRAIT_UNBREAKABLE, INNATE_TRAIT) + return ..() /datum/component/unbreakable/RegisterWithParent() RegisterSignal(parent, COMSIG_MOB_STATCHANGE, .proc/surge) diff --git a/code/datums/elements/tenacious.dm b/code/datums/elements/tenacious.dm index c917dc7518a..84bc72da597 100644 --- a/code/datums/elements/tenacious.dm +++ b/code/datums/elements/tenacious.dm @@ -17,9 +17,9 @@ ADD_TRAIT(target, TRAIT_TENACIOUS, INNATE_TRAIT) /datum/element/tenacious/Detach(datum/target) - . = ..() UnregisterSignal(target, COMSIG_MOB_STATCHANGE) REMOVE_TRAIT(target, TRAIT_TENACIOUS, INNATE_TRAIT) + return ..() ///signal called by the stat of the target changing /datum/element/tenacious/proc/on_stat_change(mob/living/carbon/human/target, new_stat) diff --git a/code/modules/religion/sparring/sparring_contract.dm b/code/modules/religion/sparring/sparring_contract.dm index 0b7a4d05f2f..51a5fe76780 100644 --- a/code/modules/religion/sparring/sparring_contract.dm +++ b/code/modules/religion/sparring/sparring_contract.dm @@ -24,7 +24,7 @@ QDEL_NULL(signed_by) var/datum/religion_sect/spar/sect = GLOB.religious_sect sect?.existing_contract = null - . = ..() + return ..() /obj/item/sparring_contract/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui)