cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Turbo fix for holodecks not clearing previous programs under live server lag (#3003)

Browse Source 
* Turbo fix for holodecks not clearing previous programs under live server lag (#56566)

Fixes #56561
the holodeck control console now returns if the previous program still has not finished loading in, so it should now be impossible to have two concurrent load_program() processes running at the same time and thus programs should not overlap under lag. tested locally with around 80% time dilation and 0 holodeck cooldown while spamming the fuck out of loading simulations

* Turbo fix for holodecks not clearing previous programs under live server lag

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
This commit is contained in:
SkyratBot
2021-02-01 13:24:53 +00:00
committed by GitHub
co-authored by Kylerace
parent 1d066c9dcf
commit 08ec8bbadc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/computer.dm
+6 -1
View File
@@ -43,6 +43,9 @@ and clear when youre done! if you dont i will use :newspaper2: on you
///bottom left corner of the loading room, used for placing
var/turf/bottom_left
///if TRUE the holodeck is busy spawning another simulation and should immediately stop loading the newest one
var/spawning_simulation = FALSE
//old vars
///the area that this holodeck loads templates into, used for power and deleting holo objects that leave it
@@ -186,7 +189,7 @@ and clear when youre done! if you dont i will use :newspaper2: on you
map_id = offline_program
force = TRUE
if (!COOLDOWN_FINISHED(src, holodeck_cooldown) && !force)
if ((!COOLDOWN_FINISHED(src, holodeck_cooldown) && !force) || spawning_simulation)
say("ERROR. Recalibrating projection apparatus.")
return
@@ -195,6 +198,7 @@ and clear when youre done! if you dont i will use :newspaper2: on you
if (damaged && floorcheck())
damaged = FALSE
spawning_simulation = TRUE
active = (map_id != offline_program)
use_power = active + IDLE_POWER_USE
program = map_id
@@ -270,6 +274,7 @@ and clear when youre done! if you dont i will use :newspaper2: on you
if(istype(machines, /obj/machinery/button))
var/obj/machinery/button/buttons = machines
buttons.setup_device()
spawning_simulation = FALSE
///this qdels holoitems that should no longer exist for whatever reason
/obj/machinery/computer/holodeck/proc/derez(obj/object, silent = TRUE, forced = FALSE)