Revert "Restricts separated bogtown to 100 players, map rotation at r…

…oundend" (Blackstone-SS13#1338)
PotatoTomahto · Jun 13, 2024 · 3582134 · 3582134
2 parents d6cb664 + 7d8fabc
commit 3582134
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 5,227 deletions.
diff --git a/_maps/blackstonedense.dm b/_maps/blackstonedense.dm
diff --git a/_maps/blackstonedense.json b/_maps/blackstonedense.json
diff --git a/_maps/map_files/blackstonedense/blackstonedense.dmm b/_maps/map_files/blackstonedense/blackstonedense.dmm
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
@@ -201,7 +201,6 @@
 
 	to_chat(world, "<BR><BR><BR><span class='reallybig'>So ends this tale of Blackstone.</span>")
 	get_end_reason()
-	SSvote.initiate_vote("map", "Blackstone players")
 
 	var/list/key_list = list()
 	for(var/client/C in GLOB.clients)

diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
@@ -224,11 +224,6 @@ SUBSYSTEM_DEF(vote)
 					var/datum/map_config/VM = config.maplist[map]
 					if(!VM.votable)
 						continue
-					var/player_count = GLOB.clients.len
-					if(VM.config_max_users > 0 && player_count >= VM.config_max_users)
-						continue
-					if(VM.config_min_users > 0 && player_count <= VM.config_min_users)
-						continue
 					choices.Add(VM.map_name)
 			if("custom")
 				question = stripped_input(usr,"What is the vote for?")

diff --git a/code/rt.dm b/code/rt.dm
@@ -6,8 +6,8 @@
 
 #ifdef FASTLOAD
     #define FORCE_MAP "_maps/roguetest.json"
-// #else
-//     #define FORCE_MAP "_maps/blackstone.json"
+#else
+    #define FORCE_MAP "_maps/blackstone.json"
 #endif
 
 //#define WARTIME
diff --git a/config/maps.txt b/config/maps.txt
@@ -13,13 +13,8 @@ Format:
 	votable (is this map votable)
 endmap
 
-map blackstone
+map roguetown
 	default
 	#voteweight 1.5
-	minplayers 100
 	votable
-endmap
-
-map blackstonedense
-	votable
-endmap
+endmap