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

Merge branch 'master' of github.com:tgstation/tgstation into upstream-2026-06-23

Browse Source
This commit is contained in:
Roxy
2026-06-23 15:51:55 -04:00
parent 4f87df6b81 8f10b2af19
commit de4c3b255d
1007 changed files with 40287 additions and 33507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/mapping.dm
+4 -1
View File
@@ -17,6 +17,9 @@ SUBSYSTEM_DEF(mapping)
var/list/ruins_templates = list()
///Assoc list of all ruins spawned, key center of ruin spawn -> value ruin instance
var/list/active_ruins = alist()
///List of ruins, separated by their theme
var/list/themed_ruins = list()
@@ -141,7 +144,7 @@ SUBSYSTEM_DEF(mapping)
if(current_map.wilderness_levels)
var/list/FailedZs = list()
LoadGroup(FailedZs, "Wilderness Area", current_map.wilderness_directory, current_map.maps_to_spawn, default_traits = ZTRAITS_WILDS, height_autosetup = FALSE)
LoadGroup(FailedZs, "Wilderness Area", current_map.wilderness_directory, current_map.wilderness_maps_to_spawn, default_traits = current_map.wilderness_z_traits, height_autosetup = FALSE)
if(LAZYLEN(FailedZs))
CRASH("Ice wilds failed to load!")