From 6f732b42adb1b524b5d61301cb9773808014ec8e Mon Sep 17 00:00:00 2001
From: Joan Lung <duorabbit2@gmail.com>
Date: Mon, 6 Mar 2017 21:56:27 -0500
Subject: [PATCH] no message

---
 code/game/turfs/simulated/floor/fancy_floor.dm      |  4 +---
 code/game/turfs/simulated/floor/plating/asteroid.dm | 11 ++++++++---
 code/modules/holodeck/turfs.dm                      |  6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index e34ef01bf2d..a612e58ab1a 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -79,9 +79,7 @@
 	..()
 	if(prob(15))
 		icon_state = "basalt[rand(0, 12)]"
-		switch(icon_state)
-			if("basalt1", "basalt2", "basalt3")
-				set_light(1, 0.1)
+		set_basalt_light(src)
 
 /turf/open/floor/carpet
 	name = "carpet"
diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index f726748a193..01aaba06bf7 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -119,9 +119,14 @@
 
 /turf/open/floor/plating/asteroid/basalt/Initialize()
 	..()
-	switch(icon_state)
-		if("basalt1", "basalt2", "basalt3") //5 and 9 are too dark to glow and make the amount of glows in tunnels too high
-			set_light(1, 0.1)
+	set_basalt_light(src)
+
+/proc/set_basalt_light(turf/open/floor/B)
+	switch(B.icon_state)
+		if("basalt1", "basalt2", "basalt3")
+			B.set_light(2, 0.6, "#c48a18") //more light
+		if("basalt5", "basalt9")
+			B.set_light(1.4, 0.6, "#c48a18") //barely anything!
 
 /turf/open/floor/plating/asteroid/basalt/gets_dug()
 	if(!dug)
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index b853f6d336b..38ce9c70f10 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -43,7 +43,7 @@
 	icon_state = "asteroid0"
 
 /turf/open/floor/holofloor/asteroid/Initialize()
-	icon_state = "asteroid[pick(0,1,2,3,4,5,6,7,8,9,10,11,12)]"
+	icon_state = "asteroid[rand(0, 12)]"
 	..()
 
 /turf/open/floor/holofloor/basalt
@@ -51,8 +51,10 @@
 	icon_state = "basalt0"
 
 /turf/open/floor/holofloor/basalt/Initialize()
-	icon_state = "basalt[pick(0,1,2,3,4,5,6,7,8,9,10,11,12)]"
 	..()
+	if(prob(15))
+		icon_state = "basalt[rand(0, 12)]"
+		set_basalt_light(src)
 
 /turf/open/floor/holofloor/space
 	name = "Space"