diff --git a/code/game/events/EventsMain.dm b/code/game/events/EventsMain.dm index 9de8b5f56bd..0516d473668 100644 --- a/code/game/events/EventsMain.dm +++ b/code/game/events/EventsMain.dm @@ -14,7 +14,7 @@ var/datum/event/LongTermEvent = null var/is_ninjad_yet = 0 /proc/SpawnEvent() - if(!EventsOn || ActiveEvent) + if(!EventsOn || ActiveEvent || !config.allow_random_events) return if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station && !is_ninjad_yet) EventTypes |= /datum/event/spaceninja diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index a250adb9926..27f6476703f 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -172,6 +172,7 @@ verbs += /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested) verbs += /client/proc/toggle_gravity_on verbs += /client/proc/toggle_gravity_off + verbs += /client/proc/toggle_random_events // Moved over from tg's Game Master: verbs += /client/proc/colorooc verbs += /obj/admins/proc/toggle_aliens //toggle aliens @@ -425,6 +426,7 @@ verbs -= /client/proc/tension_report verbs -= /client/proc/toggle_gravity_on verbs -= /client/proc/toggle_gravity_off + verbs -= /client/proc/toggle_random_events verbs -= /client/proc/cmd_admin_change_custom_event verbs -= /client/proc/admin_invis verbs -= /client/proc/callprocgen diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index ee874c11aa8..9a7afae039d 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -902,6 +902,20 @@ Traitors and the like can also be revived with the previous role mostly intact. A.gravitychange(0,A) command_alert("For budget reasons, Centcomm is no longer beaming gravitons to your station. We appoligize for any inconvience.") +//CARN +/client/proc/toggle_random_events() + set category = "Server" + set name = "Toggle random events on/off" + set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off" + if(!config.allow_random_events) + config.allow_random_events = 1 + usr << "Random events enabled" + message_admins("Admin [key_name_admin(usr)] has enabled random events.", 1) + else + config.allow_random_events = 0 + usr << "Random events disabled" + message_admins("Admin [key_name_admin(usr)] has disabled random events.", 1) + feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/rnd_check_designs() set category = "Debug" diff --git a/config/config.txt b/config/config.txt index ee4fb259554..2ded0d72af0 100644 --- a/config/config.txt +++ b/config/config.txt @@ -56,6 +56,10 @@ PROBABILITY MONKEY 0 PROBABILITY TRAITORCHAN 0 PROBABILITY EXTEND-A-TRAITORMONGOUS 3 PROBABILITY EPIDEMIC 1 + +## Hash out to disable random events during the round. +ALLOW_RANDOM_EVENTS + ## if amount of traitors scales or not TRAITOR_SCALING