cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into morphevent

Browse Source
This commit is contained in:
Heroman3003
2020-01-16 14:55:19 +10:00
committed by GitHub
parent 4af118cb0d f99069e9ca
commit d2073b6ad8
14 changed files with 105 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@
if(!land_target)
kill()
/datum/event/meteor_strike/announce()
/datum/event/drone_pod_drop/announce()
command_announcement.Announce("An unidentified drone pod has been detected landing near the surface facilty. Open and examine at your own risk.", "NanoTrasen Orbital Monitoring")
/datum/event/drone_pod_drop/start()

30
code/modules/events/event.dm
View File

@@ -40,16 +40,16 @@
return total_weight
/datum/event //NOTE: Times are measured in master controller ticks!
var/startWhen = 0 //When in the lifetime to call start().
var/announceWhen = 0 //When in the lifetime to call announce().
var/endWhen = 0 //When in the lifetime the event should end.
var/startWhen = 0 //When in the lifetime to call start().
var/announceWhen = 0 //When in the lifetime to call announce().
var/endWhen = 0 //When in the lifetime the event should end.
var/severity = 0 //Severity. Lower means less severe, higher means more severe. Does not have to be supported. Is set on New().
var/activeFor = 0 //How long the event has existed. You don't need to change this.
var/isRunning = 1 //If this event is currently running. You should not change this.
var/startedAt = 0 //When this event started.
var/endedAt = 0 //When this event ended.
var/processing_active = TRUE //VOREStation Addition
var/severity = 0 //Severity. Lower means less severe, higher means more severe. Does not have to be supported. Is set on New().
var/activeFor = 0 //How long the event has existed. You don't need to change this.
var/isRunning = TRUE //If this event is currently running. You should not change this.
var/startedAt = 0 //When this event started.
var/endedAt = 0 //When this event ended.
var/processing_active = TRUE
var/datum/event_meta/event_meta = null
/datum/event/nothing
@@ -97,18 +97,26 @@
//This proc will handle the calls to the appropiate procs.
/datum/event/process()
if(activeFor > startWhen && activeFor < endWhen)
processing_active = FALSE
tick()
processing_active = TRUE
if(activeFor == startWhen)
isRunning = 1
isRunning = TRUE
processing_active = FALSE
start()
processing_active = TRUE
if(activeFor == announceWhen)
processing_active = FALSE
announce()
processing_active = TRUE
if(activeFor == endWhen)
isRunning = 0
isRunning = FALSE
processing_active = FALSE
end()
processing_active = TRUE
// Everything is done, let's clean up.
if(activeFor >= lastProcessAt())