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

Change Flockmind death condition #143

Merged
merged 3 commits into from
Apr 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions code/mob/living/intangible/flock/flockmind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,14 @@

/mob/living/intangible/flock/flockmind/Life(datum/controller/process/mobs/parent)
if (..(parent))
return 1
if (src.started && src.flock && src.flock.total_compute() <= 0)
src.death() // get rekt
return TRUE
if (src.started && src.flock)
if (src.flock.getComplexDroneCount())
return
for (var/obj/flock_structure/s in src.flock.structures)
if (istype(s, /obj/flock_structure/egg) || istype(s, /obj/flock_structure/rift))
return
src.death()

/mob/living/intangible/flock/flockmind/proc/spawnEgg()
if(src.flock)
Expand Down
1 change: 0 additions & 1 deletion code/obj/flock/structure/egg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
flock_id = "Second-Stage Assembler"
build_time = 6
health = 30 // fragile little thing
compute = 1 //just to make sure that you don't die seconds before a drone hatches
var/decal_made = 0 // for splashing stuff on throw

/obj/flock_structure/egg/New(var/atom/location, var/datum/flock/F=null)
Expand Down
1 change: 0 additions & 1 deletion code/obj/flock/structure/rift.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
flock_id = "Entry Rift"
build_time = 10
health = 200 // stronk little thing
compute = 5
var/decal_made = 0 // for splashing stuff on throw
var/list/eject = list()
var/mainflock = null // for when a flockmind is spawning the little shits(read:drones) get assigned to it
Expand Down