mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 00:58:26 +01:00
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
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user