Roundend and Shuttle Recall fixes
Fixed roundend error due to fatness permanence saving Fixed vote shuttle not being recallable by admins
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user