returning parent value

This commit is contained in:
Fox McCloud
2019-04-24 01:11:42 -04:00
parent 89883a7b28
commit 5bdbb64da2
11 changed files with 15 additions and 14 deletions
+1 -1
View File
@@ -67,7 +67,7 @@ SUBSYSTEM_DEF(air)
setup_allturfs()
setup_atmos_machinery(GLOB.machines)
setup_pipenets(GLOB.machines)
..()
return ..()
/datum/controller/subsystem/air/fire(resumed = 0)
+2 -2
View File
@@ -11,8 +11,8 @@ SUBSYSTEM_DEF(alarms)
/datum/controller/subsystem/alarms/Initialize(start_timeofday)
all_handlers = list(SSalarms.atmosphere_alarm, SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.fire_alarm, SSalarms.motion_alarm, SSalarms.power_alarm)
..()
return ..()
/datum/controller/subsystem/alarms/fire()
for(var/datum/alarm_handler/AH in all_handlers)
AH.process()
+1 -1
View File
@@ -14,4 +14,4 @@ SUBSYSTEM_DEF(assets)
for(var/client/C in GLOB.clients)
addtimer(CALLBACK(GLOBAL_PROC, .proc/getFilesSlow, C, preload, FALSE), 10)
..()
return ..()
+1
View File
@@ -19,6 +19,7 @@ SUBSYSTEM_DEF(atoms)
setupgenetics()
initialized = INITIALIZATION_INNEW_MAPLOAD
InitializeAtoms()
return ..()
+3 -3
View File
@@ -4,7 +4,7 @@ SUBSYSTEM_DEF(events)
runlevels = RUNLEVEL_GAME
// Report events at the end of the rouund
var/report_at_round_end = 0
// UI vars
var/window_x = 700
var/window_y = 600
@@ -13,7 +13,7 @@ SUBSYSTEM_DEF(events)
var/row_options1 = " width='85px'"
var/row_options2 = " width='260px'"
var/row_options3 = " width='150px'"
// Event vars
var/datum/event_container/selected_event_container = null
var/list/active_events = list()
@@ -29,7 +29,7 @@ SUBSYSTEM_DEF(events)
/datum/controller/subsystem/events/Initialize()
allEvents = subtypesof(/datum/event)
..()
return ..()
/datum/controller/subsystem/events/fire()
for(var/datum/event/E in active_events)
+1 -1
View File
@@ -28,4 +28,4 @@ SUBSYSTEM_DEF(holiday)
if(prob(H.eventChance))
H.handle_event()
..()
return ..()
+1 -1
View File
@@ -29,4 +29,4 @@ SUBSYSTEM_DEF(icon_smooth)
smooth_icon(A)
CHECK_TICK
..()
return ..()
+1 -1
View File
@@ -17,7 +17,7 @@ SUBSYSTEM_DEF(jobs)
if(!occupations.len)
SetupOccupations()
LoadJobs("config/jobs.txt")
..()
return ..()
/datum/controller/subsystem/jobs/proc/SetupOccupations(var/list/faction = list("Station"))
occupations = list()
+1 -1
View File
@@ -17,7 +17,7 @@ SUBSYSTEM_DEF(machines)
/datum/controller/subsystem/machines/Initialize()
makepowernets()
fire()
..()
return ..()
/datum/controller/subsystem/machines/proc/makepowernets()
for(var/datum/powernet/PN in powernets)
+2 -2
View File
@@ -28,7 +28,7 @@ SUBSYSTEM_DEF(mapping)
// Populate mining Z-level hidden rooms
for(var/i=0, i<max_secret_rooms, i++)
make_mining_asteroid_secret()
..()
return ..()
/datum/controller/subsystem/mapping/Recover()
flags |= SS_NO_INIT
flags |= SS_NO_INIT
+1 -1
View File
@@ -45,7 +45,7 @@ SUBSYSTEM_DEF(weather)
for(var/z in levels_by_trait(target_trait))
LAZYINITLIST(eligible_zlevels["[z]"])
eligible_zlevels["[z]"][W] = probability
..()
return ..()
/datum/controller/subsystem/weather/proc/run_weather(datum/weather/weather_datum_type, z_levels)
if(istext(weather_datum_type))