From 9ea303705aac4490d8cebbad510ca6bfdd77e087 Mon Sep 17 00:00:00 2001
From: Joan Lung <duorabbit2@gmail.com>
Date: Sun, 28 Aug 2016 09:14:22 -0400
Subject: [PATCH] fancy

---
 code/game/turfs/simulated/river.dm                   |  5 ++++-
 code/modules/mining/mine_turfs.dm                    |  9 ++++++---
 .../mob/living/simple_animal/hostile/mining_mobs.dm  | 12 ++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/code/game/turfs/simulated/river.dm b/code/game/turfs/simulated/river.dm
index 67a4bc7a765..c5f93c806b4 100644
--- a/code/game/turfs/simulated/river.dm
+++ b/code/game/turfs/simulated/river.dm
@@ -50,7 +50,7 @@
 				continue
 			else
 				var/turf/river_turf = cur_turf.ChangeTurf(turf_type)
-				river_turf.Spread(25, 10, whitelist_area)
+				river_turf.Spread(20, 9, whitelist_area)
 
 	for(var/WP in river_nodes)
 		qdel(WP)
@@ -87,6 +87,9 @@
 		var/turf/T = F
 		if(prob(probability) && T.ChangeTurf(type))
 			T.Spread(probability - prob_loss, prob_loss, whitelisted_area)
+		else if(istype(T, /turf/closed/mineral))
+			var/turf/closed/mineral/M = T
+			M.ChangeTurf(M.turf_type)
 
 
 #undef RANDOM_UPPER_X
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 625c5b1f86b..0a7a93f239f 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -371,9 +371,12 @@
 	if(prob(30))
 		if(istype(loc, /area/mine/explored) || istype(loc, /area/lavaland/surface/outdoors/explored))
 			return
-		for(var/atom/A in urange(12,T))//Lowers chance of mob clumps
-			if(istype(A, /mob/living/simple_animal/hostile/asteroid))
-				return
+		for(var/mob/living/simple_animal/hostile/asteroid/A in urange(12,T)) //prevents mob clumps
+			return
+		for(var/mob/living/simple_animal/hostile/megafauna/A in range(7,T))
+			return
+		for(var/mob/living/simple_animal/hostile/spawner/lavaland in range(3,T)) //prevents tendrils spawning in collapse range
+			return
 		var/randumb = pickweight(mob_spawn_list)
 		new randumb(T)
 	return
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index ccabad1c1f2..45a0f519989 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -994,7 +994,7 @@
 	icon_dead = "tendril"
 	faction = list("mining")
 	weather_immunities = list("lava","ash")
-	luminosity = 2
+	luminosity = 1
 	health = 250
 	maxHealth = 250
 	max_mobs = 3
@@ -1010,10 +1010,10 @@
 
 /mob/living/simple_animal/hostile/spawner/lavaland/New()
 	..()
-	var/turf/T = get_step(src, NORTH)
-	if(istype(T, /turf/closed/mineral))
-		var/turf/closed/mineral/M = T
-		M.gets_drilled()
+	for(var/F in RANGE_TURFS(1, src))
+		if(istype(F, /turf/closed/mineral))
+			var/turf/closed/mineral/M = F
+			M.ChangeTurf(M.turf_type)
 	gps = new /obj/item/device/gps/internal(src)
 
 /mob/living/simple_animal/hostile/spawner/lavaland/Destroy()
@@ -1044,7 +1044,7 @@
 /obj/effect/collapse
 	name = "collapsing necropolis tendril"
 	desc = "Get clear!"
-	luminosity = 2
+	luminosity = 1
 	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/mob/nest.dmi'
 	icon_state = "tendril"