disable conspiracy pending rework

goonstation · Jul 14, 2023 · 10e5f82 · 10e5f82
1 parent 4d4483e
commit 10e5f82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/code/datums/gameticker.dm b/code/datums/gameticker.dm
@@ -111,7 +111,7 @@ var/global/current_state = GAME_STATE_WORLD_INIT
 	switch(master_mode)
 		if("random","secret") src.mode = config.pick_random_mode()
 		if("action") src.mode = config.pick_mode(pick("nuclear","wizard","blob"))
-		if("intrigue") src.mode = config.pick_mode(pick(prob(300);"mixed_rp", prob(200); "traitor", prob(75);"changeling","vampire", prob(50); "spy_theft","arcfiend","salvager", prob(50); "extended", prob(25); "gang", "conspiracy"))
+		if("intrigue") src.mode = config.pick_mode(pick(prob(300);"mixed_rp", prob(200); "traitor", prob(75);"changeling","vampire", prob(50); "spy_theft","arcfiend","salvager", prob(50); "extended", prob(50); "gang"))
 		if("pod_wars") src.mode = config.pick_mode("pod_wars")
 		else src.mode = config.pick_mode(master_mode)
 

diff --git a/strings/changelog.txt b/strings/changelog.txt
@@ -1,5 +1,7 @@
 
 (t)fri jul 14 23
+(u)aloe
+(*)Conspiracy mode has been disabled on RP pending a rework.
 (u)colossusqw
 (p)14951
 (e)⚖🐁|C-Balance, A-Critters