cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
JohnFulpWillard
2022-06-08 20:32:04 -04:00
parent ca092bcb87
commit 1152cf6cf4
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,7 +544,6 @@ GLOBAL_LIST_EMPTY(the_station_areas)
else else
if(reserve.Reserve(width, height, z)) if(reserve.Reserve(width, height, z))
return reserve return reserve
log_mapping("returned [reserve] - reserve.Reserve isn't properly working.")
QDEL_NULL(reserve) QDEL_NULL(reserve)
//This is not for wiping reserved levels, use wipe_reservations() for that. //This is not for wiping reserved levels, use wipe_reservations() for that.

8
code/datums/map_config.dm
View File

@@ -117,13 +117,13 @@
map_file = json["map_file"] map_file = json["map_file"]
// "map_file": "MetaStation.dmm" // "map_file": "MetaStation.dmm"
if (istext(map_file)) if (istext(map_file))
if (!fexists("[map_path]/[map_file]")) if (!fexists("_maps/[map_path]/[map_file]"))
log_world("Map file ([map_path]/[map_file]) does not exist!") log_world("Map file ([map_path]/[map_file]) does not exist!")
return return
// "map_file": ["Lower.dmm", "Upper.dmm"] // "map_file": ["Lower.dmm", "Upper.dmm"]
else if (islist(map_file)) else if (islist(map_file))
for (var/file in map_file) for (var/file in map_file)
if (!fexists("[map_path]/[file]")) if (!fexists("_maps/[map_path]/[file]"))
log_world("Map file ([map_path]/[file]) does not exist!") log_world("Map file ([map_path]/[file]) does not exist!")
return return
else else
@@ -194,10 +194,10 @@
/datum/map_config/proc/GetFullMapPaths() /datum/map_config/proc/GetFullMapPaths()
if (istext(map_file)) if (istext(map_file))
return list("[map_path]/[map_file]") return list("_maps/[map_path]/[map_file]")
. = list() . = list()
for (var/file in map_file) for (var/file in map_file)
. += "[map_path]/[file]" . += "_maps/[map_path]/[file]"
/datum/map_config/proc/MakeNextMap() /datum/map_config/proc/MakeNextMap()
return config_filename == PATH_TO_NEXT_MAP_JSON || fcopy(config_filename, PATH_TO_NEXT_MAP_JSON) return config_filename == PATH_TO_NEXT_MAP_JSON || fcopy(config_filename, PATH_TO_NEXT_MAP_JSON)