Skip to content
This repository has been archived by the owner on May 30, 2022. It is now read-only.

Fixes flockmind being unable to act while partitioning #193

Merged
merged 2 commits into from
Apr 19, 2022
Merged

Fixes flockmind being unable to act while partitioning #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
304fad7
Fixed flockmind being unable to act while partitioning
TobleroneSwordfish Apr 18, 2022
a125fe9
Fixed partition messages
TobleroneSwordfish Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions code/datums/abilities/flock/flockmind.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,21 @@
icon_state = "awaken_drone"
cooldown = 60 SECONDS
targeted = 0
///Are we still waiting for ghosts to respond
var/waiting = FALSE

/datum/targetable/flockmindAbility/partitionMind/cast(atom/target)
if(..())
if(waiting || ..())
return TRUE

if(!holder.pointCheck(100))
return TRUE

var/mob/living/intangible/flock/flockmind/F = holder.owner

return F.partition()
waiting = TRUE
SPAWN(0)
F.partition()
waiting = FALSE

/////////////////////////////////////////

Expand Down
4 changes: 2 additions & 2 deletions code/mob/living/intangible/flock/flockmind.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@


/mob/living/intangible/flock/flockmind/proc/partition()
boutput(src, "<span class='notice'>Partitioning initiated. Stand by.</span>")
boutput(src, "<span class='flocksay'>Partitioning initiated. Stand by.</span>")

var/ghost_confirmation_delay = 30 SECONDS

Expand All @@ -138,7 +138,7 @@
if (!length(candidates))
message_admins("No ghosts responded to a Flocktrace offer from [src.real_name]")
logTheThing("admin", null, null, "No ghosts responded to Flocktrace offer from [src.real_name]")
boutput(src, "<span class='alert'>Unable to partition, please try again later.</span>")
boutput(src, "<span class='flocksay'>Partition failure: unable to coalesce sentience.</span>")
return TRUE

var/mob/picked = pick(candidates)
Expand Down