Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/assembly/igniter.dm

@@ -13,7 +13,14 @@
 	activate()
 		if(!..())	return 0//Cooldown check
 		var/turf/location = get_turf(loc)
-		if(location)	location.hotspot_expose(1000,1000)
+		if(location)
+			location.hotspot_expose(1000,1000)
+		if (istype(src.loc,/obj/item/device/assembly_holder))
+			if (istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/))
+				var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc
+				if (tank && tank.modded)
+					tank.explode()
+
 		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 		s.set_up(3, 1, src)
 		s.start()