From 5d2bd62bebfc6cf4200de5ea1d83a242cb9a87ee Mon Sep 17 00:00:00 2001
From: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
Date: Sat, 3 Aug 2019 11:15:13 +0200
Subject: [PATCH] fixes traps (#45650)

* Update maps.txt

* Update traps.dm

* Update maps.txt
---
 code/game/objects/structures/traps.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index a3440108a1b..4d8d29d0d81 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -174,12 +174,8 @@
 /obj/structure/trap/fire/trap_effect(mob/living/L)
 	to_chat(L, "<span class='danger'><B>Spontaneous combustion!</B></span>")
 	L.Paralyze(20)
-
-/obj/structure/trap/fire/flare()
-	..()
 	new /obj/effect/hotspot(get_turf(src))
 
-
 /obj/structure/trap/chill
 	name = "frost trap"
 	desc = "A trap that will chill you to the bone. You'd better avoid it."
@@ -202,9 +198,6 @@
 	to_chat(L, "<span class='danger'><B>The ground quakes beneath your feet!</B></span>")
 	L.Paralyze(100)
 	L.adjustBruteLoss(35)
-
-/obj/structure/trap/damage/flare()
-	..()
 	var/obj/structure/flora/rock/giant_rock = new(get_turf(src))
 	QDEL_IN(giant_rock, 200)