mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-29 06:58:30 +01:00
Merge branch 'master' into morespans
This commit is contained in:
@@ -25,6 +25,6 @@ var/datum/controller/transfer_controller/transfer_controller
|
||||
shift_hard_end = timerbuffer + config.vote_autotransfer_interval //If shuttle somehow gets recalled, let's force it to call again next time a vote would occur.
|
||||
timerbuffer = timerbuffer + config.vote_autotransfer_interval //Just to make sure a vote doesn't occur immediately afterwords.
|
||||
else if (round_duration_in_ds >= timerbuffer - 1 MINUTE)
|
||||
new /datum/vote/crew_transfer
|
||||
SSvote.start_vote(new /datum/vote/crew_transfer)
|
||||
//VOREStation Edit END
|
||||
timerbuffer = timerbuffer + config.vote_autotransfer_interval
|
||||
|
||||
@@ -121,7 +121,7 @@ SUBSYSTEM_DEF(throwing)
|
||||
//calculate how many tiles to move, making up for any missed ticks.
|
||||
var/tilestomove = CEILING(min(((((world.time+world.tick_lag) - start_time + delayed_time) * speed) - (dist_travelled ? dist_travelled : -1)), speed*MAX_TICKS_TO_MAKE_UP) * (world.tick_lag * SSthrowing.wait), 1)
|
||||
while (tilestomove-- > 0)
|
||||
if ((dist_travelled >= maxrange || AM.loc == target_turf) && (A && A.has_gravity()))
|
||||
if ((dist_travelled >= maxrange || AM.loc == target_turf) && (A && A.get_gravity()))
|
||||
finalize()
|
||||
return
|
||||
|
||||
|
||||
@@ -226,7 +226,7 @@ var/global/datum/controller/subsystem/ticker/ticker
|
||||
mode.cleanup()
|
||||
//call a transfer shuttle vote
|
||||
to_world(span_danger("The round has ended!"))
|
||||
new /datum/vote/crew_transfer
|
||||
SSvote.start_vote(new /datum/vote/crew_transfer)
|
||||
|
||||
// Called during GAME_STATE_FINISHED (RUNLEVEL_POSTGAME)
|
||||
/datum/controller/subsystem/ticker/proc/post_game_tick()
|
||||
|
||||
Reference in New Issue
Block a user