Event system refactor and changes (#29420)

* meta resolution

* emerald resolution

* delta resolution

* fartgas resolution

* box box

* stay out stay out

* metastation fixes

* faragus fix

* delta fix

* Changes to role impact on event weight

* adds disaster level to the event config

* weight changes and starts adding disaster level to the ui

* ui fixes

* adjust disaster level timing

* changes disaster timing, weights, disease outbreak role requirements and weights

* lots of weight an requirement adjustments

* Update tear.dm

* some fixes

* meta changes

* Starting over with farragus

* Starting over in faragus

* faragus changes

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* resolving some faragus conflicts

* resolve faragus conflicts

* resolves delta conflicts

* resolves cyberiad conflicts

* resolves emerald conflicts

* fixes cables in faragus

* fixes meta cables

* fixes delta cables

* more meta fixes

* more farragus cable fixes

* more cable fixes

* meta and faragus fixes

* box and delta fixes

* more mapping fixes

* hopefully the last fix

* Update metastation.dmm

* Update metastation.dmm

* fixes shorts on cyberiad cerebron and farragus

* CI fixes

* move new event listing to new system

* Adds tracking and cost calculation for blob

* finishes setting up blob event detection and costs

* minor boolog corrections

* fixes events being created at the wrong severity

* adds ongoing cost to disease outbreak

* moves terror spider event to new system

* moves to component based event cost calculation

* morph abductor and carps adjusted for new system

* various fixes and adjusts rev event

* Update revenant_spawn_event.dm

* various fixes and adjusts demon incursion to the new system

* adjusts some major event weights

* correct wrong values of autoend on vendor uprising and rev

* Update event_container.dm

* more event timing adjustments

* adds requirements to traders and incursion

* slightly lowers requirements for biohazards

* timing changes

* temporarily disable loading event times from the config and increases major nothing chance

* adjustments to costs and weights of various events

* Update event_container.dm

* additional adjustments to weights and requirements. moves rev to major

* typo fix

* ion storm adjustment

* Update event_container.dm

* more moderate changes

* e

* Update meteors_event.dm

* removes cooldown from nothing event and changes its weight based on the number of remaining enabled events in the container

* increases morph event requirements and chance of nothing moderate event

* makes morph a major event

* Update morph_event.dm

* adds viro requirement for disease outbreak and fixes a bug with incorrect resource calculation

* allows varediting extra roles for the event system for debug and testing

* Adjust weights of traders and abductors and corrects wrong nominal severity for demonic incursion

* Adds crew cound to rev weight

* makes disasters start rolling later

* reduces weight of communications blackout and increases weight of major nothing

* adjusts door runtime and prisonbreak weights to make them less frequent. kudzu now scales with total crew

* apc overload made less frequent

* oopsy

* Gives the scrubber clog event a name

* fixes a type in a define name

* adjusts demonic incursion weight

* changes brand intelligence weight an d reduces door runtime weight

* more adjustments to demon incursion. Makes additional weight from surplus roles diminish

* adjustments to some minor events

* Increases event length and requirements of some engineering events and lowers their weight slightly. Also increases cost of ongoing diseases events

* fixes a type

* Update meteors_event.dm

* corrects traders nominal severity and adjusts demon weights

* shifts anomaly weights down and increases costs

* rebalance rod requirements

* Update cerestation.dmm

* moves net resource calculation to its own proc and changes the ASSIGNMENT_TOTAL macro to ASSIGNMENT_CREW.

* Adds individual first run time for some events and makes majors start rolling slightly later

* reduces weight of major nothing

* minor reduction to rev and apc overload weight

* Changes the way event weight is calculated

* end time corrections for anomaly rod and meteors

* slightly adjusts down the weights of nothing and some minor events

* Adjusts moedrates towards about 3.5 per round and mundanes towards 8 per round

* adds first run restrictions on traders and incursion and increases the cooldown time of events

* resolve faragus conflicts

* resolve emerald conflict

* fix some faragus cabling

* more cabling correction in faragus

* more cable fixes

* Update cerestation.dmm

* remove doubled scrubber pipe on tile

* reduces moderates nothing chance

* slightly reduces crew requirements for disasters and also reduces crew weight for disasters

* fixes meteor event not removing the alert, and makes it announce a bit later

* Adds an event debugging window for real time midround event data

* Revert "Adds an event debugging window for real time midround event data"

This reverts commit ecd99a6c9e.

* Adds a resource view button to the event manager window and fixes a null in the total resource list

* various bug fixes

* slightly lowers chance of meteor and similar events

* Slightly lowers requirement weights on disaster level events

* resolves faragus conflict

* changes the default power input of engineering SMES to 200kw and 80kW respectively

* connects power monitoring computers to the grid that weren't

* meta station elec maints improvements

* adds missing power monitoring computers on box and delta

* removes dirt from wall

* corrects area boundry on meta

* adds missing cable on box sci

* removes dirt from wall on box

* connects cyberiad bridge to the rest of the powernet

* connects box brig to powernet

* Adds catwalks to box maints

* adds catwalks to meta

* Adds catwalks to delta

* Update deltastation.dmm

* adds ability to insulate cables

* Moves stations to using extra insulated cables for high power network

* Removes catwalks from meta

* Removes catwalks from box

* Removes catwalks from delta

* Delays moderates and majors more and increases disaster chance

* resolves box conflicts

* Update cable.dm

* remove floating request console

* corrects position of fire alarm and removes extra intercom on metastation

* resolves faragus conflict

* reduces meteor variant weights. meaty ores event now has the correct nominal severity

* meaty ore weight to 8

* fixes a stray light bulb and light switch in maints as well as a doubled power

* Delays meteor type events to 40 minutes at the earliest. Moves the time check to be against round time instead of world time

* wires kerberos security checkpoint to the grid

* Update cerestation.dmm

* Removes stray extinguisher cabinet from meta station

* resolves area conflict on faragus

* resolves more faragus issues

* fixes faragus cabling issues

* Update cerestation.dmm

* removes another stray fire extinguisher cabinet

* insulates the APC in delta PTL room

* increases pop requirement and weight for demons and increases medbay and viro weights for diseases

* connect delta fore starboard solars to the high power grid instead of the low power

* Update deltastation.dmm

* deconflict

* solves some unconnected cables

* connects delta customs to network and finishes resolving conflicts

* Update deltastation.dmm

* adds the new cables. needs coils and mapping

* moves connection perms to the heavy duty cables. toggled with engineering permission ID. box gets new cables

* sorts cables on stations

* faragus cable connections

* cable corrections. Adds heavy duty cables to the autolathe

* CI fix

* more fixes and makes the new cables show up on t ray scanners

* box station mapping fixes

* delta mapping fixes

* meta fix

* Update deltastation.dmm

* delta and faragus fixes

* Update emeraldstation.dmm

* removes APC overloard(major) from event pool

* adds diagonal sprites to heavy duty cables. allows sillicons to toggle them and

* Makes borg versions of the heavy duty cable coil

* palete consolidation

* Improves visibility of high power cables

* converts shuttle event to new system

* makes disaster event last run calc use round time instead of world time

* fixes wrong define being used in some event requirements. further increases requirements for demons and meteors. lowers weight of major diseases

* Update slaughterevent.dm

* reduces cargo requirements for shuttle load event

* reduces base weight of major disease event and further increases medical requirements

* fixes a wrong wire under the pet store maints door in delta station

* resolve mapping conflicts

* Revert "resolve mapping conflicts"

This reverts commit 129db52501.

* Revert "Merge branch 'HighPowerMaints' into event_timing"

This reverts commit 2594ac8928, reversing
changes made to a738b5f2f2.

* fixes some wonky stuff with xeno code

* Adds a crew cost to diseases

* makes player contribution towards events variable

* changes major event weights and slightly increases demon requirements

* slightly increases major disease outbreak weight

* comment changes

* Adds safeties to protect against null events getting into container or the active list

* blob fix

* Adds a confirmation to random event toggle

* Adjust particulate event weight to fit the new moderate weights

* Adds additional security costs to changeling and vamp

* Update revenant_spawn_event.dm

* uses correct path for rev event cost proc

* changes some lists to alists

* correctly accesses the event container list and actually uses the config for the event timing

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman3595@gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>

code/controllers/configuration/sections/event_configuration.dm

@@ -3,23 +3,26 @@
 	/// Do we want to enable random events at all
 	var/enable_random_events = TRUE
 	/// Assoc list of when the first event in a group can run. key: severity | value: assoc list with upper and low bounds (key: "upper"/"lower" | value: time in deciseconds)
-	var/list/first_run_times = list(
+	var/list/first_run_times = alist(
 		EVENT_LEVEL_MUNDANE = null,
-		EVENT_LEVEL_MODERATE = null,
-		EVENT_LEVEL_MAJOR = list("lower" = 40 MINUTES, "upper" = 50 MINUTES)
+		EVENT_LEVEL_MODERATE = list("lower" = 19 MINUTES, "upper" = 23 MINUTES),
+		EVENT_LEVEL_MAJOR = list("lower" = 29 MINUTES, "upper" = 36 MINUTES),
+		EVENT_LEVEL_DISASTER = list("lower" = 40 MINUTES, "upper" = 50 MINUTES)
 	) // <---- Whoever designed this needs to be shot
 
 	/// Assoc list of lower bounds of event delays. key: severity | value: delay (deciseconds)
-	var/list/delay_lower_bound = list(
+	var/list/delay_lower_bound = alist(
 		EVENT_LEVEL_MUNDANE = 5 MINUTES,
-		EVENT_LEVEL_MODERATE = 15 MINUTES,
-		EVENT_LEVEL_MAJOR = 25 MINUTES
+		EVENT_LEVEL_MODERATE = 7.5 MINUTES,
+		EVENT_LEVEL_MAJOR = 12 MINUTES,
+		EVENT_LEVEL_DISASTER = 9 MINUTES
 	)
 	/// Assoc list of lower bounds of event delays. key: severity | value: delay (deciseconds)
-	var/list/delay_upper_bound = list(
+	var/list/delay_upper_bound = alist(
 		EVENT_LEVEL_MUNDANE = 7.5 MINUTES,
-		EVENT_LEVEL_MODERATE = 22.5 MINUTES,
-		EVENT_LEVEL_MAJOR = 35 MINUTES
+		EVENT_LEVEL_MODERATE = 12 MINUTES,
+		EVENT_LEVEL_MAJOR = 17 MINUTES,
+		EVENT_LEVEL_DISASTER = 12 MINUTES
 	)
 	/// Expected time of a round in deciseconds
 	var/expected_round_length = 120 MINUTES // This macro is equivilent to 72,000 deciseconds
@@ -36,16 +39,19 @@
 		expected_round_length = data["expected_round_length"] MINUTES // Convert from minutes to deciseconds
 
 	// Load event severities. This is quite awful but needs to be done so we can account for config mistakes. This event system is awful
+
 	if(islist(data["event_delay_lower_bounds"]))
 		CONFIG_LOAD_NUM_MULT(delay_lower_bound[EVENT_LEVEL_MUNDANE], data["event_delay_lower_bounds"]["mundane"], MINUTES)
 		CONFIG_LOAD_NUM_MULT(delay_lower_bound[EVENT_LEVEL_MODERATE], data["event_delay_lower_bounds"]["moderate"], MINUTES)
 		CONFIG_LOAD_NUM_MULT(delay_lower_bound[EVENT_LEVEL_MAJOR], data["event_delay_lower_bounds"]["major"], MINUTES)
+		CONFIG_LOAD_NUM_MULT(delay_lower_bound[EVENT_LEVEL_DISASTER], data["event_delay_lower_bounds"]["disaster"], MINUTES)
 
 	// Same here. I hate this.
 	if(islist(data["event_delay_upper_bounds"]))
 		CONFIG_LOAD_NUM_MULT(delay_upper_bound[EVENT_LEVEL_MUNDANE], data["event_delay_upper_bounds"]["mundane"], MINUTES)
 		CONFIG_LOAD_NUM_MULT(delay_upper_bound[EVENT_LEVEL_MODERATE], data["event_delay_upper_bounds"]["moderate"], MINUTES)
 		CONFIG_LOAD_NUM_MULT(delay_upper_bound[EVENT_LEVEL_MAJOR], data["event_delay_upper_bounds"]["major"], MINUTES)
+		CONFIG_LOAD_NUM_MULT(delay_upper_bound[EVENT_LEVEL_DISASTER], data["event_delay_upper_bounds"]["disaster"], MINUTES)
 
 	// And for the worst, the first run delays. I hate this so much -aa07
 	if(islist(data["event_initial_delays"]))
@@ -58,7 +64,9 @@
 					target = EVENT_LEVEL_MODERATE
 				if("major")
 					target = EVENT_LEVEL_MAJOR
-			ASSERT(target in list(EVENT_LEVEL_MUNDANE, EVENT_LEVEL_MODERATE, EVENT_LEVEL_MAJOR))
+				if("disaster")
+					target = EVENT_LEVEL_DISASTER
+			ASSERT(target in list(EVENT_LEVEL_MUNDANE, EVENT_LEVEL_MODERATE, EVENT_LEVEL_MAJOR, EVENT_LEVEL_DISASTER))
 			first_run_times[target] = list("lower" = assoclist["lower_bound"] MINUTES, "upper" = assoclist["upper_bound"] MINUTES)
 
 	CONFIG_LOAD_NUM(blob_highpop_trigger, data["blob_highpop_trigger"])

code/controllers/subsystem/SSevents.dm

@@ -22,15 +22,18 @@ SUBSYSTEM_DEF(events)
 	var/list/active_events = list()
 	var/list/finished_events = list()
 	var/list/allEvents
-	var/list/event_containers = list(
+	var/list/event_containers = alist(
 			EVENT_LEVEL_MUNDANE 	= new/datum/event_container/mundane,
 			EVENT_LEVEL_MODERATE	= new/datum/event_container/moderate,
-			EVENT_LEVEL_MAJOR 		= new/datum/event_container/major
+			EVENT_LEVEL_MAJOR 		= new/datum/event_container/major,
+			EVENT_LEVEL_DISASTER = new/datum/event_container/disaster
 		)
 
 	var/datum/event_meta/new_event = new
 
 	var/list/biohazards_this_round = list()
+	/// Artificial staffing for debug purpouses
+	var/list/debug_resources = list()
 
 /datum/controller/subsystem/events/Initialize()
 	allEvents = subtypesof(/datum/event)
@@ -39,8 +42,8 @@ SUBSYSTEM_DEF(events)
 	for(var/datum/event/E in active_events)
 		E.process()
 
-	for(var/i = EVENT_LEVEL_MUNDANE to EVENT_LEVEL_MAJOR)
-		var/datum/event_container/EC = event_containers[i]
+	for(var/container in event_containers)
+		var/datum/event_container/EC = event_containers[container]
 		EC.process()
 
 /datum/controller/subsystem/events/proc/event_complete(datum/event/E)
@@ -64,9 +67,9 @@ SUBSYSTEM_DEF(events)
 	// Add the event back to the list of available events
 	var/datum/event_container/EC = event_containers[theseverity]
 	var/datum/event_meta/EM = E.event_meta
-	EC.available_events += EM
+	EC.available_events |= EM
 
-	log_debug("Event '[EM.name]' has completed at [station_time_timestamp()].")
+	log_debug("Event '[EM.skeleton.name]' has completed at [station_time_timestamp()].")
 
 /datum/controller/subsystem/events/proc/delay_events(severity, delay)
 	var/datum/event_container/EC = event_containers[severity]
@@ -87,9 +90,9 @@ SUBSYSTEM_DEF(events)
 	to_chat(world, "<br><br><br><font size=3><b>Random Events This Round:</b></font>")
 	for(var/datum/event/E in active_events|finished_events)
 		var/datum/event_meta/EM = E.event_meta
-		if(EM.name == "Nothing")
+		if(EM.skeleton.name == "Nothing")
 			continue
-		var/message = "'[EM.name]' began at [station_time_timestamp("hh:mm:ss", E.startedAt)] "
+		var/message = "'[EM.skeleton.name]' began at [station_time_timestamp("hh:mm:ss", E.startedAt)] "
 		if(E.isRunning)
 			message += "and is still running."
 		else
@@ -102,9 +105,10 @@ SUBSYSTEM_DEF(events)
 
 /datum/controller/subsystem/events/proc/GetInteractWindow()
 	var/html = "<A align='right' href='byond://?src=[UID()];refresh=1'>Refresh</A>"
-
+	html += "<A align='right' href='byond://?src=[UID()];resource=1'>Resources</A>"
 	if(selected_event_container)
 		var/event_time = max(0, selected_event_container.next_event_time - world.time)
+		var/list/total_resources = get_total_resources()
 		html += "<A align='right' href='byond://?src=[UID()];back=1'>Back</A><br>"
 		html += "Time till start: [round(event_time / 600, 0.1)]<br>"
 		html += "<div class='block'>"
@@ -112,14 +116,16 @@ SUBSYSTEM_DEF(events)
 		html += "<table [table_options]>"
 		html += "<tr [head_options]><td [row_options2]>Name </td><td>Weight </td><td>MinWeight </td><td>MaxWeight </td><td>OneShot </td><td>Enabled </td><td><span class='alert'>CurrWeight </span></td><td>Remove</td></tr>"
 		for(var/datum/event_meta/EM in selected_event_container.available_events)
+			if(!EM.skeleton)
+				continue
 			html += "<tr>"
-			html += "<td>[EM.name]</td>"
+			html += "<td>[EM.skeleton.name]</td>"
 			html += "<td><A align='right' href='byond://?src=[UID()];set_weight=\ref[EM]'>[EM.weight]</A></td>"
 			html += "<td>[EM.min_weight]</td>"
 			html += "<td>[EM.max_weight == INFINITY ? "No max" : EM.max_weight]</td>"
 			html += "<td><A align='right' href='byond://?src=[UID()];toggle_oneshot=\ref[EM]'>[EM.one_shot]</A></td>"
 			html += "<td><A align='right' href='byond://?src=[UID()];toggle_enabled=\ref[EM]'>[EM.enabled]</A></td>"
-			html += "<td><span class='alert'>[EM.get_weight(number_active_with_role())]</span></td>"
+			html += "<td><span class='alert'>[EM.get_weight(total_resources)]</span></td>"
 			html += "<td><A align='right' href='byond://?src=[UID()];remove=\ref[EM];EC=\ref[selected_event_container]'>Remove</A></td>"
 			html += "</tr>"
 		html += "</table>"
@@ -130,8 +136,8 @@ SUBSYSTEM_DEF(events)
 		html += "<table [table_options]>"
 		html += "<tr [head_options]><td [row_options2]>Name</td><td [row_options2]>Type</td><td [row_options1]>Weight</td><td [row_options1]>OneShot</td></tr>"
 		html += "<tr>"
-		html += "<td><A align='right' href='byond://?src=[UID()];set_name=\ref[new_event]'>[new_event.name ? new_event.name : "Enter Event"]</A></td>"
-		html += "<td><A align='right' href='byond://?src=[UID()];set_type=\ref[new_event]'>[new_event.event_type ? new_event.event_type : "Select Type"]</A></td>"
+		html += "<td><A align='right' href='byond://?src=[UID()];set_name=\ref[new_event]'>[new_event?.skeleton?.name ? new_event?.skeleton?.name : "Enter Event"]</A></td>"
+		html += "<td><A align='right' href='byond://?src=[UID()];set_type=\ref[new_event]'>[new_event?.skeleton?.type ? new_event?.skeleton?.type : "Select Type"]</A></td>"
 		html += "<td><A align='right' href='byond://?src=[UID()];set_weight=\ref[new_event]'>[new_event.weight ? new_event.weight : 0]</A></td>"
 		html += "<td><A align='right' href='byond://?src=[UID()];toggle_oneshot=\ref[new_event]'>[new_event.one_shot]</A></td>"
 		html += "</tr>"
@@ -145,7 +151,7 @@ SUBSYSTEM_DEF(events)
 
 		html += "<table [table_options]>"
 		html += "<tr [head_options]><td [row_options1]>Severity</td><td [row_options1]>Starts At</td><td [row_options1]>Starts In</td><td [row_options3]>Adjust Start</td><td [row_options1]>Pause</td><td [row_options1]>Interval Mod</td></tr>"
-		for(var/severity = EVENT_LEVEL_MUNDANE to EVENT_LEVEL_MAJOR)
+		for(var/severity = EVENT_LEVEL_MUNDANE to EVENT_LEVEL_DISASTER)
 			var/datum/event_container/EC = event_containers[severity]
 			var/next_event_at = max(0, EC.next_event_time - world.time)
 			html += "<tr>"
@@ -172,12 +178,12 @@ SUBSYSTEM_DEF(events)
 		html += "<h2>Next Event</h2>"
 		html += "<table [table_options]>"
 		html += "<tr [head_options]><td [row_options1]>Severity</td><td [row_options2]>Name</td><td [row_options3]>Event Rotation</td><td>Clear</td></tr>"
-		for(var/severity = EVENT_LEVEL_MUNDANE to EVENT_LEVEL_MAJOR)
+		for(var/severity in EVENT_LEVEL_MUNDANE to EVENT_LEVEL_DISASTER)
 			var/datum/event_container/EC = event_containers[severity]
 			var/datum/event_meta/EM = EC.next_event
 			html += "<tr>"
 			html += "<td>[GLOB.severity_to_string[severity]]</td>"
-			html += "<td><A align='right' href='byond://?src=[UID()];select_event=\ref[EC]'>[EM ? EM.name : "Random"]</A></td>"
+			html += "<td><A align='right' href='byond://?src=[UID()];select_event=\ref[EC]'>[EM ? EM.skeleton.name : "Random"]</A></td>"
 			html += "<td><A align='right' href='byond://?src=[UID()];view_events=\ref[EC]'>View</A></td>"
 			html += "<td><A align='right' href='byond://?src=[UID()];clear=\ref[EC]'>Clear</A></td>"
 			html += "</tr>"
@@ -190,15 +196,14 @@ SUBSYSTEM_DEF(events)
 		html += "<table [table_options]>"
 		html += "<tr [head_options]><td [row_options1]>Severity</td><td [row_options2]>Name</td><td [row_options1]>Ends At</td><td [row_options1]>Ends In</td><td [row_options3]>Stop</td></tr>"
 		for(var/datum/event/E in active_events)
-			if(!E.event_meta)
+			if(!E)
 				continue
-			var/datum/event_meta/EM = E.event_meta
 			var/ends_at = E.startedAt + (E.lastProcessAt() * 20)	// A best estimate, based on how often the manager processes
 			var/ends_in = max(0, round((ends_at - world.time) / 600, 0.1))
 			var/no_end = E.noAutoEnd
 			html += "<tr>"
-			html += "<td>[GLOB.severity_to_string[EM.severity]]</td>"
-			html += "<td>[EM.name] [ADMIN_VV(E, "VV")]</td>"
+			html += "<td>[GLOB.severity_to_string[E.severity]]</td>"
+			html += "<td>[E.name] [ADMIN_VV(E, "VV")]</td>"
 			html += "<td>[no_end ? "N/A" : station_time_timestamp("hh:mm:ss", ends_at)]</td>"
 			html += "<td>[no_end ? "N/A" : ends_in]</td>"
 			html += "<td><A align='right' href='byond://?src=[UID()];stop=\ref[E]'>Stop</A></td>"
@@ -232,7 +237,7 @@ SUBSYSTEM_DEF(events)
 		var/datum/event_container/EC = locate(href_list["select_event"])
 		var/datum/event_meta/EM = EC.SelectEvent()
 		if(EM)
-			log_and_message_admins("has queued the [GLOB.severity_to_string[EC.severity]] event '[EM.name]'.")
+			log_and_message_admins("has queued the [GLOB.severity_to_string[EC.severity]] event '[EM.skeleton.name]'.")
 	else if(href_list["pause"])
 		var/datum/event_container/EC = locate(href_list["pause"])
 		EC.delayed = !EC.delayed
@@ -248,7 +253,7 @@ SUBSYSTEM_DEF(events)
 			return
 		var/datum/event/E = locate(href_list["stop"])
 		var/datum/event_meta/EM = E.event_meta
-		log_and_message_admins("has stopped the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
+		log_and_message_admins("has stopped the [GLOB.severity_to_string[EM.skeleton.severity]] event '[EM.skeleton.name]'.")
 		E.kill()
 	else if(href_list["view_events"])
 		selected_event_container = locate(href_list["view_events"])
@@ -258,48 +263,81 @@ SUBSYSTEM_DEF(events)
 		var/name = clean_input("Enter event name.", "Set Name")
 		if(name)
 			var/datum/event_meta/EM = locate(href_list["set_name"])
-			EM.name = name
+			EM.skeleton.name = name
 	else if(href_list["set_type"])
 		var/type = input("Select event type.", "Select") as null|anything in allEvents
 		if(type)
 			var/datum/event_meta/EM = locate(href_list["set_type"])
-			EM.event_type = type
+			EM.change_event(type)
 	else if(href_list["set_weight"])
 		var/weight = input("Enter weight. A higher value means higher chance for the event of being selected.", "Set Weight") as num|null
 		if(weight && weight > 0)
 			var/datum/event_meta/EM = locate(href_list["set_weight"])
 			EM.weight = weight
 			if(EM != new_event)
-				log_and_message_admins("has changed the weight of the [GLOB.severity_to_string[EM.severity]] event '[EM.name]' to [EM.weight].")
+				log_and_message_admins("has changed the weight of the [GLOB.severity_to_string[EM.skeleton.severity]] event '[EM.skeleton.name]' to [EM.weight].")
 	else if(href_list["toggle_oneshot"])
 		var/datum/event_meta/EM = locate(href_list["toggle_oneshot"])
 		EM.one_shot = !EM.one_shot
 		if(EM != new_event)
-			log_and_message_admins("has [EM.one_shot ? "set" : "unset"] the oneshot flag for the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
+			log_and_message_admins("has [EM.one_shot ? "set" : "unset"] the oneshot flag for the [GLOB.severity_to_string[EM.skeleton.severity]] event '[EM.skeleton.name]'.")
 	else if(href_list["toggle_enabled"])
 		var/datum/event_meta/EM = locate(href_list["toggle_enabled"])
 		EM.enabled = !EM.enabled
-		log_and_message_admins("has [EM.enabled ? "enabled" : "disabled"] the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
+		log_and_message_admins("has [EM.enabled ? "enabled" : "disabled"] the [GLOB.severity_to_string[EM.skeleton.severity]] event '[EM.skeleton.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
-		log_and_message_admins("has removed the [GLOB.severity_to_string[EM.severity]] event '[EM.name]'.")
+		log_and_message_admins("has removed the [GLOB.severity_to_string[EM.skeleton.severity]] event '[EM.skeleton.name]'.")
 	else if(href_list["add"])
-		if(!new_event.name || !new_event.event_type)
+		if(!new_event.skeleton.name || !new_event.skeleton.type)
 			return
 		if(alert("This will add a new event to the rotation. Continue?","Add Event!","Yes","No") != "Yes")
 			return
-		new_event.severity = selected_event_container.severity
+		new_event.skeleton.severity = selected_event_container.severity
 		selected_event_container.available_events += new_event
-		log_and_message_admins("has added \a [GLOB.severity_to_string[new_event.severity]] event '[new_event.name]' of type [new_event.event_type] with weight [new_event.weight].")
+		log_and_message_admins("has added \a [GLOB.severity_to_string[new_event.skeleton.severity]] event '[new_event.skeleton.name]' of type [new_event.skeleton.type] with weight [new_event.weight].")
 		new_event = new
 	else if(href_list["clear"])
 		var/datum/event_container/EC = locate(href_list["clear"])
 		if(EC.next_event)
-			log_and_message_admins("has dequeued the [GLOB.severity_to_string[EC.severity]] event '[EC.next_event.name]'.")
+			log_and_message_admins("has dequeued the [GLOB.severity_to_string[EC.severity]] event '[EC.next_event.skeleton.name]'.")
 			EC.next_event = null
+	else if(href_list["resource"])
+		GetResourceWindow()
 
 	Interact(usr)
+
+/datum/controller/subsystem/events/proc/GetResourceWindow()
+	var/html = "<A align='right' href='byond://?src=[UID()];refresh=1'>Refresh</A>"
+	var/list/total_resources = get_total_resources()
+	html += "<div class='block'>"
+	html += "<h2>Total Resources</h2>"
+	html += "<table [table_options]>"
+	html += "<tr [head_options]><td [row_options2]>Name <td [row_options3]>Weight</tr>"
+	for(var/resource in total_resources)
+		html += "<tr>"
+		html += "<td>[resource]</td>"
+		html += "<td>[total_resources[resource]]</td>"
+		html += "</tr>"
+	html += "</table>"
+	html += "</div>"
+	var/list/net_resources = number_active_with_role()
+	html += "<div class='block'>"
+	html += "<h2>Net Resources</h2>"
+	html += "<table [table_options]>"
+	html += "<tr [head_options]><td [row_options2]>Name <td [row_options3]>Weight</tr>"
+	for(var/resource in net_resources)
+		html += "<tr>"
+		html += "<td>[resource]</td>"
+		html += "<td>[net_resources[resource]]</td>"
+		html += "</tr>"
+	html += "</table>"
+	html += "</div>"
+
+	var/datum/browser/popup = new(usr, "resources", "Resources", window_x, window_y)
+	popup.set_content(html)
+	popup.open()