event customization to new events

Monkestation · Oct 26, 2023 · 98042a1 · 98042a1
1 parent 2e886a6
commit 98042a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm
@@ -327,6 +327,10 @@ Runs the event
 			log_admin_private("[key_name(usr)] scheduled [src.name].")
 			SSgamemode.storyteller.buy_event(src, src.track)
 		if("force_next")
+			if(length(src.admin_setup))
+				for(var/datum/event_admin_setup/admin_setup_datum in src.admin_setup)
+					if(admin_setup_datum.prompt_admins() == ADMIN_CANCEL_EVENT)
+						return
 			message_admins("[key_name_admin(usr)] force scheduled event [src.name].")
 			log_admin_private("[key_name(usr)] force scheduled event [src.name].")
 			SSgamemode.forced_next_events[src.track] += src

diff --git a/monkestation/code/modules/storytellers/gamemode_subsystem.dm b/monkestation/code/modules/storytellers/gamemode_subsystem.dm
@@ -440,7 +440,7 @@ SUBSYSTEM_DEF(gamemode)
 	if(. == EVENT_CANT_RUN)//we couldn't run this event for some reason, set its max_occurrences to 0
 		event.max_occurrences = 0
 	else if(. == EVENT_READY)
-		event.runEvent(random = TRUE) // fallback to dynamic
+		event.runEvent(random = TRUE, admin_forced = forced) // fallback to dynamic
 
 ///Resets frequency multiplier.
 /datum/controller/subsystem/gamemode/proc/resetFrequency()