cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 16:44:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes master 514 (#5927)

Browse Source 
* a

* l

* Update sheet_types.dm
This commit is contained in:
Gandalf
2021-05-25 03:06:58 +01:00
committed by GitHub
parent 8f4b9b3e19
commit aab764575a
98 changed files with 1806 additions and 236478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/mapping.dm
+2 -35
View File
@@ -16,9 +16,6 @@ SUBSYSTEM_DEF(mapping)
var/list/ruins_templates = list()
var/list/space_ruins_templates = list()
var/list/lava_ruins_templates = list()
var/list/trench_ruins_templates = list()
var/list/ocean_ruins_templates = list()
var/list/ocean_station_ruins_templates = list()
var/list/ice_ruins_templates = list()
var/list/ice_ruins_underground_templates = list()
var/list/asteroid_ruins_templates = list() //SKYRAT EDIT - Adds ruins to LZ2
@@ -103,25 +100,6 @@ SUBSYSTEM_DEF(mapping)
for (var/lava_z in lava_ruins)
spawn_rivers(lava_z)
//SKYRAT EDIT ADDITION
//Ocean ruins
var/list/ocean_ruins = levels_by_trait(ZTRAIT_OCEAN_RUINS)
if (ocean_ruins.len)
seedRuins(ocean_ruins, CONFIG_GET(number/ocean_budget), list(/area/ocean/generated, /area/ocean/trench/generated), ocean_ruins_templates)
for (var/ocean_z in ocean_ruins)
spawn_rivers(ocean_z, 3, /turf/open/openspace/ocean, /area/ocean, new_baseturfs = /turf/open/openspace/ocean)
var/list/station_ocean_ruins = levels_by_trait(ZTRAIT_OCEAN_RUINS_NEARSTATION)
if (station_ocean_ruins.len)
seedRuins(station_ocean_ruins, CONFIG_GET(number/ocean_budget), list(/area/ocean/generated, /area/ocean/trench/generated), ocean_station_ruins_templates)
for (var/ocean_z in station_ocean_ruins)
spawn_rivers(ocean_z, 3, /turf/open/openspace/ocean, /area/ocean, new_baseturfs = /turf/open/openspace/ocean)
var/list/trench_ruins = levels_by_trait(ZTRAIT_TRENCH_RUINS)
if (trench_ruins.len)
seedRuins(trench_ruins, CONFIG_GET(number/ocean_budget), list(/area/ocean/trench/generated), trench_ruins_templates)
//SKYRAT EDIT END
var/list/ice_ruins = levels_by_trait(ZTRAIT_ICE_RUINS)
if (ice_ruins.len)
// needs to be whitelisted for underground too so place_below ruins work
@@ -216,11 +194,6 @@ Used by the AI doomsday and the self-destruct nuke.
ruins_templates = SSmapping.ruins_templates
space_ruins_templates = SSmapping.space_ruins_templates
lava_ruins_templates = SSmapping.lava_ruins_templates
//SKYRAT EDIT ADDITION
trench_ruins_templates = SSmapping.trench_ruins_templates
ocean_ruins_templates = SSmapping.ocean_ruins_templates
ocean_station_ruins_templates = SSmapping.ocean_station_ruins_templates
//SKYRAT EDIT END
ice_ruins_templates = SSmapping.ice_ruins_templates
ice_ruins_underground_templates = SSmapping.ice_ruins_underground_templates
asteroid_ruins_templates = SSmapping.asteroid_ruins_templates //SKYRAT EDIT ADDITION
@@ -315,6 +288,7 @@ Used by the AI doomsday and the self-destruct nuke.
//SKYRAT EDIT CHANGE BEGIN
var/mining_map_to_load = SSrandommining.chosen_map
var/mining_traits_to_load = GLOB.mining_traits[SSrandommining.traits]
if(mining_map_to_load)
add_startupmessage("MINING MAP: Loading mining level...")
if(!mining_traits_to_load)
@@ -328,7 +302,6 @@ Used by the AI doomsday and the self-destruct nuke.
else if (!isnull(config.minetype) && config.minetype != "none")
INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!")
//SKYRAT EDIT END
#endif
if(LAZYLEN(FailedZs)) //but seriously, unless the server's filesystem is messed up this will never happen
@@ -478,15 +451,9 @@ GLOBAL_LIST_EMPTY(the_station_areas)
//SKYRAT EDIT START//
else if(istype(R, /datum/map_template/ruin/asteroid))
asteroid_ruins_templates[R.name] = R
//SKYRAT EDIT END//
else if(istype(R, /datum/map_template/ruin/space))
space_ruins_templates[R.name] = R
else if(istype(R, /datum/map_template/ruin/ocean))
ocean_ruins_templates[R.name] = R
else if(istype(R, /datum/map_template/ruin/ocean_station))
ocean_station_ruins_templates[R.name] = R
else if(istype(R, /datum/map_template/ruin/trench))
trench_ruins_templates[R.name] = R
//SKYRAT EDIT END//
/datum/controller/subsystem/mapping/proc/preloadShuttleTemplates()
var/list/unbuyable = generateMapList("[global.config.directory]/unbuyableshuttles.txt")