From 914fc74a7abe0f22ba00ef0fbe7cbf35a899fd9d Mon Sep 17 00:00:00 2001 From: Neerti Date: Tue, 28 May 2019 14:23:54 -0400 Subject: [PATCH] Merge pull request #6182 from mistyLuminescence/eventroundstart No More Pre-Roundstart Events --- code/modules/events/event_container.dm | 3 ++ .../mistyLuminescence - randomevents.yml | 36 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 html/changelogs/mistyLuminescence - randomevents.yml diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index dee085dc2b..a4c55b27ae 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -22,6 +22,9 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT var/last_world_time = 0 /datum/event_container/process() + if(!round_start_time) + return //don't do events if the round hasn't even started yet + if(!next_event_time) set_event_delay() diff --git a/html/changelogs/mistyLuminescence - randomevents.yml b/html/changelogs/mistyLuminescence - randomevents.yml new file mode 100644 index 0000000000..e5659f8a4e --- /dev/null +++ b/html/changelogs/mistyLuminescence - randomevents.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: mistyLuminescence + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: Random event timers now wait until the round starts to begin counting down. \ No newline at end of file