From 3fe1a9636ac7fcaf9b6c092614612559e39e9e51 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Tue, 4 Mar 2025 01:33:38 +0300
Subject: [PATCH 1/3] you can choose who wins

---
 code/modules/admin/tabs/round_tab.dm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/code/modules/admin/tabs/round_tab.dm b/code/modules/admin/tabs/round_tab.dm
index b443c328eab0..2a8ac0c98ce1 100644
--- a/code/modules/admin/tabs/round_tab.dm
+++ b/code/modules/admin/tabs/round_tab.dm
@@ -149,8 +149,19 @@
 	// trying to end the round before it even starts. bruh
 	if(!SSticker.mode)
 		return
-
-	SSticker.mode.round_finished = MODE_INFESTATION_DRAW_DEATH
+	// BANDAMARINES EDIT START
+	var/who_won = MODE_INFESTATION_DRAW_DEATH
+	if(istype(SSticker.mode, /datum/game_mode/colonialmarines))
+		var/static/list/win_conditions = list(
+			MODE_INFESTATION_X_MAJOR,
+			MODE_INFESTATION_M_MAJOR,
+			MODE_INFESTATION_X_MINOR,
+			MODE_INFESTATION_M_MINOR,
+			MODE_INFESTATION_DRAW_DEATH,
+		)
+		who_won = tgui_input_list(usr, "Какая сторона должна победить?", "End Round", win_conditions, default = MODE_INFESTATION_DRAW_DEATH)
+	SSticker.mode.round_finished = who_won
+	// BANDAMARINES EDIT END
 	message_admins("[key_name(usr)] has made the round end early.")
 	for(var/client/C in GLOB.admins)
 		to_chat(C, {"

From a42a2363899d2563d36311a86571c8ac2aabfa9c Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Tue, 4 Mar 2025 01:40:35 +0300
Subject: [PATCH 2/3] better?

---
 code/modules/admin/tabs/round_tab.dm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/code/modules/admin/tabs/round_tab.dm b/code/modules/admin/tabs/round_tab.dm
index 2a8ac0c98ce1..ffa86192eff1 100644
--- a/code/modules/admin/tabs/round_tab.dm
+++ b/code/modules/admin/tabs/round_tab.dm
@@ -143,12 +143,6 @@
 
 	if(!check_rights(R_SERVER) || !SSticker.mode)
 		return
-
-	if(alert("Are you sure you want to end the round?",,"Yes","No") != "Yes")
-		return
-	// trying to end the round before it even starts. bruh
-	if(!SSticker.mode)
-		return
 	// BANDAMARINES EDIT START
 	var/who_won = MODE_INFESTATION_DRAW_DEATH
 	if(istype(SSticker.mode, /datum/game_mode/colonialmarines))
@@ -160,8 +154,13 @@
 			MODE_INFESTATION_DRAW_DEATH,
 		)
 		who_won = tgui_input_list(usr, "Какая сторона должна победить?", "End Round", win_conditions, default = MODE_INFESTATION_DRAW_DEATH)
-	SSticker.mode.round_finished = who_won
+		if(who_won == null)
+			return
 	// BANDAMARINES EDIT END
+	// trying to end the round before it even starts. bruh
+	if(!SSticker.mode)
+		return
+	SSticker.mode.round_finished = who_won // BANDAMARINES EDIT
 	message_admins("[key_name(usr)] has made the round end early.")
 	for(var/client/C in GLOB.admins)
 		to_chat(C, {"

From d971f1cb4c4e7053215270ec7ae3283e6c85895a Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Tue, 4 Mar 2025 01:41:43 +0300
Subject: [PATCH 3/3] space

---
 code/modules/admin/tabs/round_tab.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/admin/tabs/round_tab.dm b/code/modules/admin/tabs/round_tab.dm
index ffa86192eff1..3a5e7cc4fd04 100644
--- a/code/modules/admin/tabs/round_tab.dm
+++ b/code/modules/admin/tabs/round_tab.dm
@@ -160,6 +160,7 @@
 	// trying to end the round before it even starts. bruh
 	if(!SSticker.mode)
 		return
+
 	SSticker.mode.round_finished = who_won // BANDAMARINES EDIT
 	message_admins("[key_name(usr)] has made the round end early.")
 	for(var/client/C in GLOB.admins)