cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

SSmapping updates (#18066)

Browse Source 
* A few SSmapping improvement

* sync1

* try 1

* remove print

* fixed1

* fixed2

* broken1

* fixed3

* use old reader

* clean up

* also remove this debug

* Don't load reebe and arena in low mem mode

* Latest version loader with mapgen fixed

* I missed this part somehow
This commit is contained in:
Ling
2023-02-26 14:11:27 +01:00
committed by GitHub
parent a7ca1b4d54
commit c77594d110
10 changed files with 146 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/controllers/subsystem/mapping.dm
View File

@@ -69,6 +69,7 @@ SUBSYSTEM_DEF(mapping)
process_teleport_locs() //Sets up the wizard teleport locations
preloadTemplates()
run_map_generation()
#ifndef LOWMEMORYMODE
// Create space ruin levels
while (space_levels_so_far < config.space_ruin_levels)
@@ -116,24 +117,21 @@ SUBSYSTEM_DEF(mapping)
seedRuins(space_ruins, CONFIG_GET(number/space_budget), list(/area/space), space_ruins_templates)
seedStation()
loading_ruins = FALSE
#endif
//Load Reebe
var/list/errorList = list()
var/list/reebes = SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE)
SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE)
if(errorList.len) // reebe failed to load
message_admins("Reebe failed to load!")
log_game("Reebe failed to load!")
for(var/datum/parsed_map/PM in reebes)
PM.initTemplateBounds()
//Load an Arena
errorList = list()
var/list/arenas = SSmapping.LoadGroup(errorList, "Arena", "templates", "arena.dmm", silent = TRUE)
SSmapping.LoadGroup(errorList, "Arena", "templates", "arena.dmm", silent = TRUE)
if(errorList.len) // arena failed to load
message_admins("A shuttle arena failed to load!")
log_game("A shuttle arena failed to load!")
for(var/datum/parsed_map/PM in arenas)
PM.initTemplateBounds()
#endif
// Add the transit level
transit = add_new_zlevel("Transit/Reserved", list(ZTRAIT_RESERVED = TRUE))
require_area_resort()

11
code/controllers/subsystem/shuttle.dm
View File

@@ -9,6 +9,7 @@ SUBSYSTEM_DEF(shuttle)
loading_points = 4.9 SECONDS // Yogs -- loading times
var/list/mobile = list()
/// A list of all the stationary docking ports.
var/list/stationary = list()
var/list/beacons = list()
var/list/transit = list()
@@ -71,7 +72,7 @@ SUBSYSTEM_DEF(shuttle)
continue
supply_packs[P.type] = P
initial_load()
setup_shuttles(stationary)
if(!arrivals)
WARNING("No /obj/docking_port/mobile/arrivals placed on the map!")
@@ -83,10 +84,9 @@ SUBSYSTEM_DEF(shuttle)
WARNING("No /obj/docking_port/mobile/supply placed on the map!")
return SS_INIT_SUCCESS
/datum/controller/subsystem/shuttle/proc/initial_load()
for(var/s in stationary)
var/obj/docking_port/stationary/S = s
S.load_roundstart()
/datum/controller/subsystem/shuttle/proc/setup_shuttles(list/ports)
for(var/obj/docking_port/stationary/port as anything in ports)
port.load_roundstart()
CHECK_TICK
/datum/controller/subsystem/shuttle/fire()
@@ -935,4 +935,3 @@ SUBSYSTEM_DEF(shuttle)
message_admins("[key_name_admin(usr)] loaded [mdp] with the shuttle manipulator.")
log_admin("[key_name(usr)] loaded [mdp] with the shuttle manipulator.</span>")
SSblackbox.record_feedback("text", "shuttle_manipulator", 1, "[mdp.name]")