From 92df6286e54e01ecd3e71c140d8a658e526e9405 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Sat, 20 Jan 2018 19:41:54 -0200
Subject: [PATCH] Tweaks lava interaction and fixes the missing
 openspace_override_type (#4087)

-tweaks a bit more how lava do damage
-fixes the missing openspace_override_type that were removed on accident
---
 code/modules/mining/mine_turf_types.dm           | 16 ++++++----------
 .../mob/living/simple_animal/simple_animal.dm    | 11 -----------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/code/modules/mining/mine_turf_types.dm b/code/modules/mining/mine_turf_types.dm
index 48e4add0557..637bf6108a2 100644
--- a/code/modules/mining/mine_turf_types.dm
+++ b/code/modules/mining/mine_turf_types.dm
@@ -12,6 +12,7 @@
 			/turf/simulated/lava,
 			/turf/simulated/mineral
 	)
+	openspace_override_type = /turf/simulated/open/chasm/airless
 	movement_cost = 4	//moving on lava should slows you down
 
 // Custom behavior here - we want smoothed turfs to show basalt underneath, not lava.
@@ -29,22 +30,16 @@
 			return 1
 		if(!istype(oldloc,/turf/simulated/lava))
 			to_chat(L, "<span class='warning'>You are covered by fire and heat from entering \the [src]!</span>")
-		if(ishuman(L))
-			L.fire_stacks += 25
-			L.IgniteMob()
-			L.bodytemperature += 150
-			return 1
-		if(isrobot(L))
-			L.adjustFireLoss(rand(10,30))
-			return 1
 		if(isanimal(L))
 			var/mob/living/simple_animal/H = L
 			if(H.flying) //flying mobs will ignore the lava
 				return 1
 			else
-				H.adjustFireLoss(rand(20,40))
+				L.bodytemperature = min(L.bodytemperature + 150, 1000)
 		else
-			L.adjustFireLoss(rand(10,50))
+			L.adjust_fire_stacks(15)
+			L.IgniteMob()
+			return 1
 	..()
 
 /turf/simulated/lava/Exited(atom/movable/AM, atom/newloc)
@@ -67,6 +62,7 @@
 	light_color = LIGHT_COLOR_LAVA
 	smooth = SMOOTH_FALSE
 	canSmoothWith = null
+	openspace_override_type = /turf/simulated/open/chasm/airless
 
 	footstep_sound = "concretestep"
 
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 5ab190a785b..6feb2db4781 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -610,17 +610,6 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
 	return ..()
 
 
-/mob/living/simple_animal/handle_fire()
-	return
-/mob/living/simple_animal/update_fire()
-	return
-/mob/living/simple_animal/IgniteMob()
-	return
-/mob/living/simple_animal/ExtinguishMob()
-	return
-
-
-
 //I wanted to call this proc alert but it already exists.
 //Basically makes the mob pay attention to the world, resets sleep timers, awakens it from a sleeping state sometimes
 /mob/living/simple_animal/proc/poke(var/force_wake = 0)