mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] Subsystem return update (#9774)
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
2428c6a221
commit
667c3c4c13
@@ -205,5 +205,5 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G
|
|||||||
*/
|
*/
|
||||||
#define addtimer(args...) _addtimer(args, file = __FILE__, line = __LINE__)
|
#define addtimer(args...) _addtimer(args, file = __FILE__, line = __LINE__)
|
||||||
|
|
||||||
/// The timer key used to know how long subsystem initialization takes // CHOMPEdit
|
/// The timer key used to know how long subsystem initialization takes
|
||||||
#define SS_INIT_TIMER_KEY "ss_init" // CHOMPEdit
|
#define SS_INIT_TIMER_KEY "ss_init"
|
||||||
|
|||||||
@@ -54,11 +54,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
|
|||||||
|
|
||||||
var/current_runlevel //!for scheduling different subsystems for different stages of the round
|
var/current_runlevel //!for scheduling different subsystems for different stages of the round
|
||||||
|
|
||||||
// CHOMPEdit Start
|
|
||||||
/// During initialization, will be the instanced subsytem that is currently initializing.
|
/// During initialization, will be the instanced subsytem that is currently initializing.
|
||||||
/// Outside of initialization, returns null.
|
/// Outside of initialization, returns null.
|
||||||
var/current_initializing_subsystem = null
|
var/current_initializing_subsystem = null
|
||||||
// CHOMPEdit End
|
|
||||||
|
|
||||||
var/static/restart_clear = 0
|
var/static/restart_clear = 0
|
||||||
var/static/restart_timeout = 0
|
var/static/restart_timeout = 0
|
||||||
@@ -204,10 +202,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
|
|||||||
for (var/datum/controller/subsystem/SS in subsystems)
|
for (var/datum/controller/subsystem/SS in subsystems)
|
||||||
if (SS.flags & SS_NO_INIT)
|
if (SS.flags & SS_NO_INIT)
|
||||||
continue
|
continue
|
||||||
//SS.Initialize(REALTIMEOFDAY) // CHOMPEdit
|
init_subsystem(SS)
|
||||||
init_subsystem(SS) // CHOMPEdit
|
|
||||||
CHECK_TICK
|
CHECK_TICK
|
||||||
current_initializing_subsystem = null // CHOMPEdit
|
current_initializing_subsystem = null
|
||||||
current_ticklimit = TICK_LIMIT_RUNNING
|
current_ticklimit = TICK_LIMIT_RUNNING
|
||||||
var/time = (REALTIMEOFDAY - start_timeofday) / 10
|
var/time = (REALTIMEOFDAY - start_timeofday) / 10
|
||||||
|
|
||||||
@@ -216,7 +213,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
|
|||||||
log_world(msg)
|
log_world(msg)
|
||||||
|
|
||||||
|
|
||||||
send2chat("Server Initialization completed! - Took [time] second[time == 1 ? "" : "s"].", "bot announce")
|
// FIXME: TGS <-> Discord communication; sending message to a TGS chat channel
|
||||||
|
send2chat("Server Initialization completed! - Took [time] second[time == 1 ? "" : "s"].", "bot announce") // CHOMPEnable
|
||||||
|
|
||||||
if (!current_runlevel)
|
if (!current_runlevel)
|
||||||
SetRunLevel(RUNLEVEL_LOBBY)
|
SetRunLevel(RUNLEVEL_LOBBY)
|
||||||
@@ -238,7 +236,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
|
|||||||
// Loop.
|
// Loop.
|
||||||
Master.StartProcessing(0)
|
Master.StartProcessing(0)
|
||||||
|
|
||||||
// CHOMPEdit Start
|
|
||||||
/**
|
/**
|
||||||
* Initialize a given subsystem and handle the results.
|
* Initialize a given subsystem and handle the results.
|
||||||
*
|
*
|
||||||
@@ -312,7 +309,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
|
|||||||
|
|
||||||
to_chat(world, chat_message)
|
to_chat(world, chat_message)
|
||||||
log_world(message)
|
log_world(message)
|
||||||
// CHOMPEdit End
|
|
||||||
|
|
||||||
/datum/controller/master/proc/SetRunLevel(new_runlevel)
|
/datum/controller/master/proc/SetRunLevel(new_runlevel)
|
||||||
var/old_runlevel = isnull(current_runlevel) ? "NULL" : runlevel_flags[current_runlevel]
|
var/old_runlevel = isnull(current_runlevel) ? "NULL" : runlevel_flags[current_runlevel]
|
||||||
|
|||||||
@@ -227,13 +227,11 @@
|
|||||||
/// Called after the config has been loaded or reloaded.
|
/// Called after the config has been loaded or reloaded.
|
||||||
/datum/controller/subsystem/proc/OnConfigLoad()
|
/datum/controller/subsystem/proc/OnConfigLoad()
|
||||||
|
|
||||||
// CHOMPEdit Start
|
|
||||||
/**
|
/**
|
||||||
* Used to initialize the subsystem. This is expected to be overriden by subtypes.
|
* Used to initialize the subsystem. This is expected to be overriden by subtypes.
|
||||||
*/
|
*/
|
||||||
/datum/controller/subsystem/Initialize()
|
/datum/controller/subsystem/Initialize()
|
||||||
return SS_INIT_NONE
|
return SS_INIT_NONE
|
||||||
// CHOMPEdit End
|
|
||||||
|
|
||||||
//hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc.
|
//hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc.
|
||||||
/datum/controller/subsystem/stat_entry(msg)
|
/datum/controller/subsystem/stat_entry(msg)
|
||||||
|
|||||||
@@ -102,8 +102,8 @@ SUBSYSTEM_DEF(air)
|
|||||||
var/current_cycle = 0
|
var/current_cycle = 0
|
||||||
var/next_id = 1 //Used to keep track of zone UIDs.
|
var/next_id = 1 //Used to keep track of zone UIDs.
|
||||||
|
|
||||||
/datum/controller/subsystem/air/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/air/Initialize()
|
||||||
var/start_timeofday = REALTIMEOFDAY // CHOMPEdit
|
var/start_timeofday = REALTIMEOFDAY
|
||||||
report_progress("Processing Geometry...")
|
report_progress("Processing Geometry...")
|
||||||
|
|
||||||
current_cycle = 0
|
current_cycle = 0
|
||||||
@@ -113,8 +113,7 @@ SUBSYSTEM_DEF(air)
|
|||||||
S.update_air_properties()
|
S.update_air_properties()
|
||||||
CHECK_TICK
|
CHECK_TICK
|
||||||
|
|
||||||
// CHOMPEdit
|
admin_notice(span_danger("Geometry initialized in [round(0.1*(REALTIMEOFDAY-start_timeofday),0.1)] seconds.") + \
|
||||||
admin_notice(span_danger("Geometry initialized in [round(0.1*(REALTIMEOFDAY-start_timeofday),0.1)](?) seconds.") + \
|
|
||||||
span_info("<br>\
|
span_info("<br>\
|
||||||
Total Simulated Turfs: [simulated_turf_count]<br>\
|
Total Simulated Turfs: [simulated_turf_count]<br>\
|
||||||
Total Zones: [zones.len]<br>\
|
Total Zones: [zones.len]<br>\
|
||||||
@@ -169,7 +168,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
|
|||||||
log_debug("Active Edges on ZAS Startup\n" + edge_log.Join("\n"))
|
log_debug("Active Edges on ZAS Startup\n" + edge_log.Join("\n"))
|
||||||
startup_active_edge_log = edge_log.Copy()
|
startup_active_edge_log = edge_log.Copy()
|
||||||
|
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/air/fire(resumed = 0)
|
/datum/controller/subsystem/air/fire(resumed = 0)
|
||||||
var/timer
|
var/timer
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(alarm)
|
|||||||
|
|
||||||
/datum/controller/subsystem/alarm/Initialize()
|
/datum/controller/subsystem/alarm/Initialize()
|
||||||
all_handlers = list(atmosphere_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm)
|
all_handlers = list(atmosphere_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm)
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/alarm/fire(resumed = FALSE)
|
/datum/controller/subsystem/alarm/fire(resumed = FALSE)
|
||||||
if(!resumed)
|
if(!resumed)
|
||||||
|
|||||||
@@ -17,13 +17,13 @@ SUBSYSTEM_DEF(atoms)
|
|||||||
|
|
||||||
var/list/BadInitializeCalls = list()
|
var/list/BadInitializeCalls = list()
|
||||||
|
|
||||||
/datum/controller/subsystem/atoms/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/atoms/Initialize()
|
||||||
setupgenetics() //to set the mutations' place in structural enzymes, so initializers know where to put mutations.
|
setupgenetics() //to set the mutations' place in structural enzymes, so initializers know where to put mutations.
|
||||||
initialized = INITIALIZATION_INNEW_MAPLOAD
|
initialized = INITIALIZATION_INNEW_MAPLOAD
|
||||||
to_world_log("Initializing objects")
|
to_world_log("Initializing objects")
|
||||||
admin_notice(span_danger("Initializing objects"), R_DEBUG)
|
admin_notice(span_danger("Initializing objects"), R_DEBUG)
|
||||||
InitializeAtoms()
|
InitializeAtoms()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/atoms/proc/InitializeAtoms(list/atoms)
|
/datum/controller/subsystem/atoms/proc/InitializeAtoms(list/atoms)
|
||||||
if(initialized == INITIALIZATION_INSSATOMS)
|
if(initialized == INITIALIZATION_INSSATOMS)
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(character_setup)
|
|||||||
name = "Character Setup"
|
name = "Character Setup"
|
||||||
init_order = INIT_ORDER_DEFAULT
|
init_order = INIT_ORDER_DEFAULT
|
||||||
priority = FIRE_PRIORITY_CHARSETUP
|
priority = FIRE_PRIORITY_CHARSETUP
|
||||||
flags = SS_BACKGROUND | SS_NO_INIT // CHOMPEdit
|
flags = SS_BACKGROUND | SS_NO_INIT
|
||||||
wait = 1 SECOND
|
wait = 1 SECOND
|
||||||
runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
|
runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(chemistry)
|
|||||||
/datum/controller/subsystem/chemistry/Initialize()
|
/datum/controller/subsystem/chemistry/Initialize()
|
||||||
initialize_chemical_reagents()
|
initialize_chemical_reagents()
|
||||||
initialize_chemical_reactions()
|
initialize_chemical_reactions()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/chemistry/stat_entry(msg)
|
/datum/controller/subsystem/chemistry/stat_entry(msg)
|
||||||
msg = "C: [chemical_reagents.len] | R: [chemical_reactions.len]"
|
msg = "C: [chemical_reagents.len] | R: [chemical_reactions.len]"
|
||||||
|
|||||||
@@ -17,9 +17,9 @@ SUBSYSTEM_DEF(circuit)
|
|||||||
/datum/controller/subsystem/circuit/Recover()
|
/datum/controller/subsystem/circuit/Recover()
|
||||||
flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
|
flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
|
||||||
|
|
||||||
/datum/controller/subsystem/circuit/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/circuit/Initialize()
|
||||||
circuits_init()
|
circuits_init()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/circuit/proc/circuits_init()
|
/datum/controller/subsystem/circuit/proc/circuits_init()
|
||||||
//Cached lists for free performance
|
//Cached lists for free performance
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ SUBSYSTEM_DEF(events)
|
|||||||
)
|
)
|
||||||
if(global.using_map.use_overmap)
|
if(global.using_map.use_overmap)
|
||||||
GLOB.overmap_event_handler.create_events(global.using_map.overmap_z, global.using_map.overmap_size, global.using_map.overmap_event_areas)
|
GLOB.overmap_event_handler.create_events(global.using_map.overmap_z, global.using_map.overmap_size, global.using_map.overmap_event_areas)
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/events/fire(resumed)
|
/datum/controller/subsystem/events/fire(resumed)
|
||||||
if (!resumed)
|
if (!resumed)
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ SUBSYSTEM_DEF(game_master)
|
|||||||
if(config && !CONFIG_GET(flag/enable_game_master)) // CHOMPEdit
|
if(config && !CONFIG_GET(flag/enable_game_master)) // CHOMPEdit
|
||||||
can_fire = FALSE
|
can_fire = FALSE
|
||||||
|
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/game_master/fire(resumed)
|
/datum/controller/subsystem/game_master/fire(resumed)
|
||||||
adjust_staleness(1)
|
adjust_staleness(1)
|
||||||
|
|||||||
@@ -14,9 +14,9 @@ SUBSYSTEM_DEF(holomaps)
|
|||||||
/datum/controller/subsystem/holomaps/Recover()
|
/datum/controller/subsystem/holomaps/Recover()
|
||||||
flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
|
flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
|
||||||
|
|
||||||
/datum/controller/subsystem/holomaps/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/holomaps/Initialize()
|
||||||
generateHoloMinimaps()
|
generateHoloMinimaps()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/holomaps/stat_entry(msg)
|
/datum/controller/subsystem/holomaps/stat_entry(msg)
|
||||||
if (!Debug2)
|
if (!Debug2)
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(input)
|
|||||||
name = "Input"
|
name = "Input"
|
||||||
wait = 1 // SS_TICKER means this runs every tick
|
wait = 1 // SS_TICKER means this runs every tick
|
||||||
init_order = INIT_ORDER_INPUT
|
init_order = INIT_ORDER_INPUT
|
||||||
flags = SS_TICKER | SS_NO_INIT // CHOMPEdit
|
flags = SS_TICKER | SS_NO_INIT
|
||||||
priority = FIRE_PRIORITY_INPUT
|
priority = FIRE_PRIORITY_INPUT
|
||||||
runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
|
runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
|
||||||
|
|
||||||
|
|||||||
@@ -14,8 +14,7 @@ SUBSYSTEM_DEF(job)
|
|||||||
var/list/shift_keys = list() // CHOMPadd
|
var/list/shift_keys = list() // CHOMPadd
|
||||||
var/list/restricted_keys = list() // CHOMPadd
|
var/list/restricted_keys = list() // CHOMPadd
|
||||||
|
|
||||||
|
/datum/controller/subsystem/job/Initialize()
|
||||||
/datum/controller/subsystem/job/Initialize() // CHOMPEdit
|
|
||||||
if(!department_datums.len)
|
if(!department_datums.len)
|
||||||
setup_departments()
|
setup_departments()
|
||||||
if(!occupations.len)
|
if(!occupations.len)
|
||||||
@@ -24,7 +23,7 @@ SUBSYSTEM_DEF(job)
|
|||||||
if(CONFIG_GET(number/job_camp_time_limit))
|
if(CONFIG_GET(number/job_camp_time_limit))
|
||||||
load_camp_lists()
|
load_camp_lists()
|
||||||
//CHOMPadd end
|
//CHOMPadd end
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/job/proc/setup_occupations(faction = FACTION_STATION)
|
/datum/controller/subsystem/job/proc/setup_occupations(faction = FACTION_STATION)
|
||||||
occupations = list()
|
occupations = list()
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(lighting)
|
|||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
|
|
||||||
/datum/controller/subsystem/lighting/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/lighting/Initialize()
|
||||||
if(!subsystem_initialized)
|
if(!subsystem_initialized)
|
||||||
if (CONFIG_GET(flag/starlight))
|
if (CONFIG_GET(flag/starlight))
|
||||||
for(var/area/A in world)
|
for(var/area/A in world)
|
||||||
@@ -37,7 +37,7 @@ SUBSYSTEM_DEF(lighting)
|
|||||||
fire(FALSE, TRUE)
|
fire(FALSE, TRUE)
|
||||||
sunlight_queue_active += sunlight_queue + sunlight_queue //CHOMPEdit Run through shandler's twice during lobby wait to get some initial computation out of the way. After these two, the sunlight system will run MUCH faster.
|
sunlight_queue_active += sunlight_queue + sunlight_queue //CHOMPEdit Run through shandler's twice during lobby wait to get some initial computation out of the way. After these two, the sunlight system will run MUCH faster.
|
||||||
|
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/lighting/fire(resumed, init_tick_checks)
|
/datum/controller/subsystem/lighting/fire(resumed, init_tick_checks)
|
||||||
MC_SPLIT_TICK_INIT(4)
|
MC_SPLIT_TICK_INIT(4)
|
||||||
|
|||||||
@@ -30,12 +30,12 @@ SUBSYSTEM_DEF(machines)
|
|||||||
var/list/powernets = list()
|
var/list/powernets = list()
|
||||||
var/list/powerobjs = list()
|
var/list/powerobjs = list()
|
||||||
|
|
||||||
/datum/controller/subsystem/machines/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/machines/Initialize()
|
||||||
makepowernets()
|
makepowernets()
|
||||||
admin_notice(span_danger("Initializing atmos machinery."), R_DEBUG)
|
admin_notice(span_danger("Initializing atmos machinery."), R_DEBUG)
|
||||||
setup_atmos_machinery(all_machines)
|
setup_atmos_machinery(all_machines)
|
||||||
fire()
|
fire()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/machines/fire(resumed = 0)
|
/datum/controller/subsystem/machines/fire(resumed = 0)
|
||||||
var/timer = TICK_USAGE
|
var/timer = TICK_USAGE
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ SUBSYSTEM_DEF(mapping)
|
|||||||
flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
|
flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
|
||||||
shelter_templates = SSmapping.shelter_templates
|
shelter_templates = SSmapping.shelter_templates
|
||||||
|
|
||||||
/datum/controller/subsystem/mapping/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/mapping/Initialize()
|
||||||
if(subsystem_initialized)
|
if(subsystem_initialized)
|
||||||
return
|
return
|
||||||
world.max_z_changed() // This is to set up the player z-level list, maxz hasn't actually changed (probably)
|
world.max_z_changed() // This is to set up the player z-level list, maxz hasn't actually changed (probably)
|
||||||
@@ -29,7 +29,7 @@ SUBSYSTEM_DEF(mapping)
|
|||||||
// Lateload Code related to Expedition areas.
|
// Lateload Code related to Expedition areas.
|
||||||
if(using_map) // VOREStation Edit: Re-enable this.
|
if(using_map) // VOREStation Edit: Re-enable this.
|
||||||
loadLateMaps()
|
loadLateMaps()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/mapping/proc/load_map_templates()
|
/datum/controller/subsystem/mapping/proc/load_map_templates()
|
||||||
for(var/datum/map_template/template as anything in subtypesof(/datum/map_template))
|
for(var/datum/map_template/template as anything in subtypesof(/datum/map_template))
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ SUBSYSTEM_DEF(media_tracks)
|
|||||||
var/list/casino_tracks = list()
|
var/list/casino_tracks = list()
|
||||||
/// CHOMPstation edit end
|
/// CHOMPstation edit end
|
||||||
|
|
||||||
/datum/controller/subsystem/media_tracks/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/media_tracks/Initialize()
|
||||||
load_tracks()
|
load_tracks()
|
||||||
sort_tracks()
|
sort_tracks()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/media_tracks/proc/load_tracks()
|
/datum/controller/subsystem/media_tracks/proc/load_tracks()
|
||||||
for(var/filename in CONFIG_GET(str_list/jukebox_track_files))
|
for(var/filename in CONFIG_GET(str_list/jukebox_track_files))
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ SUBSYSTEM_DEF(nightshift)
|
|||||||
if(config.randomize_shift_time)
|
if(config.randomize_shift_time)
|
||||||
GLOB.gametime_offset = rand(0, 23) HOURS
|
GLOB.gametime_offset = rand(0, 23) HOURS
|
||||||
*/
|
*/
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/nightshift/fire(resumed = FALSE)
|
/datum/controller/subsystem/nightshift/fire(resumed = FALSE)
|
||||||
if(round_duration_in_ds < nightshift_first_check)
|
if(round_duration_in_ds < nightshift_first_check)
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ SUBSYSTEM_DEF(overlays)
|
|||||||
atom.flags &= ~OVERLAY_QUEUED
|
atom.flags &= ~OVERLAY_QUEUED
|
||||||
CHECK_TICK
|
CHECK_TICK
|
||||||
|
|
||||||
//CHOMPEdit Begin
|
|
||||||
/datum/controller/subsystem/overlays/Initialize()
|
/datum/controller/subsystem/overlays/Initialize()
|
||||||
fire(FALSE, TRUE)
|
fire(FALSE, TRUE)
|
||||||
return SS_INIT_SUCCESS
|
return SS_INIT_SUCCESS
|
||||||
|
|||||||
@@ -8,9 +8,11 @@ SUBSYSTEM_DEF(overmap_renamer)
|
|||||||
runlevels = RUNLEVEL_INIT
|
runlevels = RUNLEVEL_INIT
|
||||||
flags = SS_NO_FIRE
|
flags = SS_NO_FIRE
|
||||||
|
|
||||||
/datum/controller/subsystem/overmap_renamer/Initialize() // CHOMPEdit
|
|
||||||
|
|
||||||
|
/datum/controller/subsystem/overmap_renamer/Initialize()
|
||||||
update_names()
|
update_names()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/*Shouldn't be a switch statement. We want ALL of the if(map_template.name in visitable_z_leves_name_list) to fire
|
/*Shouldn't be a switch statement. We want ALL of the if(map_template.name in visitable_z_leves_name_list) to fire
|
||||||
if we end up with multiple renamable lateload overmap objects.*/
|
if we end up with multiple renamable lateload overmap objects.*/
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ SUBSYSTEM_DEF(persistence)
|
|||||||
var/list/all_paintings = list()
|
var/list/all_paintings = list()
|
||||||
var/list/unpicked_paintings = list()
|
var/list/unpicked_paintings = list()
|
||||||
|
|
||||||
// CHOMPEdit Start
|
|
||||||
/datum/controller/subsystem/persistence/Initialize()
|
/datum/controller/subsystem/persistence/Initialize()
|
||||||
for(var/datum/persistent/P as anything in subtypesof(/datum/persistent))
|
for(var/datum/persistent/P as anything in subtypesof(/datum/persistent))
|
||||||
if(initial(P.name))
|
if(initial(P.name))
|
||||||
@@ -18,7 +17,6 @@ SUBSYSTEM_DEF(persistence)
|
|||||||
persistence_datums[P.type] = P
|
persistence_datums[P.type] = P
|
||||||
P.Initialize()
|
P.Initialize()
|
||||||
return SS_INIT_SUCCESS
|
return SS_INIT_SUCCESS
|
||||||
// CHOMPEdit End
|
|
||||||
|
|
||||||
/datum/controller/subsystem/persistence/Shutdown()
|
/datum/controller/subsystem/persistence/Shutdown()
|
||||||
for(var/thing in persistence_datums)
|
for(var/thing in persistence_datums)
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ SUBSYSTEM_DEF(planets)
|
|||||||
var/static/list/needs_sun_update = list()
|
var/static/list/needs_sun_update = list()
|
||||||
var/static/list/needs_temp_update = list()
|
var/static/list/needs_temp_update = list()
|
||||||
|
|
||||||
/datum/controller/subsystem/planets/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/planets/Initialize()
|
||||||
admin_notice(span_danger("Initializing planetary weather."), R_DEBUG)
|
admin_notice(span_danger("Initializing planetary weather."), R_DEBUG)
|
||||||
createPlanets()
|
createPlanets()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/planets/proc/createPlanets()
|
/datum/controller/subsystem/planets/proc/createPlanets()
|
||||||
var/list/planet_datums = using_map.planet_datums_to_make
|
var/list/planet_datums = using_map.planet_datums_to_make
|
||||||
|
|||||||
@@ -26,11 +26,9 @@ SUBSYSTEM_DEF(plants)
|
|||||||
msg = "P:[processing.len]|S:[seeds.len]"
|
msg = "P:[processing.len]|S:[seeds.len]"
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
//CHOMPEdit Begin
|
|
||||||
/datum/controller/subsystem/plants/Initialize()
|
/datum/controller/subsystem/plants/Initialize()
|
||||||
setup()
|
setup()
|
||||||
return SS_INIT_SUCCESS
|
return SS_INIT_SUCCESS
|
||||||
//CHOMPEdit End
|
|
||||||
|
|
||||||
// Predefined/roundstart varieties use a string key to make it
|
// Predefined/roundstart varieties use a string key to make it
|
||||||
// easier to grab the new variety when mutating. Post-roundstart
|
// easier to grab the new variety when mutating. Post-roundstart
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
/*
|
/// Player tips procs and lists are defined under /code/modules/player_tips_vr
|
||||||
Player tips procs and lists are defined under /code/modules/player_tips_vr
|
|
||||||
*/
|
|
||||||
SUBSYSTEM_DEF(player_tips)
|
SUBSYSTEM_DEF(player_tips)
|
||||||
name = "Periodic Player Tips"
|
name = "Periodic Player Tips"
|
||||||
priority = FIRE_PRIORITY_PLAYERTIPS
|
priority = FIRE_PRIORITY_PLAYERTIPS
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ PROCESSING_SUBSYSTEM_DEF(fastprocess)
|
|||||||
name = "Fast Processing"
|
name = "Fast Processing"
|
||||||
wait = 2
|
wait = 2
|
||||||
stat_tag = "FP"
|
stat_tag = "FP"
|
||||||
flags = SS_NO_INIT // CHOMPEdit
|
flags = SS_NO_INIT
|
||||||
|
|
||||||
/datum/controller/subsystem/processing/fastprocess/Recover()
|
/datum/controller/subsystem/processing/fastprocess/Recover()
|
||||||
log_debug("[name] subsystem Recover().")
|
log_debug("[name] subsystem Recover().")
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ PROCESSING_SUBSYSTEM_DEF(instruments)
|
|||||||
/datum/controller/subsystem/processing/instruments/Initialize()
|
/datum/controller/subsystem/processing/instruments/Initialize()
|
||||||
initialize_instrument_data()
|
initialize_instrument_data()
|
||||||
synthesizer_instrument_ids = get_allowed_instrument_ids()
|
synthesizer_instrument_ids = get_allowed_instrument_ids()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/processing/instruments/proc/on_song_new(datum/song/S)
|
/datum/controller/subsystem/processing/instruments/proc/on_song_new(datum/song/S)
|
||||||
songs += S
|
songs += S
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
PROCESSING_SUBSYSTEM_DEF(turfs)
|
PROCESSING_SUBSYSTEM_DEF(turfs)
|
||||||
name = "Turf Processing"
|
name = "Turf Processing"
|
||||||
wait = 20
|
wait = 20
|
||||||
flags = SS_NO_INIT // CHOMPEdit
|
flags = SS_NO_INIT
|
||||||
|
|
||||||
/datum/controller/subsystem/processing/turfs/Recover()
|
/datum/controller/subsystem/processing/turfs/Recover()
|
||||||
log_debug("[name] subsystem Recover().")
|
log_debug("[name] subsystem Recover().")
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ SUBSYSTEM_DEF(robot_sprites)
|
|||||||
|
|
||||||
/datum/controller/subsystem/robot_sprites/Initialize()
|
/datum/controller/subsystem/robot_sprites/Initialize()
|
||||||
initialize_borg_sprites()
|
initialize_borg_sprites()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/robot_sprites/proc/initialize_borg_sprites()
|
/datum/controller/subsystem/robot_sprites/proc/initialize_borg_sprites()
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(server_maint)
|
|||||||
/*/datum/controller/subsystem/server_maint/PreInit()
|
/*/datum/controller/subsystem/server_maint/PreInit()
|
||||||
world.hub_password = "" *///quickly! before the hubbies see us.
|
world.hub_password = "" *///quickly! before the hubbies see us.
|
||||||
|
|
||||||
/datum/controller/subsystem/server_maint/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/server_maint/Initialize()
|
||||||
if (fexists("tmp/"))
|
if (fexists("tmp/"))
|
||||||
fdel("tmp/")
|
fdel("tmp/")
|
||||||
//if (CONFIG_GET(flag/hub))
|
//if (CONFIG_GET(flag/hub))
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ SUBSYSTEM_DEF(shuttles)
|
|||||||
|
|
||||||
var/tmp/list/current_run // Shuttles remaining to process this fire() tick
|
var/tmp/list/current_run // Shuttles remaining to process this fire() tick
|
||||||
|
|
||||||
/datum/controller/subsystem/shuttles/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/shuttles/Initialize()
|
||||||
last_landmark_registration_time = world.time
|
last_landmark_registration_time = world.time
|
||||||
// Find all declared shuttle datums and initailize them. (Okay, queue them for initialization a few lines further down)
|
// Find all declared shuttle datums and initailize them. (Okay, queue them for initialization a few lines further down)
|
||||||
for(var/shuttle_type in subtypesof(/datum/shuttle)) // This accounts for most shuttles, though away maps can queue up more.
|
for(var/shuttle_type in subtypesof(/datum/shuttle)) // This accounts for most shuttles, though away maps can queue up more.
|
||||||
@@ -43,7 +43,7 @@ SUBSYSTEM_DEF(shuttles)
|
|||||||
LAZYDISTINCTADD(shuttles_to_initialize, shuttle_type)
|
LAZYDISTINCTADD(shuttles_to_initialize, shuttle_type)
|
||||||
block_init_queue = FALSE
|
block_init_queue = FALSE
|
||||||
process_init_queues()
|
process_init_queues()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/shuttles/fire(resumed = 0)
|
/datum/controller/subsystem/shuttles/fire(resumed = 0)
|
||||||
if (!resumed)
|
if (!resumed)
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ SUBSYSTEM_DEF(skybox)
|
|||||||
. = ..()
|
. = ..()
|
||||||
|
|
||||||
/datum/controller/subsystem/skybox/Initialize()
|
/datum/controller/subsystem/skybox/Initialize()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/skybox/proc/get_skybox(z)
|
/datum/controller/subsystem/skybox/proc/get_skybox(z)
|
||||||
if(!subsystem_initialized)
|
if(!subsystem_initialized)
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ SUBSYSTEM_DEF(sounds)
|
|||||||
|
|
||||||
/datum/controller/subsystem/sounds/Initialize()
|
/datum/controller/subsystem/sounds/Initialize()
|
||||||
setup_available_channels()
|
setup_available_channels()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/sounds/proc/setup_available_channels()
|
/datum/controller/subsystem/sounds/proc/setup_available_channels()
|
||||||
channel_list = list()
|
channel_list = list()
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ SUBSYSTEM_DEF(sqlite)
|
|||||||
flags = SS_NO_FIRE
|
flags = SS_NO_FIRE
|
||||||
var/database/sqlite_db = null
|
var/database/sqlite_db = null
|
||||||
|
|
||||||
/datum/controller/subsystem/sqlite/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/sqlite/Initialize()
|
||||||
connect()
|
connect()
|
||||||
if(sqlite_db)
|
if(sqlite_db)
|
||||||
init_schema(sqlite_db)
|
init_schema(sqlite_db)
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/sqlite/proc/connect()
|
/datum/controller/subsystem/sqlite/proc/connect()
|
||||||
if(!CONFIG_GET(flag/sqlite_enabled))
|
if(!CONFIG_GET(flag/sqlite_enabled))
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
SUBSYSTEM_DEF(sun)
|
SUBSYSTEM_DEF(sun)
|
||||||
name = "Sun"
|
name = "Sun"
|
||||||
wait = 600
|
wait = 600
|
||||||
flags = SS_NO_INIT // CHOMPEdit
|
flags = SS_NO_INIT
|
||||||
var/static/datum/sun/sun = new
|
var/static/datum/sun/sun = new
|
||||||
|
|
||||||
/datum/controller/subsystem/sun/fire()
|
/datum/controller/subsystem/sun/fire()
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ SUBSYSTEM_DEF(supply)
|
|||||||
else
|
else
|
||||||
qdel(P)
|
qdel(P)
|
||||||
|
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
// Supply shuttle ticker - handles supply point regeneration. Just add points over time.
|
// Supply shuttle ticker - handles supply point regeneration. Just add points over time.
|
||||||
/datum/controller/subsystem/supply/fire()
|
/datum/controller/subsystem/supply/fire()
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ var/global/datum/controller/subsystem/ticker/ticker
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
GLOB.autospeaker = new (null, null, null, 1) //Set up Global Announcer
|
GLOB.autospeaker = new (null, null, null, 1) //Set up Global Announcer
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/ticker/fire(resumed = FALSE)
|
/datum/controller/subsystem/ticker/fire(resumed = FALSE)
|
||||||
switch(current_state)
|
switch(current_state)
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ SUBSYSTEM_DEF(transcore)
|
|||||||
warning("Instantiated transcore DB without a key: [t]")
|
warning("Instantiated transcore DB without a key: [t]")
|
||||||
continue
|
continue
|
||||||
databases[db.key] = db
|
databases[db.key] = db
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/transcore/fire(resumed = 0)
|
/datum/controller/subsystem/transcore/fire(resumed = 0)
|
||||||
var/timer = TICK_USAGE
|
var/timer = TICK_USAGE
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ SUBSYSTEM_DEF(vis_overlays)
|
|||||||
|
|
||||||
/datum/controller/subsystem/vis_overlays/Initialize()
|
/datum/controller/subsystem/vis_overlays/Initialize()
|
||||||
vis_overlay_cache = list()
|
vis_overlay_cache = list()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/vis_overlays/fire(resumed = FALSE)
|
/datum/controller/subsystem/vis_overlays/fire(resumed = FALSE)
|
||||||
if(!resumed)
|
if(!resumed)
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ SUBSYSTEM_DEF(webhooks)
|
|||||||
|
|
||||||
/datum/controller/subsystem/webhooks/Initialize()
|
/datum/controller/subsystem/webhooks/Initialize()
|
||||||
load_webhooks()
|
load_webhooks()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/webhooks/proc/load_webhooks()
|
/datum/controller/subsystem/webhooks/proc/load_webhooks()
|
||||||
|
|
||||||
|
|||||||
@@ -14,9 +14,9 @@ SUBSYSTEM_DEF(xenoarch)
|
|||||||
var/list/artifact_spawning_turfs = list()
|
var/list/artifact_spawning_turfs = list()
|
||||||
var/list/digsite_spawning_turfs = list()
|
var/list/digsite_spawning_turfs = list()
|
||||||
|
|
||||||
/datum/controller/subsystem/xenoarch/Initialize() // CHOMPEdit
|
/datum/controller/subsystem/xenoarch/Initialize()
|
||||||
SetupXenoarch()
|
SetupXenoarch()
|
||||||
return SS_INIT_SUCCESS // CHOMPEdit
|
return SS_INIT_SUCCESS
|
||||||
|
|
||||||
/datum/controller/subsystem/xenoarch/Recover()
|
/datum/controller/subsystem/xenoarch/Recover()
|
||||||
if (istype(SSxenoarch.artifact_spawning_turfs))
|
if (istype(SSxenoarch.artifact_spawning_turfs))
|
||||||
|
|||||||
@@ -185,7 +185,7 @@
|
|||||||
#include "code\__defines\dcs\helpers.dm"
|
#include "code\__defines\dcs\helpers.dm"
|
||||||
#include "code\__defines\dcs\signals.dm"
|
#include "code\__defines\dcs\signals.dm"
|
||||||
#include "code\__defines\dcs\signals_ch.dm"
|
#include "code\__defines\dcs\signals_ch.dm"
|
||||||
#include "code\__defines\dcs\signals_ch\signals_subsystem.dm"
|
#include "code\__defines\dcs\signals\signals_subsystem.dm"
|
||||||
#include "code\__defines\dcs\signals_ch\signals_mob\signals_mob_main_ch.dm"
|
#include "code\__defines\dcs\signals_ch\signals_mob\signals_mob_main_ch.dm"
|
||||||
#include "code\__defines\traits\_traits.dm"
|
#include "code\__defines\traits\_traits.dm"
|
||||||
#include "code\__defines\traits\declarations.dm"
|
#include "code\__defines\traits\declarations.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user