Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit a57c0d5

Browse files
authored
fixes weird shuttle call timer if shuttle goes over 2 hours but is already called (#22575)
* fixes weird shuttle call * Update shuttle.dm * Update shuttle.dm
1 parent 5d3a006 commit a57c0d5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

code/controllers/subsystem/shuttle.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ SUBSYSTEM_DEF(shuttle)
219219

220220
if(!length(GLOB.joined_player_list)) //if there's nobody actually in the game...
221221
return
222-
222+
var/call_time = SSshuttle.emergency_call_time * SSsecurity_level.current_security_level.shuttle_call_time_mod * SSshuttle.emergency?.engine_coeff
223223
var/threshold = CONFIG_GET(number/emergency_shuttle_autocall_threshold)
224224
if(threshold)
225225
var/alive = 0
@@ -233,16 +233,16 @@ SUBSYSTEM_DEF(shuttle)
233233

234234
if(alive / total <= threshold)
235235
emergency_no_recall = TRUE
236-
if(emergency.timeLeft(1) > ALERT_COEFF_AUTOEVAC_CRITICAL)
236+
if(emergency.timeLeft(1) > call_time)
237237
var/msg = "Automatically dispatching shuttle due to crew death."
238238
message_admins(msg)
239239
log_game("[msg] Alive: [alive], Roundstart: [total], Threshold: [threshold]")
240240
priority_announce("Catastrophic casualties detected: crisis shuttle protocols activated - jamming recall signals across all frequencies.")
241241
emergency.request(null, set_coefficient = ALERT_COEFF_AUTOEVAC_CRITICAL)
242242
return
243-
if(world.time - SSticker.round_start_time >= 2 HOURS) //auto call the shuttle after 2 hours
243+
if(world.time >= 2 HOURS) //auto call the shuttle after 2 hours
244244
emergency_no_recall = TRUE //no recalling after 2 hours
245-
if(emergency.timeLeft(1) > SSsecurity_level.current_security_level.shuttle_call_time_mod)
245+
if(emergency.timeLeft(1) > call_time)
246246
var/msg = "Automatically dispatching shuttle due to lack of shift end response."
247247
message_admins(msg)
248248
priority_announce("Dispatching shuttle due to lack of shift end response.")

0 commit comments

Comments
 (0)