From 70de1c7076df6d5294d08d0bc4746178faa30f4e Mon Sep 17 00:00:00 2001
From: Alphas00 <154434082+Alphas00@users.noreply.github.com>
Date: Sun, 8 Dec 2024 19:33:37 +0100
Subject: [PATCH] Roundend and Shuttle Recall fixes

Fixed roundend error due to fatness permanence saving
Fixed vote shuttle not being recallable by admins
---
 GainStation13/code/mechanics/permanent_fat.dm | 4 ++--
 code/__HELPERS/roundend.dm                    | 7 -------
 code/controllers/subsystem/shuttle.dm         | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/GainStation13/code/mechanics/permanent_fat.dm b/GainStation13/code/mechanics/permanent_fat.dm
index 91a0f3f950..7a26daa980 100644
--- a/GainStation13/code/mechanics/permanent_fat.dm
+++ b/GainStation13/code/mechanics/permanent_fat.dm
@@ -32,7 +32,7 @@
 			var/mob/living/carbon/C = m
 			if(C)
 				C.perma_fat_save(C)
-	..()
+	. = ..()
 
 /obj/machinery/cryopod/despawn_occupant()
 	var/mob/living/mob_occupant = occupant
@@ -40,7 +40,7 @@
 		var/mob/living/carbon/C = mob_occupant
 		if(C)
 			C.perma_fat_save(C)
-	..()
+	. = ..()
 
 /*
 /datum/preferences/proc/perma_fat_save(character)
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index ca5164b9b8..0c63374ad0 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -5,13 +5,6 @@
 #define SERVER_LAST_ROUND "server last round"
 
 /datum/controller/subsystem/ticker/proc/gather_roundend_feedback()
-	//GS13 Process permanent fat
-	for(var/mob/m in GLOB.player_list)
-		if(iscarbon(m))
-			var/mob/living/carbon/C = m
-			if(C)
-				C.perma_fat_save(C)
-
 	gather_antag_data()
 	record_nuke_disk_location()
 	var/json_file = file("[GLOB.log_directory]/round_end_data.json")
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 42617e2661..2cfc6f216f 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -668,7 +668,7 @@ SUBSYSTEM_DEF(shuttle)
 		priority_announce("The shift has come to an end and the shuttle called. [GLOB.security_level == SEC_LEVEL_RED ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [emergency.timeLeft(600)] minutes.", null, "shuttlecalled", "Priority")
 		log_game("Round end vote passed. Shuttle has been auto-called.")
 		message_admins("Round end vote passed. Shuttle has been auto-called.")
-	emergencyNoRecall = TRUE
+	//emergencyNoRecall = TRUE	//GS13 Edit - To ensure admins can recall vote-called shuttle this assignment will be skipped
 	endvote_passed = TRUE
 
 /datum/controller/subsystem/shuttle/proc/action_load(datum/map_template/shuttle/loading_template, obj/docking_port/stationary/destination_port, replace = FALSE)