diff --git a/code/__DEFINES/configuration.dm b/code/__DEFINES/configuration.dm
index 2b294db208d..5fe8e63db52 100644
--- a/code/__DEFINES/configuration.dm
+++ b/code/__DEFINES/configuration.dm
@@ -1,7 +1,3 @@
-// TODO these two should be config options
-#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
-#define STATION_GOAL_BUDGET 1
-
 //config files
 #define CONFIG_GET(X) global.config.Get(/datum/config_entry/##X)
 #define CONFIG_SET(X, Y) global.config.Set(/datum/config_entry/##X, ##Y)
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 532d7380b22..dce06daad64 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -394,3 +394,8 @@
 /datum/config_entry/flag/sdql_spells
 
 /datum/config_entry/flag/native_fov
+
+/datum/config_entry/number/station_goal_budget
+	default = 1
+	min_val = 0
+	integer = FALSE
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index e0ca7e0ba9f..f78a59e0622 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -618,3 +618,8 @@
 
 /datum/config_entry/flag/station_name_in_hub_entry
 	default = FALSE
+
+/datum/config_entry/number/pr_announcements_per_round
+	default = 5
+	min_val = 0
+	integer = TRUE
diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm
index 10fe9829722..74e84dd53eb 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -72,7 +72,7 @@
 		PRcounts[id] = 1
 	else
 		++PRcounts[id]
-		if(PRcounts[id] > PR_ANNOUNCEMENTS_PER_ROUND)
+		if(PRcounts[id] > CONFIG_GET(number/pr_announcements_per_round))
 			return
 
 	var/final_composed = span_announce("PR: [input[keyword]]")
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 7cf6d1f82e7..55b3c52d9dc 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -186,7 +186,7 @@
 /datum/game_mode/proc/generate_station_goals()
 	var/list/possible = subtypesof(/datum/station_goal)
 	var/goal_weights = 0
-	while(possible.len && goal_weights < STATION_GOAL_BUDGET)
+	while(possible.len && goal_weights < CONFIG_GET(number/station_goal_budget))
 		var/datum/station_goal/picked = pick_n_take(possible)
 		goal_weights += initial(picked.weight)
 		GLOB.station_goals += new picked
diff --git a/code/game/world.dm b/code/game/world.dm
index 98eee42a292..b1079c23197 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -218,7 +218,7 @@ GLOBAL_VAR(restart_counter)
 		PRcounts[id] = 1
 	else
 		++PRcounts[id]
-		if(PRcounts[id] > PR_ANNOUNCEMENTS_PER_ROUND)
+		if(PRcounts[id] > CONFIG_GET(number/pr_announcements_per_round))
 			return
 
 	var/final_composed = span_announce("PR: [announcement]")