"
html += "
Event Start
"
@@ -138,14 +139,16 @@
html += "
"
html += "
Running Events
"
html += "
"
- html += "SeverityNameStop
"
+ html += "SeverityNameEnds InStop
"
for(var/datum/event/E in active_events)
if(!E.event_meta)
continue
var/datum/event_meta/EM = E.event_meta
+ var/ends_in = max(0, round((E.started + (E.endWhen * 10) - world.timeofday) / 600, 0.1))
html += ""
html += "| [severity_to_string[EM.severity]] | "
html += "[EM.name] | "
+ html += "[ends_in] | "
html += "Stop | "
html += "
"
html += ""
@@ -159,25 +162,35 @@
if(href_list["dec_timer"])
var/datum/event_container/EC = locate(href_list["event"])
- EC.next_event_time -= (60 * RaiseToPower(10, text2num(href_list["dec_timer"])))
+ var/decrease = (60 * RaiseToPower(10, text2num(href_list["dec_timer"])))
+ EC.next_event_time -= decrease
+ admin_log_and_message_admins("decreased timer for [severity_to_string[EC.severity]] events by [decrease/600] minute(s).")
else if(href_list["inc_timer"])
var/datum/event_container/EC = locate(href_list["event"])
- EC.next_event_time += (60 * RaiseToPower(10, text2num(href_list["inc_timer"])))
+ var/increase = (60 * RaiseToPower(10, text2num(href_list["inc_timer"])))
+ EC.next_event_time += increase
+ admin_log_and_message_admins("increased timer for [severity_to_string[EC.severity]] events by [increase/600] minute(s).")
else if(href_list["select_event"])
var/datum/event_container/EC = locate(href_list["select_event"])
- EC.SelectEvent()
+ var/datum/event_meta/EM = EC.SelectEvent()
+ if(EM)
+ admin_log_and_message_admins("has queued the [severity_to_string[EC.severity]] event '[EM.name]'.")
else if(href_list["pause"])
var/datum/event_container/EC = locate(href_list["pause"])
EC.delayed = !EC.delayed
+ admin_log_and_message_admins("has [EC.delayed ? "paused" : "resumed"] countdown for [severity_to_string[EC.severity]] events.")
else if(href_list["interval"])
var/delay = input("Enter delay modifier. A value less than one means events fire more often, higher than one less often.", "Set Interval Modifier") as num|null
if(delay && delay > 0)
var/datum/event_container/EC = locate(href_list["interval"])
EC.delay_modifier = delay
+ admin_log_and_message_admins("has set the interval modifier for [severity_to_string[EC.severity]] events to [EC.delay_modifier].")
else if(href_list["stop"])
if(alert("Stopping an event may have unintended side-effects. Continue?","Stopping Event!","Yes","No") != "Yes")
return
var/datum/event/E = locate(href_list["stop"])
+ var/datum/event_meta/EM = E.event_meta
+ admin_log_and_message_admins("has stopped the [severity_to_string[EM.severity]] event '[EM.name]'.")
E.kill()
else if(href_list["view_events"])
selected_event_container = locate(href_list["view_events"])
@@ -198,35 +211,43 @@
if(weight && weight > 0)
var/datum/event_meta/EM = locate(href_list["set_weight"])
EM.weight = weight
+ if(EM != new_event)
+ admin_log_and_message_admins("has changed the weight of the [severity_to_string[EM.severity]] event '[EM.name]' to [EM.weight].")
else if(href_list["set_oneshot"])
var/datum/event_meta/EM = locate(href_list["set_oneshot"])
EM.one_shot = !EM.one_shot
+ if(EM != new_event)
+ admin_log_and_message_admins("has [EM.one_shot ? "set" : "unset"] the oneshot flag for the [severity_to_string[EM.severity]] event '[EM.name]'.")
else if(href_list["set_enabled"])
var/datum/event_meta/EM = locate(href_list["set_enabled"])
EM.enabled = !EM.enabled
+ admin_log_and_message_admins("has [EM.enabled ? "enabled" : "disabled"] the [severity_to_string[EM.severity]] event '[EM.name]'.")
else if(href_list["remove"])
if(alert("This will remove the event from rotation. Continue?","Removing Event!","Yes","No") != "Yes")
return
var/datum/event_meta/EM = locate(href_list["remove"])
var/datum/event_container/EC = locate(href_list["EC"])
EC.available_events -= EM
+ admin_log_and_message_admins("has removed the [severity_to_string[EM.severity]] event '[EM.name]'.")
else if(href_list["add"])
if(!new_event.name || !new_event.event_type)
return
if(alert("This will add a new event to the rotation. Continue?","Add Event!","Yes","No") != "Yes")
return
selected_event_container.available_events += new_event
+ admin_log_and_message_admins("has added \a [severity_to_string[new_event.severity]] event '[new_event.name]' of type [new_event.event_type] with weight [new_event.weight].")
new_event = new
else if(href_list["clear"])
var/datum/event_container/EC = locate(href_list["clear"])
- EC.next_event = null
+ if(EC.next_event)
+ admin_log_and_message_admins("has unqueued the [severity_to_string[EC.severity]] event '[EC.next_event.name]'.")
+ EC.next_event = null
+ else if(href_list["report"])
+ report_at_round_end = !report_at_round_end
+ admin_log_and_message_admins("has [report_at_round_end ? "enabled" : "disabled"] the round end event report.")
Interact(usr)
-/proc/debugStartEvent(var/severity)
- var/datum/event_container/EC = event_manager.event_containers[severity]
- EC.start_event()
-
/client/proc/forceEvent(var/type in event_manager.allEvents)
set name = "Trigger Event (Debug Only)"
set category = "Debug"
diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm
index d54aa7c4ac0..6e263aaf12e 100644
--- a/code/modules/events/wallrot.dm
+++ b/code/modules/events/wallrot.dm
@@ -1,5 +1,5 @@
datum/event/wallrot/setup()
- name = "Wallroot"
+ name = "Wall rot"
announceWhen = rand(0, 300)
endWhen = announceWhen + 1