cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Gets Rid of Both Sleeps In Transit Tubes, Replaces Them With Timers (#3412)

Browse Source 
* Gets Rid of Both Sleeps In Transit Tubes, Replaces Them With Timers (#56913)

* Gets Rid of Both Sleeps In Transit Tubes, Replaces Them With Timers

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
This commit is contained in:
SkyratBot
2021-02-16 00:47:39 +00:00
committed by GitHub
co-authored by Kylerace
parent 58a0e6ec31
commit 923112633e
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+30 -18
View File
@@ -1,3 +1,6 @@
#define MOVE_ANIMATION_STAGE_ONE 1
#define MOVE_ANIMATION_STAGE_TWO 2
/obj/structure/transit_tube_pod
icon = 'icons/obj/atmospherics/pipes/transit_tube.dmi'
icon_state = "pod"
@@ -7,6 +10,12 @@
var/moving = FALSE
var/datum/gas_mixture/air_contents = new()
var/occupied_icon_state = "pod_occupied"
var/obj/structure/transit_tube/current_tube = null
var/next_dir
var/next_loc
var/enter_delay = 0
var/exit_delay
var/moving_time = 0
/obj/structure/transit_tube_pod/Initialize()
@@ -104,28 +113,22 @@
moving = TRUE
var/obj/structure/transit_tube/current_tube = null
var/next_dir
var/next_loc
var/last_delay = 0
var/exit_delay
for(var/obj/structure/transit_tube/tube in loc)
if(tube.has_exit(dir))
current_tube = tube
break
while(current_tube)
move_animation(MOVE_ANIMATION_STAGE_ONE)
///timer loop that handles the pod moving from tube to tube
/obj/structure/transit_tube_pod/proc/move_animation(stage = MOVE_ANIMATION_STAGE_ONE)
if(stage == MOVE_ANIMATION_STAGE_ONE)
next_dir = current_tube.get_exit(dir)
if(!next_dir)
break
return
exit_delay = current_tube.exit_delay(src, dir)
last_delay += exit_delay
sleep(exit_delay)
next_loc = get_step(loc, next_dir)
current_tube = null
@@ -137,19 +140,25 @@
if(current_tube == null)
setDir(next_dir)
Move(get_step(loc, dir), dir, DELAY_TO_GLIDE_SIZE(exit_delay)) // Allow collisions when leaving the tubes.
break
return
last_delay = current_tube.enter_delay(src, next_dir)
sleep(last_delay)
enter_delay = current_tube.enter_delay(src, next_dir)
if(enter_delay > 0)
addtimer(CALLBACK(src, .proc/move_animation, MOVE_ANIMATION_STAGE_TWO), enter_delay)
return
else
stage = MOVE_ANIMATION_STAGE_TWO
if(stage == MOVE_ANIMATION_STAGE_TWO)
setDir(next_dir)
set_glide_size(DELAY_TO_GLIDE_SIZE(last_delay + exit_delay))
set_glide_size(DELAY_TO_GLIDE_SIZE(enter_delay + exit_delay))
forceMove(next_loc) // When moving from one tube to another, skip collision and such.
density = current_tube.density
if(current_tube?.should_stop_pod(src, next_dir))
current_tube.pod_stopped(src, dir)
break
else
addtimer(CALLBACK(src, .proc/move_animation, MOVE_ANIMATION_STAGE_ONE), exit_delay)
return
density = TRUE
moving = FALSE
@@ -220,3 +229,6 @@
/obj/structure/transit_tube_pod/dispensed/outside_tube()
qdel(src)
#undef MOVE_ANIMATION_STAGE_ONE
#undef MOVE_ANIMATION_STAGE_TWO