Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms

Conflicts:
	code/__HELPERS/lists.dm
This commit is contained in:
Mark van Alphen
2015-08-03 23:59:45 +02:00
69 changed files with 639 additions and 164 deletions
@@ -57,7 +57,7 @@ var/global/datum/controller/processScheduler/processScheduler
var/process
// Add all the processes we can find, except for the ticker
for (process in typesof(/datum/controller/process) - /datum/controller/process)
for (process in subtypesof(/datum/controller/process))
if (!(process in deferredSetupList))
addProcess(new process(src))
+6 -2
View File
@@ -32,30 +32,32 @@ var/global/datum/controller/process/air_system/air_master
current_cycle++
process_active_turfs()
process_excited_groups()
scheck()
process_high_pressure_delta()
process_hotspots()
process_super_conductivity()
scheck()
return 1
/datum/controller/process/air_system/proc/process_hotspots()
for(var/obj/effect/hotspot/H in hotspots)
H.process()
scheck()
/datum/controller/process/air_system/proc/process_super_conductivity()
for(var/turf/simulated/T in active_super_conductivity)
T.super_conduct()
scheck()
/datum/controller/process/air_system/proc/process_high_pressure_delta()
for(var/turf/T in high_pressure_delta)
T.high_pressure_movements()
T.pressure_difference = 0
scheck()
high_pressure_delta.len = 0
/datum/controller/process/air_system/proc/process_active_turfs()
for(var/turf/simulated/T in active_turfs)
T.process_cell()
scheck()
/datum/controller/process/air_system/proc/remove_from_active(var/turf/simulated/T)
if(istype(T))
@@ -103,9 +105,11 @@ var/global/datum/controller/process/air_system/air_master
EG.breakdown_cooldown ++
if(EG.breakdown_cooldown == 10)
EG.self_breakdown()
scheck()
return
if(EG.breakdown_cooldown > 20)
EG.dismantle()
scheck()
/datum/controller/process/air_system/proc/setup_overlays()
plmaster = new /obj/effect/overlay()
+1 -1
View File
@@ -35,7 +35,7 @@ var/global/datum/controller/holiday/holiday_master //This has to be defined befo
var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month
var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day
for(var/H in typesof(/datum/holiday) - /datum/holiday)
for(var/H in subtypesof(/datum/holiday))
var/datum/holiday/holiday = new H()
if(holiday.shouldCelebrate(DD, MM, YY))
holiday.celebrate()
+1 -2
View File
@@ -6,5 +6,4 @@
garbageCollector = new
/datum/controller/process/garbage/doWork()
garbageCollector.process()
scheck()
garbageCollector.process()
+3 -3
View File
@@ -161,7 +161,7 @@
var/list/overflow_whitelist = list() //whitelist for overflow
/datum/configuration/New()
var/list/L = typesof(/datum/game_mode) - /datum/game_mode
var/list/L = subtypesof(/datum/game_mode)
for (var/T in L)
// I wish I didn't have to instance the game modes in order to look up
// their information, but it is the only way (at least that I know of).
@@ -688,7 +688,7 @@
/datum/configuration/proc/pick_mode(mode_name)
// I wish I didn't have to instance the game modes in order to look up
// their information, but it is the only way (at least that I know of).
for (var/T in (typesof(/datum/game_mode) - /datum/game_mode))
for (var/T in subtypesof(/datum/game_mode))
var/datum/game_mode/M = new T()
if (M.config_tag && M.config_tag == mode_name)
return M
@@ -697,7 +697,7 @@
/datum/configuration/proc/get_runnable_modes()
var/list/datum/game_mode/runnable_modes = new
for (var/T in (typesof(/datum/game_mode) - /datum/game_mode))
for (var/T in subtypesof(/datum/game_mode))
var/datum/game_mode/M = new T()
//world << "DEBUG: [T], tag=[M.config_tag], prob=[probabilities[M.config_tag]]"
if (!(M.config_tag in modes))