From 49c31f2d94f3519a20ba20dfb7708b841eee7d8e Mon Sep 17 00:00:00 2001
From: ninjanomnom <ninjanomnom@gmail.com>
Date: Wed, 22 Nov 2017 09:23:37 -0500
Subject: [PATCH] lava is hot and other children's tales

---
 code/datums/components/thermite.dm | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm
index 7418e5d7b4d..f76178213dd 100644
--- a/code/datums/components/thermite.dm
+++ b/code/datums/components/thermite.dm
@@ -3,13 +3,30 @@
 	var/amount
 	var/overlay
 
-	var/static/list/blacklist = typecacheof(/turf/closed/wall/mineral/diamond)
-	var/static/list/resistlist = typecacheof(/turf/closed/wall/r_wall)
+	var/static/list/blacklist = typecacheof(
+		/turf/open/lava,
+		/turf/open/space,
+		/turf/open/water,
+		/turf/open/chasm,
+		)
+
+	var/static/list/immunelist = typecacheof(
+		/turf/closed/wall/mineral/diamond,
+		/turf/closed/indestructible,
+		/turf/open/indestructible,
+		)
+	
+	var/static/list/resistlist = typecacheof(
+		/turf/closed/wall/r_wall,
+		)
 
 /datum/component/thermite/Initialize(_amount)
 	if(!istype(parent, /turf))
-		return COMPONENT_INCOMPATIBLE
+		. = COMPONENT_INCOMPATIBLE
+		CRASH("A thermite component has been applied to an incorrect object. parent: [parent]")
 	if(blacklist[parent.type])
+		return COMPONENT_INCOMPATIBLE
+	if(immunelist[parent.type])
 		_amount*=0 //Yeah the overlay can still go on it and be cleaned but you arent burning down a diamond wall
 	if(resistlist[parent.type])
 		_amount*=0.25