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

Conflict Fixes

Browse Source
This commit is contained in:
Unknown
2019-03-27 02:19:02 -04:00
parent 1dd3bb4532
commit 95f57bb8c7
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/controllers/subsystems/mapping_vr.dm
View File

@@ -7,8 +7,9 @@ SUBSYSTEM_DEF(mapping)
init_order = INIT_ORDER_MAPPING init_order = INIT_ORDER_MAPPING
flags = SS_NO_FIRE flags = SS_NO_FIRE
var/list/map_templates = list()
var/dmm_suite/maploader = null
var/obj/effect/landmark/engine_loader/engine_loader var/obj/effect/landmark/engine_loader/engine_loader
var/list/shelter_templates = list() var/list/shelter_templates = list()
/datum/controller/subsystem/mapping/Recover() /datum/controller/subsystem/mapping/Recover()
@@ -16,6 +17,16 @@ SUBSYSTEM_DEF(mapping)
shelter_templates = SSmapping.shelter_templates shelter_templates = SSmapping.shelter_templates
/datum/controller/subsystem/mapping/Initialize(timeofday) /datum/controller/subsystem/mapping/Initialize(timeofday)
if(subsystem_initialized)
return
maploader = new()
load_map_templates()
if(config.generate_map)
// Map-gen is still very specific to the map, however putting it here should ensure it loads in the correct order.
if(using_map.perform_map_generation())
using_map.refresh_mining_turfs()
loadEngine() loadEngine()
preloadShelterTemplates() preloadShelterTemplates()
// Mining generation probably should be here too // Mining generation probably should be here too
@@ -24,6 +35,15 @@ SUBSYSTEM_DEF(mapping)
loadLateMaps() loadLateMaps()
..() ..()
/datum/controller/subsystem/mapping/proc/load_map_templates()
for(var/T in subtypesof(/datum/map_template))
var/datum/map_template/template = T
if(!(initial(template.mappath))) // If it's missing the actual path its probably a base type or being used for inheritence.
continue
template = new T()
map_templates[template.name] = template
return TRUE
/datum/controller/subsystem/mapping/proc/loadEngine() /datum/controller/subsystem/mapping/proc/loadEngine()
if(!engine_loader) if(!engine_loader)
return // Seems this map doesn't need an engine loaded. return // Seems this map doesn't need an engine loaded.

4
code/world.dm
View File

@@ -420,10 +420,6 @@ var/world_topic_spam_protect_time = world.timeofday
/*spawn(0) /*spawn(0)
world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')) // random end sounds!! - LastyBatsy world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')) // random end sounds!! - LastyBatsy
*/ */
<<<<<<< HEAD
log_world("World rebooted at [time_stamp()]")
..()
if (reason || fast_track) //special reboot, do none of the normal stuff if (reason || fast_track) //special reboot, do none of the normal stuff
if (usr) if (usr)

4
vorestation.dme
View File

@@ -223,12 +223,8 @@
#include "code\controllers\subsystems\inactivity.dm" #include "code\controllers\subsystems\inactivity.dm"
#include "code\controllers\subsystems\lighting.dm" #include "code\controllers\subsystems\lighting.dm"
#include "code\controllers\subsystems\machines.dm" #include "code\controllers\subsystems\machines.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\controllers\subsystems\mapping_vr.dm" #include "code\controllers\subsystems\mapping_vr.dm"
#include "code\controllers\subsystems\mobs.dm" #include "code\controllers\subsystems\mobs.dm"
=======
#include "code\controllers\subsystems\mapping.dm"
>>>>>>> ec4e2be... Merge pull request #5778 from Neerti/emergency_maploader_fix:polaris.dme
#include "code\controllers\subsystems\orbits.dm" #include "code\controllers\subsystems\orbits.dm"
#include "code\controllers\subsystems\overlays.dm" #include "code\controllers\subsystems\overlays.dm"
#include "code\controllers\subsystems\persist_vr.dm" #include "code\controllers\subsystems\persist_vr.dm"