Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

config/game_options.txt

@@ -139,6 +139,20 @@ MIDROUND_ANTAG CHANGELING
 MIDROUND_ANTAG WIZARD
 #MIDROUND_ANTAG  MONKEY
 
+## Toggles for whether this mode should force antags even if not enough players have it enabled.
+## If it's off, it just won't roll as many antags.
+#FORCE_ANTAG_COUNT TRAITOR
+#FORCE_ANTAG_COUNT TRAITORBRO
+#FORCE_ANTAG_COUNT TRAITORCHAN
+#FORCE_ANTAG_COUNT INTERNAL_AFFAIRS
+FORCE_ANTAG_COUNT  NUCLEAR
+FORCE_ANTAG_COUNT  REVOLUTION
+FORCE_ANTAG_COUNT CULT
+FORCE_ANTAG_COUNT CLOCKWORK_CULT
+#FORCE_ANTAG_COUNT CHANGELING
+#FORCE_ANTAG_COUNT WIZARD
+#FORCE_ANTAG_COUNT  MONKEY
+
 ## Uncomment these for overrides of the minimum / maximum number of players in a round type.
 ## If you set any of these occasionally check to see if you still need them as the modes
 ## will still be actively rebalanced around the SUGGESTED populations, not your overrides.
@@ -532,7 +546,10 @@ BOMBCAP 20
 ## of ruins.
 LAVALAND_BUDGET 60
 
-## Space Ruin Budged
+## Ice Moon Budget
+ICEMOON_BUDGET 90
+
+## Space Ruin Budget
 Space_Budget 16
 
 ## Station Ruin Budget

config/iceruinblacklist.txt

@@ -0,0 +1,23 @@
+#Listing maps here will blacklist them from generating in the ice moon.
+#Maps must be the full path to them
+#A list of maps valid to blacklist can be found in _maps\RandomRuins\IceRuins
+#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
+
+##RESPAWN
+#_maps/RandomRuins/AnywhereRuins/golem_ship.dmm
+
+##MISC
+#_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
+#_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
+#_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
+#_maps/RandomRuins/IceRuins/icemoon_surface_hotsprings.dmm
+#_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
+#_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm
+#_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+#_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm
+#_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
+#_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm
+#_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
+#_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
+#_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm
+#_maps/RandomRuins/AnywhereRuins/fountain_hall.dmm

config/lavaRuinBlacklist.txt

@@ -13,7 +13,7 @@
 #_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
 #_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
 #_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
-#_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
+#_maps/RandomRuins/AnywhereRuins/golem_ship.dmm
 
 ##SIN
 #_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
@@ -33,8 +33,9 @@
 #_maps/RandomRuins/LavaRuins/lavaland_surface_wwiioutpost.dmm
 #_maps/RandomRuins/LavaRuins/lavaland_surface_tomb.dmm
 #_maps/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm
-#_maps/RandomRuins/LavaRuins/lavaland_surface_fountain_hall.dmm
 #_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
 #_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
 #_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
 #_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm
+#_maps/RandomRuins/LavaRuins/lavaland_surface_library.dmm
+#_maps/RandomRuins/AnywhereRuins/fountain_hall.dmm

config/maps.txt

@@ -36,6 +36,10 @@ map deltastation
 	minplayers 50
 endmap
 
+map icebox
+	minplayers 25
+endmap
+
 map runtimestation
 endmap