From 9cdf151a6042a095710449a132623d6d09d4d274 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Sun, 5 Nov 2017 13:06:59 -0500 Subject: [PATCH 1/2] Blobbernauts and spores are no longer killed by blob victory (#32133) * Blobbernauts and spores are no longer killed by blob victory * Update overmind.dm * Update overmind.dm * Update overmind.dm * Update overmind.dm --- code/game/gamemodes/blob/overmind.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index e6cae65c03..2544e1f88a 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -91,10 +91,13 @@ GLOBAL_LIST_EMPTY(blob_nodes) if(!Ablob.blob_allowed) continue - - playsound(L, 'sound/effects/splat.ogg', 50, 1) - L.death() - new/mob/living/simple_animal/hostile/blob/blobspore(T) + + if(!("blob" in L.faction)) + playsound(L, 'sound/effects/splat.ogg', 50, 1) + L.death() + new/mob/living/simple_animal/hostile/blob/blobspore(T) + else + L.fully_heal() for(var/V in GLOB.sortedAreas) var/area/A = V