cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 09:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleans up holodeck map templates + prevents the holodeck from overloading due to lag (#88792)

Browse Source 
## About The Pull Request
removes unused holodeck template vars
prevents the holodeck from overloading if process is fired during
loading

## Why It's Good For The Game
unused var bad
holodeck shouldnt detonate if the server lags

## Changelog
🆑
fix: holodeck no longer explodes if the server lags while its loading a
new sim
/🆑
This commit is contained in:
jimmyl
2024-12-31 07:48:49 +01:00
committed by GitHub
parent 8c535b24cd
commit a7eb32b7cc
2 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/holodeck/computer.dm
View File

@@ -365,6 +365,8 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf
if(SPT_PROB(2.5, seconds_per_tick))
do_sparks(2, 1, holo_turf)
return
if(spawning_simulation)
return // putting it here because updating power would be pointless we are only loading it
. = ..()
if(!. || program == offline_program)//we dont need to scan the holodeck if the holodeck is offline
update_use_power(IDLE_POWER_USE)

33
code/modules/holodeck/holodeck_map_templates.dm
View File

@@ -1,134 +1,112 @@
/datum/map_template/holodeck
/// id
var/template_id
var/description
/// Is this an emag program
var/restricted = FALSE
var/datum/parsed_map/lastparsed
should_place_on_top = FALSE
returns_created_atoms = TRUE
keep_cached_map = TRUE
var/obj/machinery/computer/holodeck/linked
/datum/map_template/holodeck/offline
name = "Holodeck - Offline"
template_id = "holodeck_offline"
description = "benis"
mappath = "_maps/templates/holodeck_offline.dmm"
/datum/map_template/holodeck/emptycourt
name = "Holodeck - Empty Court"
template_id = "holodeck_emptycourt"
description = "benis"
mappath = "_maps/templates/holodeck_emptycourt.dmm"
/datum/map_template/holodeck/dodgeball
name = "Holodeck - Dodgeball Court"
template_id = "holodeck_dodgeball"
description = "benis"
mappath = "_maps/templates/holodeck_dodgeball.dmm"
/datum/map_template/holodeck/basketball
name = "Holodeck - Basketball Court"
template_id = "holodeck_basketball"
description = "benis"
mappath = "_maps/templates/holodeck_basketball.dmm"
/datum/map_template/holodeck/thunderdome
name = "Holodeck - Thunderdome Arena"
template_id = "holodeck_thunderdome"
description = "benis"
mappath = "_maps/templates/holodeck_thunderdome.dmm"
/datum/map_template/holodeck/beach
name = "Holodeck - Beach"
template_id = "holodeck_beach"
description = "benis"
mappath = "_maps/templates/holodeck_beach.dmm"
/datum/map_template/holodeck/lounge
name = "Holodeck - Lounge"
template_id = "holodeck_lounge"
description = "benis"
mappath = "_maps/templates/holodeck_lounge.dmm"
/datum/map_template/holodeck/petpark
name = "Holodeck - Pet Park"
template_id = "holodeck_petpark"
description = "benis"
mappath = "_maps/templates/holodeck_petpark.dmm"
/datum/map_template/holodeck/firingrange
name = "Holodeck - Firing Range"
template_id = "holodeck_firingrange"
description = "benis"
mappath = "_maps/templates/holodeck_firingrange.dmm"
/datum/map_template/holodeck/anime_school
name = "Holodeck - Anime School"
template_id = "holodeck_animeschool"
description = "benis"
mappath = "_maps/templates/holodeck_animeschool.dmm"
/datum/map_template/holodeck/chapelcourt
name = "Holodeck - Chapel Courtroom"
template_id = "holodeck_chapelcourt"
description = "benis"
mappath = "_maps/templates/holodeck_chapelcourt.dmm"
/datum/map_template/holodeck/spacechess
name = "Holodeck - Space Chess"
template_id = "holodeck_spacechess"
description = "benis"
mappath = "_maps/templates/holodeck_spacechess.dmm"
/datum/map_template/holodeck/spacecheckers
name = "Holodeck - Space Checkers"
template_id = "holodeck_spacecheckers"
description = "benis"
mappath = "_maps/templates/holodeck_spacecheckers.dmm"
/datum/map_template/holodeck/kobayashi
name = "Holodeck - Kobayashi Maru"
template_id = "holodeck_kobayashi"
description = "benis"
mappath = "_maps/templates/holodeck_kobayashi.dmm"
/datum/map_template/holodeck/winterwonderland
name = "Holodeck - Winter Wonderland"
template_id = "holodeck_winterwonderland"
description = "benis"
mappath = "_maps/templates/holodeck_winterwonderland.dmm"
/datum/map_template/holodeck/photobooth
name = "Holodeck - Photobooth"
template_id = "holodeck_photobooth"
description = "benis"
mappath = "_maps/templates/holodeck_photobooth.dmm"
/datum/map_template/holodeck/skatepark
name = "Holodeck - Skatepark"
template_id = "holodeck_skatepark"
description = "benis"
mappath = "_maps/templates/holodeck_skatepark.dmm"
/datum/map_template/holodeck/microwave
name = "Holodeck - Microwave Paradise"
template_id = "holodeck_microwave"
description = "benis"
mappath = "_maps/templates/holodeck_microwave.dmm"
/datum/map_template/holodeck/baseball
name = "Holodeck - Baseball Field"
template_id = "holodeck_baseball"
description = "benis"
mappath = "_maps/templates/holodeck_baseball.dmm"
/datum/map_template/holodeck/card_battle
name = "Holodeck - TGC Battle Arena"
template_id = "holodeck_card_battle"
description = "An arena for playing Tactical Game Cards."
mappath = "_maps/templates/holodeck_card_battle.dmm"
//bad evil no good programs
@@ -136,48 +114,41 @@
/datum/map_template/holodeck/medicalsim
name = "Holodeck - Emergency Medical"
template_id = "holodeck_medicalsim"
description = "benis"
mappath = "_maps/templates/holodeck_medicalsim.dmm"
restricted = TRUE
/datum/map_template/holodeck/thunderdome1218
name = "Holodeck - 1218 AD"
template_id = "holodeck_thunderdome1218"
description = "benis"
mappath = "_maps/templates/holodeck_thunderdome1218.dmm"
restricted = TRUE
/datum/map_template/holodeck/burntest
name = "Holodeck - Atmospheric Burn Test"
template_id = "holodeck_burntest"
description = "benis"
mappath = "_maps/templates/holodeck_burntest.dmm"
restricted = TRUE
/datum/map_template/holodeck/wildlifesim
name = "Holodeck - Wildlife Simulation"
template_id = "holodeck_wildlifesim"
description = "benis"
mappath = "_maps/templates/holodeck_wildlifesim.dmm"
restricted = TRUE
/datum/map_template/holodeck/holdoutbunker
name = "Holodeck - Holdout Bunker"
template_id = "holodeck_holdoutbunker"
description = "benis"
mappath = "_maps/templates/holodeck_holdoutbunker.dmm"
restricted = TRUE
/datum/map_template/holodeck/anthophillia
name = "Holodeck - Anthophillia"
template_id = "holodeck_anthophillia"
description = "benis"
mappath = "_maps/templates/holodeck_anthophillia.dmm"
restricted = TRUE
/datum/map_template/holodeck/refuelingstation
name = "Holodeck - Refueling Station"
template_id = "holodeck_refuelingstation"
description = "benis"
mappath = "_maps/templates/holodeck_refuelingstation.dmm"
restricted = TRUE