Merge pull request #9910 from Ghommie/Ghommie-cit390

Unmodularize gamemodes folder.

code/game/gamemodes/revolution/revolution.dm

@@ -14,8 +14,8 @@
 	false_report_weight = 10
 	restricted_jobs = list("AI", "Cyborg")
 	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
-	required_players = 30
-	required_enemies = 2
+	required_players = 20
+	required_enemies = 1
 	recommended_enemies = 3
 	enemy_minimum_age = 14
 

code/modules/antagonists/swarmer/swarmer_event.dm

@@ -1,8 +1,8 @@
 /datum/round_event_control/spawn_swarmer
 	name = "Spawn Swarmer Shell"
 	typepath = /datum/round_event/spawn_swarmer
-	weight = 7
-	max_occurrences = 1 //Only once okay fam
+	weight = 0
+	max_occurrences = 0
 	earliest_start = 30 MINUTES
 	min_players = 15
 

modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm

@@ -1,3 +0,0 @@
-/datum/round_event_control/spawn_swarmer
-	weight = 0
-	max_occurrences = 0

modular_citadel/code/game/gamemodes/revolution/revolution.dm

@@ -1,5 +0,0 @@
-/datum/game_mode/revolution
-	restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
-	false_report_weight = 10
-	required_players = 20
-	required_enemies = 1

tgstation.dme

@@ -577,6 +577,17 @@
 #include "code\game\gamemodes\dynamic\dynamic_rulesets_midround.dm"
 #include "code\game\gamemodes\dynamic\dynamic_rulesets_roundstart.dm"
 #include "code\game\gamemodes\extended\extended.dm"
+#include "code\game\gamemodes\gangs\dominator.dm"
+#include "code\game\gamemodes\gangs\dominator_countdown.dm"
+#include "code\game\gamemodes\gangs\gang.dm"
+#include "code\game\gamemodes\gangs\gang_datums.dm"
+#include "code\game\gamemodes\gangs\gang_decals.dm"
+#include "code\game\gamemodes\gangs\gang_hud.dm"
+#include "code\game\gamemodes\gangs\gang_items.dm"
+#include "code\game\gamemodes\gangs\gang_pen.dm"
+#include "code\game\gamemodes\gangs\gangs.dm"
+#include "code\game\gamemodes\gangs\gangtool.dm"
+#include "code\game\gamemodes\gangs\implant_gang.dm"
 #include "code\game\gamemodes\meteor\meteor.dm"
 #include "code\game\gamemodes\meteor\meteors.dm"
 #include "code\game\gamemodes\monkey\monkey.dm"
@@ -3025,19 +3036,6 @@
 #include "modular_citadel\code\datums\status_effects\chems.dm"
 #include "modular_citadel\code\datums\status_effects\debuffs.dm"
 #include "modular_citadel\code\datums\wires\autoylathe.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\dominator.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\dominator_countdown.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang_datums.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang_decals.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang_hud.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang_items.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gang_pen.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gangs.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\gangtool.dm"
-#include "modular_citadel\code\game\gamemodes\gangs\implant_gang.dm"
-#include "modular_citadel\code\game\gamemodes\miniantags\bot_swarm\swarmer_event.dm"
-#include "modular_citadel\code\game\gamemodes\revolution\revolution.dm"
 #include "modular_citadel\code\game\machinery\displaycases.dm"
 #include "modular_citadel\code\game\machinery\Sleeper.dm"
 #include "modular_citadel\code\game\machinery\toylathe.dm"