Merge remote-tracking branch 'Aurorastation/master' into modular_computer_enhancement

This commit is contained in:
Geevies
2020-04-15 20:07:44 +02:00
10 changed files with 64 additions and 9 deletions
@@ -389,8 +389,8 @@ Command action procs
to_chat(user, SPAN_WARNING("The emergency shuttle cannot be sent at this time. Please try again later."))
return FALSE
if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE
to_chat(user, SPAN_WARNING("The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minute\s before trying again."))
if(world.time < config.time_to_call_emergency_shuttle)
to_chat(user, "The emergency shuttle is refueling. Please wait another [round((config.time_to_call_emergency_shuttle-world.time)/600)] minute\s before trying again.")
return 0
if(emergency_shuttle.going_to_centcom())