From 6066ab31dd6f237b3d41b9dc05c1f77680d7fd91 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 23 Jan 2018 08:20:27 -0600
Subject: [PATCH] Update igniter.dm

---
 code/modules/assembly/igniter.dm | 39 --------------------------------
 1 file changed, 39 deletions(-)

diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
index 786a4fc20e..1a0f439820 100644
--- a/code/modules/assembly/igniter.dm
+++ b/code/modules/assembly/igniter.dm
@@ -1,41 +1,3 @@
-<<<<<<< HEAD
-/obj/item/device/assembly/igniter
-	name = "igniter"
-	desc = "A small electronic device able to ignite combustible substances."
-	icon_state = "igniter"
-	materials = list(MAT_METAL=500, MAT_GLASS=50)
-	var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
-	heat = 1000
-
-/obj/item/device/assembly/igniter/New()
-	..()
-	sparks.set_up(2, 0, src)
-	sparks.attach(src)
-
-/obj/item/device/assembly/igniter/Destroy()
-	qdel(sparks)
-	sparks = null
-	. = ..()
-
-/obj/item/device/assembly/igniter/activate()
-	if(!..())
-		return 0//Cooldown check
-	var/turf/location = get_turf(loc)
-	if(location)
-		location.hotspot_expose(1000,1000)
-	sparks.start()
-	return 1
-
-/obj/item/device/assembly/igniter/attack_self(mob/user)
-	activate()
-	add_fingerprint(user)
-
-/obj/item/device/assembly/igniter/ignition_effect(atom/A, mob/user)
-	. = "<span class='notice'>[user] fiddles with [src], and manages to \
-		light [A].</span>"
-	activate()
-	add_fingerprint(user)
-=======
 /obj/item/device/assembly/igniter
 	name = "igniter"
 	desc = "A small electronic device able to ignite combustible substances."
@@ -77,4 +39,3 @@
 		light [A].</span>"
 	activate()
 	add_fingerprint(user)
->>>>>>> 20a6c0c... Adds ~70 more suicides (#34522)