Skip to content

Commit

Permalink
[MIRROR] Fixes cyborged heretics seeing influences [MDB IGNORE] (#820)
Browse files Browse the repository at this point in the history
* Fixes cyborged heretics seeing influences (#79868)

---------

Co-authored-by: SkyratBot <[email protected]>
Co-authored-by: Nathan Singer <[email protected]>
Co-authored-by: Bloop <[email protected]>
  • Loading branch information
4 people authored Nov 26, 2023
1 parent 8585494 commit 29d49fa
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions code/datums/mind/antag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
var/datum/antagonist/rev/revolutionary = has_antag_datum(/datum/antagonist/rev)
revolutionary?.remove_revolutionary()


/**
* ## give_uplink
*
Expand Down
9 changes: 7 additions & 2 deletions code/modules/antagonists/heretic/heretic_antag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
for(var/starting_knowledge in GLOB.heretic_start_knowledge)
gain_knowledge(starting_knowledge)

GLOB.reality_smash_track.add_tracked_mind(owner)

addtimer(CALLBACK(src, PROC_REF(passive_influence_gain)), passive_gain_timer) // Gain +1 knowledge every 20 minutes.
return ..()

Expand All @@ -213,7 +213,6 @@
var/datum/heretic_knowledge/knowledge = researched_knowledge[knowledge_index]
knowledge.on_lose(owner.current, src)

GLOB.reality_smash_track.remove_tracked_mind(owner)
QDEL_LIST_ASSOC_VAL(researched_knowledge)
return ..()

Expand All @@ -222,6 +221,9 @@
handle_clown_mutation(our_mob, "Ancient knowledge described to you has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
our_mob.faction |= FACTION_HERETIC

if (!issilicon(our_mob))
GLOB.reality_smash_track.add_tracked_mind(owner)

RegisterSignals(our_mob, list(COMSIG_MOB_BEFORE_SPELL_CAST, COMSIG_MOB_SPELL_ACTIVATED), PROC_REF(on_spell_cast))
RegisterSignal(our_mob, COMSIG_MOB_ITEM_AFTERATTACK, PROC_REF(on_item_afterattack))
RegisterSignal(our_mob, COMSIG_MOB_LOGIN, PROC_REF(fix_influence_network))
Expand All @@ -233,6 +235,9 @@
handle_clown_mutation(our_mob, removing = FALSE)
our_mob.faction -= FACTION_HERETIC

if (owner in GLOB.reality_smash_track.tracked_heretics)
GLOB.reality_smash_track.remove_tracked_mind(owner)

UnregisterSignal(our_mob, list(
COMSIG_MOB_BEFORE_SPELL_CAST,
COMSIG_MOB_SPELL_ACTIVATED,
Expand Down

0 comments on commit 29d49fa

Please sign in to comment.