diff --git a/code/__DEFINES/station_goals.dm b/code/__DEFINES/station_goals.dm
new file mode 100644
index 00000000000..ce1723e6521
--- /dev/null
+++ b/code/__DEFINES/station_goals.dm
@@ -0,0 +1,8 @@
+#define BSA_SIZE_FRONT		4
+#define BSA_SIZE_BACK		6
+
+#define VAULT_SPACEIMMUNE "Space Immunity"
+#define VAULT_XRAY "X-Ray Vision"
+#define VAULT_TELEKINESIS "Telekinesis"
+#define VAULT_PSYCHIC "Psychic Powers"
+#define VAULT_SPEED "Speediness"
\ No newline at end of file
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 9f8b866981c..b6a6ff770f1 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -2,6 +2,7 @@
 // Cargo orders part for high price
 // Requires high amount of power
 // Requires high level stock parts
+
 /datum/station_goal/bluespace_cannon
 	name = "Bluespace Artillery"
 
@@ -104,11 +105,11 @@
 	var/x_max
 	switch(cannon_dir)
 		if(EAST)
-			x_min = x - 4 //replace with defines later
-			x_max = x + 6
+			x_min = x - BSA_SIZE_BACK
+			x_max = x + BSA_SIZE_FRONT
 		if(WEST)
-			x_min = x + 4
-			x_max = x - 6
+			x_min = x + BSA_SIZE_BACK
+			x_max = x - BSA_SIZE_FRONT
 
 	for(var/turf/T in block(locate(x_min,y-1,z),locate(x_max,y+1,z)))
 		if(T.density || isspaceturf(T))
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 74d648dbff6..0efe2043ab0 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -3,11 +3,6 @@
 // DNA vault requires x animals ,y plants, z human dna
 // DNA vaults require high tier stock parts and cold
 // After completion each crewmember can receive single upgrade chosen out of 2 for the mob.
-#define VAULT_SPACEIMMUNE "Space Immunity"
-#define VAULT_XRAY "X-Ray Vision"
-#define VAULT_TELEKINESIS "Telekinesis"
-#define VAULT_PSYCHIC "Psychic Powers"
-#define VAULT_SPEED "Speediness"
 
 /datum/station_goal/dna_vault
 	name = "DNA Vault"
@@ -17,7 +12,7 @@
 
 /datum/station_goal/dna_vault/New()
 	..()
-	animal_count = rand(15,20) //might be too few given ~15 roundstart stationside ones
+	animal_count = rand(15, 20) //might be too few given ~15 roundstart stationside ones
 	human_count = rand(round(0.75 * ticker.mode.num_players_started()), ticker.mode.num_players_started()) // 75%+ roundstart population.
 	var/non_standard_plants = non_standard_plants_count()
 	plant_count = rand(round(0.5 * non_standard_plants),round(0.7 * non_standard_plants))
diff --git a/paradise.dme b/paradise.dme
index f80ea688c86..49a3b73ee07 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -57,6 +57,7 @@
 #include "code\__DEFINES\snpc.dm"
 #include "code\__DEFINES\sound.dm"
 #include "code\__DEFINES\stat.dm"
+#include "code\__DEFINES\station_goals.dm"
 #include "code\__DEFINES\status_effects.dm"
 #include "code\__DEFINES\subsystems.dm"
 #include "code\__DEFINES\tick.dm"
@@ -2350,4 +2351,4 @@
 #include "goon\code\datums\browserOutput.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
-// END_INCLUDE
\ No newline at end of file
+// END_INCLUDE