Revert "Revert "Merge remote-tracking branch 'upstream/master'""

This reverts commit 1509d9d183.
2019-11-24 03:33:02 +00:00
parent ba4fa1ef67
commit 614a462176
186 changed files with 764 additions and 405 deletions
--- a/code/modules/events/processor_overload.dm
+++ b/code/modules/events/processor_overload.dm
@@ -3,6 +3,7 @@
 	typepath = /datum/round_event/processor_overload
 	weight = 15
 	min_players = 20
+	gamemode_blacklist = list("dynamic")

 /datum/round_event/processor_overload
 	announceWhen	= 1