From 9cf17fbc2eafe64934bcec0fa17cae3ca4bf1dda Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sun, 19 Dec 2021 22:54:45 +0100
Subject: [PATCH] [MIRROR] pirate scrambler will cancel out if you don't say
 yes [MDB IGNORE] (#10131)

* pirate scrambler will cancel out if you don't say yes (#63468)

* pirate scrambler will cancel out if you don't say yes

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
---
 code/modules/events/pirates.dm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index 83e6c66a239..b11d93aadf0 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -186,16 +186,17 @@
 	START_PROCESSING(SSobj,src)
 
 /obj/machinery/shuttle_scrambler/interact(mob/user)
-	if(!active)
-		if(tgui_alert(user, "Turning the scrambler on will make the shuttle trackable by GPS. Are you sure you want to do it?", "Scrambler", list("Yes", "Cancel")) == "Cancel")
-			return
-		if(active || !user.canUseTopic(src, BE_CLOSE))
-			return
-		toggle_on(user)
-		update_appearance()
-		send_notification()
-	else
+	if(active)
 		dump_loot(user)
+		return
+	var/scramble_response = tgui_alert(user, "Turning the scrambler on will make the shuttle trackable by GPS. Are you sure you want to do it?", "Scrambler", list("Yes", "Cancel"))
+	if(scramble_response != "Yes")
+		return
+	if(active || !user.canUseTopic(src, BE_CLOSE))
+		return
+	toggle_on(user)
+	update_appearance()
+	send_notification()
 
 //interrupt_research
 /obj/machinery/shuttle_scrambler/proc/interrupt_research()