Skip to content

Commit

Permalink
fixes nif hivemind
Browse files Browse the repository at this point in the history
  • Loading branch information
KnigTheThrasher committed Aug 19, 2024
1 parent 027e56a commit 8c8727d
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion code/datums/components/mind_linker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,16 @@
linker_action.Grant(owner)
else
stack_trace("[type] was created without a valid linker_action_path. No one will be able to link to it.")

/*
master_speech = new(src)
master_speech.Grant(owner)
*/

//MONKESTATION EDIT - NIFs
if(speech_action)
master_speech = new(src)
master_speech.Grant(owner)
//MONKESTATION EDIT END

to_chat(owner, span_boldnotice("You establish a [network_name], allowing you to link minds to communicate telepathically."))

Expand Down Expand Up @@ -99,10 +106,20 @@
/datum/component/mind_linker/proc/link_mob(mob/living/to_link)
if(QDELETED(to_link) || to_link.stat == DEAD)
return FALSE
/*
if(HAS_TRAIT(to_link, TRAIT_MINDSHIELD)) // Mindshield implant - no dice
return FALSE
if(to_link.can_block_magic(MAGIC_RESISTANCE_MIND, charge_cost = 0))
return FALSE
*/

//MONKESTATION EDIT START
if(HAS_TRAIT(to_link, TRAIT_MINDSHIELD) && linking_protection) // Mindshield implant - no dice
return FALSE
if(to_link.can_block_magic(MAGIC_RESISTANCE_MIND, charge_cost = 0) && linking_protection)
return FALSE
//MONKESTATION EDIT END

if(linked_mobs[to_link])
return FALSE

Expand Down

0 comments on commit 8c8727d

Please sign in to comment.