diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index ad92db7f1b6..1f333933b1d 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -137,6 +137,8 @@
 	var/default_laws = 0 //Controls what laws the AI spawns with.
 	var/silicon_max_law_amount = 12
 
+	var/starlight = 0
+
 /datum/configuration/New()
 	var/list/L = typesof(/datum/game_mode) - /datum/game_mode
 	for(var/T in L)
@@ -420,6 +422,8 @@
 					config.mutant_races				= 1
 				if("mutant_colors")
 					config.mutant_colors			= 1
+				if("starlight")
+					config.starlight				= 1
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 86f2e366490..8cbb18906dc 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -18,9 +18,11 @@
 	update_starlight()
 
 /turf/space/proc/update_starlight()
-	for(var/turf/T in range(src,1))
+	if(!config.starlight)
+		return
+	for(var/turf/T in orange(src,1))
 		if(istype(T,/turf/simulated))
-			src.SetLuminosity(2)
+			src.SetLuminosity(3)
 			return
 
 /turf/space/attack_paw(mob/user as mob)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index f90bed96b57..c43b5b42442 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -146,6 +146,9 @@
 		if(W.lighting_lumcount)				//unless we're being illuminated, don't bother (may be buggy, hard to test)
 			W.UpdateAffectingLights()
 
+	for(var/turf/space/S in range(W,1))
+		S.update_starlight()
+
 	W.levelupdate()
 	W.CalculateAdjacentTurfs()
 	return W