mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-21 20:14:31 +01:00
@@ -17,10 +17,10 @@ SUBSYSTEM_DEF(events)
|
||||
|
||||
/datum/controller/subsystem/events/Initialize()
|
||||
allEvents = subtypesof(/datum/event)
|
||||
event_containers = alist(
|
||||
EVENT_LEVEL_MUNDANE = new/datum/event_container/mundane,
|
||||
EVENT_LEVEL_MODERATE = new/datum/event_container/moderate,
|
||||
EVENT_LEVEL_MAJOR = new/datum/event_container/major
|
||||
event_containers = list(
|
||||
/*EVENT_LEVEL_MUNDANE = */ new/datum/event_container/mundane,
|
||||
/*EVENT_LEVEL_MODERATE = */ new/datum/event_container/moderate,
|
||||
/*EVENT_LEVEL_MAJOR = */ new/datum/event_container/major
|
||||
)
|
||||
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)
|
||||
|
||||
@@ -379,7 +379,7 @@ SUBSYSTEM_DEF(timer)
|
||||
var/spent = 0
|
||||
/// Holds info about this timer, stored from the moment it was created
|
||||
/// Used to create a visible "name" whenever the timer is stringified
|
||||
var/alist/timer_info
|
||||
var/list/timer_info
|
||||
/// Next timed event in the bucket
|
||||
var/datum/timedevent/next
|
||||
/// Previous timed event in the bucket
|
||||
@@ -521,31 +521,31 @@ SUBSYSTEM_DEF(timer)
|
||||
/datum/timedevent/proc/bucketJoin()
|
||||
#if defined(TIMER_DEBUG)
|
||||
// Generate debug-friendly list for timer, more complex but also more expensive
|
||||
timer_info = alist(
|
||||
1 = id,
|
||||
2 = timeToRun,
|
||||
3 = wait,
|
||||
4 = flags,
|
||||
5 = callBack, /* Safe to hold this directly because it's never del'd */
|
||||
6 = "[callBack.object]",
|
||||
7 = text_ref(callBack.object),
|
||||
8 = getcallingtype(),
|
||||
9 = callBack.delegate,
|
||||
10 = callBack.arguments ? callBack.arguments.Copy() : null,
|
||||
11 = "[source]"
|
||||
timer_info = list(
|
||||
/* 1 = */ id,
|
||||
/* 2 = */ timeToRun,
|
||||
/* 3 = */ wait,
|
||||
/* 4 = */ flags,
|
||||
/* 5 = */ callBack, /* Safe to hold this directly because it's never del'd */
|
||||
/* 6 = */ "[callBack.object]",
|
||||
/* 7 = */ text_ref(callBack.object),
|
||||
/* 8 = */ getcallingtype(),
|
||||
/* 9 = */ callBack.delegate,
|
||||
/* 10 = */ callBack.arguments ? callBack.arguments.Copy() : null,
|
||||
/* 11 = */ "[source]"
|
||||
)
|
||||
#else
|
||||
// Generate a debuggable list for the timer, simpler but wayyyy cheaper, string generation (and ref/copy memes) is a bitch and this saves a LOT of time
|
||||
timer_info = alist(
|
||||
1 = id,
|
||||
2 = timeToRun,
|
||||
3 = wait,
|
||||
4 = flags,
|
||||
5 = callBack, /* Safe to hold this directly because it's never del'd */
|
||||
6 = "[callBack.object]",
|
||||
7 = getcallingtype(),
|
||||
8 = callBack.delegate,
|
||||
9 = "[source]"
|
||||
timer_info = list(
|
||||
/* 1 = */ id,
|
||||
/* 2 = */ timeToRun,
|
||||
/* 3 = */ wait,
|
||||
/* 4 = */ flags,
|
||||
/* 5 = */ callBack, /* Safe to hold this directly because it's never del'd */
|
||||
/* 6 = */ "[callBack.object]",
|
||||
/* 7 = */ getcallingtype(),
|
||||
/* 8 = */ callBack.delegate,
|
||||
/* 9 = */ "[source]"
|
||||
)
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user