cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 01:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11957 from PsiOmegaDelta/160110-ProcessedEvents

Browse Source 
Event manager tweaks.
This commit is contained in:
GinjaNinja32
2016-01-11 17:15:07 +00:00
parent e90bfad7de b1fea3b090
commit 83f22da2e6
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/events/camera_damage.dm
View File

@@ -30,7 +30,7 @@
var/obj/machinery/camera/C = pick(cameranet.cameras)
if(is_valid_camera(C))
return C
return acquire_random_camera(remaining_attempts--)
return acquire_random_camera(remaining_attempts-1)
/datum/event/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C)
// Only return a functional camera, not installed in a silicon, and that exists somewhere players have access

8
code/modules/events/event_manager.dm
View File

@@ -23,14 +23,6 @@
/datum/event_manager/New()
allEvents = typesof(/datum/event) - /datum/event
/datum/event_manager/proc/process()
for(var/datum/event/E in event_manager.active_events)
E.process()
for(var/i = EVENT_LEVEL_MUNDANE to EVENT_LEVEL_MAJOR)
var/list/datum/event_container/EC = event_containers[i]
EC.process()
/datum/event_manager/proc/event_complete(var/datum/event/E)
if(!E.event_meta || !E.severity) // datum/event is used here and there for random reasons, maintaining "backwards compatibility"
log_debug("Event of '[E.type]' with missing meta-data has completed.")