Merge pull request #6620 from Heroman3003/eventpause

Pauses event processing while doing event actions
This commit is contained in:
Atermonera
2020-01-15 20:43:25 -08:00
committed by VirgoBot
parent 708e0b477e
commit 4fb26a6429
2 changed files with 21 additions and 11 deletions

View File

@@ -21,7 +21,8 @@ SUBSYSTEM_DEF(events)
/datum/controller/subsystem/events/fire(resumed)
for(var/datum/event/E in active_events)
E.process()
if(E.processing_active)
E.process()
for(var/i = EVENT_LEVEL_MUNDANE to EVENT_LEVEL_MAJOR)
var/list/datum/event_container/EC = event_containers[i]