From 8f870e960ae6bc3970488a2780a5f3b2b58b7e06 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon, 6 May 2024 21:51:28 +0200 Subject: [PATCH] Removes blobs from the ticker if the core is destroyed, truncates tally text (#25156) * Removes blobs from the ticker if the core is destroyed, truncates counter * Removes the mind instead of the camera mob --------- Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/controllers/subsystem/SSticker.dm | 12 ++++++------ .../modules/events/blob/blob_structures/blob_core.dm | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm index c08699c48ee..e641ed030c4 100644 --- a/code/controllers/subsystem/SSticker.dm +++ b/code/controllers/subsystem/SSticker.dm @@ -852,17 +852,17 @@ SUBSYSTEM_DEF(ticker) if(length(SSticker.mode.blob_overminds)) switch(outcome) if(ROUND_END_NUCLEAR) - SSblackbox.record_feedback("tally", "Biohazard nuclear victories", 1, "Blob") + SSblackbox.record_feedback("tally", "Blob nuclear victories", 1, "Blob") if(ROUND_END_CREW_TRANSFER) - SSblackbox.record_feedback("tally", "Biohazard survives to normal round end", 1, "Blob") + SSblackbox.record_feedback("tally", "Blob survives to normal round end", 1, "Blob") if(ROUND_END_FORCED) - SSblackbox.record_feedback("tally", "Biohazard survives to admin round end", 1, "Blob") + SSblackbox.record_feedback("tally", "Blob survives to admin round end", 1, "Blob") else switch(outcome) if(ROUND_END_NUCLEAR) - SSblackbox.record_feedback("tally", "Biohazard dies station nuked", 1, "Blob") + SSblackbox.record_feedback("tally", "Blob dies station nuked", 1, "Blob") if(ROUND_END_CREW_TRANSFER) - SSblackbox.record_feedback("tally", "Biohazard dies normal end", 1, "Blob") + SSblackbox.record_feedback("tally", "Blob dies normal end", 1, "Blob") if(ROUND_END_FORCED) - SSblackbox.record_feedback("tally", "Biohazard dies admin round end", 1, "Blob") + SSblackbox.record_feedback("tally", "Blob dies admin round end", 1, "Blob") diff --git a/code/modules/events/blob/blob_structures/blob_core.dm b/code/modules/events/blob/blob_structures/blob_core.dm index 4d1f4f8a784..826f4155f39 100644 --- a/code/modules/events/blob/blob_structures/blob_core.dm +++ b/code/modules/events/blob/blob_structures/blob_core.dm @@ -38,6 +38,8 @@ /obj/structure/blob/core/Destroy() if(overmind) + if(overmind.mind) + SSticker.mode.blob_overminds -= overmind.mind overmind.blob_core = null overmind = null STOP_PROCESSING(SSobj, src)