From d42998f6a8a5d01dcc9a7a5fc85c24b1f22420a2 Mon Sep 17 00:00:00 2001
From: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
Date: Wed, 15 Sep 2021 11:15:02 +1000
Subject: [PATCH] Fixes (somehow) killing nar-sie in the last second not
 properly clearing the hostile environment (#61116)

Someone forgot to add GLOB.cult_narsie so I think what would happen is, despite narsie being dead, the shuttle wouldn't leave.

Was a non issue because the round ends if nar nar is last minute killed. There is not enough time for the shuttle to even leave.

That said, unimportant failures are still failures, so let's get going
---
 code/modules/power/singularity/narsie.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 93b14338540..e500f205df3 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -244,6 +244,7 @@
 /proc/narsie_apocalypse()
 	if(QDELETED(GLOB.cult_narsie)) // tres
 		priority_announce("Normalization detected! Abort the solution package!","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
+		SSshuttle.clearHostileEnvironment(GLOB.cult_narsie)
 		GLOB.cult_narsie = null
 		addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_last_second_win), 2 SECONDS)
 		return
@@ -255,7 +256,6 @@
 ///Called only if the crew managed to destroy narsie at the very last second for [/proc/begin_the_end()]
 /proc/narsie_last_second_win()
 	set_security_level("red")
-	SSshuttle.clearHostileEnvironment()
 	SSshuttle.lockdown = FALSE
 	INVOKE_ASYNC(GLOBAL_PROC, .proc/cult_ending_helper, 2)