cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[s] Assimilation oversights (#40519)

Browse Source 
* oof

* it can't be this dumb, right?

* hivemind hosts can't be assim objectives

* 1 am compiles

* eh
This commit is contained in:
Kierany9
2018-09-29 03:09:57 +03:00
committed by vuonojenmustaturska
parent 1ede4a0c50
commit bb1e45b165
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/hivemind/hivemind.dm
+2 -2
View File
@@ -131,8 +131,8 @@
assim_objective.owner = owner
if(prob(25)) //Decently high chance to have to assimilate an implanted crew member
assim_objective.find_target_by_role(pick("Captain","Head of Security","Security Officer","Detective","Warden"))
if(!assim_objective.target) //If the prob doesn't happen or there are no implanted crew, find any target
assim_objective.find_target()
if(!assim_objective.target) //If the prob doesn't happen or there are no implanted crew, find any target that isn't a hivemmind host
assim_objective.find_target_by_role(role = ROLE_HIVE, role_type = 1, invert = 1)
assim_objective.update_explanation_text()
objectives += assim_objective
else if(prob(70))
code/modules/spells/spell_types/hivemind.dm
+7 -7
View File
@@ -291,13 +291,6 @@
else
power = 1200
charge_max = 1200
for(var/datum/antagonist/hivemind/H in GLOB.antagonists)
if(H.owner == user.mind)
continue
if(H.hivemembers.Find(vessel))
to_chat(user, "<span class='danger'>We have detected a foreign presence within this mind, it would be unwise to merge so intimately with it.</span>")
revert_cast()
return
original_body = user
vessel = targets[1]
to_chat(user, "<span class='notice'>We begin merging our mind with [vessel.name].</span>")
@@ -309,6 +302,13 @@
to_chat(user, "<span class='notice'>Our vessel is too far away to control.</span>")
revert_cast()
return
for(var/datum/antagonist/hivemind/H in GLOB.antagonists)
if(H.owner == user.mind)
continue
if(H.owner == vessel.mind)
to_chat(user, "<span class='danger'>We have detected a foreign presence within this mind, it would be unwise to merge so intimately with it.</span>")
revert_cast()
return
backseat = new /mob/living/passenger()
if(vessel && vessel.mind && backseat)
var/obj/effect/proc_holder/spell/target_hive/hive_see/the_spell = locate(/obj/effect/proc_holder/spell/target_hive/hive_see) in user.mind.spell_list