cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix per-zlevel skyboxes not really allowing custom ones

Browse Source 
It's not going to break the world to remove this 'assumption' cache
This commit is contained in:
Aronai Sieyes
2020-04-06 12:08:33 -04:00
parent 351b9e8c5e
commit abd28b5d6d
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/subsystems/skybox.dm
View File

@@ -68,11 +68,6 @@ SUBSYSTEM_DEF(skybox)
/datum/controller/subsystem/skybox/proc/get_skybox(z) /datum/controller/subsystem/skybox/proc/get_skybox(z)
if(!skybox_cache["[z]"]) if(!skybox_cache["[z]"])
skybox_cache["[z]"] = generate_skybox(z) skybox_cache["[z]"] = generate_skybox(z)
if(global.using_map.use_overmap)
var/obj/effect/overmap/visitable/O = map_sectors["[z]"]
if(istype(O))
for(var/zlevel in O.map_z)
skybox_cache["[zlevel]"] = skybox_cache["[z]"]
return skybox_cache["[z]"] return skybox_cache["[z]"]
/datum/controller/subsystem/skybox/proc/generate_skybox(z) /datum/controller/subsystem/skybox/proc/generate_skybox(z)

7
maps/~map_system/maps.dm
View File

@@ -194,10 +194,9 @@ var/list/all_maps = list()
) )
/datum/map/proc/get_skybox_datum(z) /datum/map/proc/get_skybox_datum(z)
if(map_levels["[z]"]) var/datum/map_z_level/picked = zlevels["[z]"]
var/datum/map_z_level/picked = map_levels["[z]"] if(picked?.custom_skybox)
if(picked.custom_skybox) return picked.custom_skybox
return picked.custom_skybox
return default_skybox return default_skybox