From fe109a0972849153c07d42dd6ae26d824ad009a1 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Mon, 17 Jan 2022 17:30:46 -0800
Subject: [PATCH 1/2] Fixes literally everything dismantling walls

---
 code/game/turfs/simulated/wall_attacks.dm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm
index a03effa2e21..d671e002525 100644
--- a/code/game/turfs/simulated/wall_attacks.dm
+++ b/code/game/turfs/simulated/wall_attacks.dm
@@ -240,6 +240,10 @@
 		return
 
 	// Basic dismantling.
+<<<<<<< HEAD
+=======
+	var/dismantle_toolspeed = 0
+>>>>>>> 6489e47e1a7... Merge pull request #8371 from Atermonera/wall_deconstruction_fix
 	if(isnull(construction_stage) || !reinf_material)
 
 		var/cut_delay = 60 - material.cut_delay
@@ -259,6 +263,7 @@
 		else if(istype(W,/obj/item/weapon/melee/energy/blade))
 			dismantle_sound = "sparks"
 			dismantle_verb = "slicing"
+			dismantle_toolspeed = 1
 			cut_delay *= 0.5
 		else if(istype(W,/obj/item/weapon/pickaxe))
 			var/obj/item/weapon/pickaxe/P = W
@@ -272,7 +277,7 @@
 			if(dismantle_sound)
 				playsound(src, dismantle_sound, 100, 1)
 
-			if(cut_delay<0)
+			if(cut_delay < 0)
 				cut_delay = 0
 
 			if(!do_after(user,cut_delay * W.toolspeed))
@@ -386,7 +391,7 @@
 					construction_stage = 0
 					user.update_examine_panel(src)
 					update_icon()
-					to_chat(user, "<span class='notice'>The slice through the support rods.</span>")
+					to_chat(user, "<span class='notice'>You slice through the support rods.</span>")
 					return
 			if(0)
 				if(W.is_crowbar())

From 8a8c5f1b1a25a3b2f289590fee9455a69a410320 Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Sun, 13 Feb 2022 14:35:18 +0000
Subject: [PATCH 2/2] Update wall_attacks.dm

---
 code/game/turfs/simulated/wall_attacks.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm
index d671e002525..fb07754d1ea 100644
--- a/code/game/turfs/simulated/wall_attacks.dm
+++ b/code/game/turfs/simulated/wall_attacks.dm
@@ -240,10 +240,7 @@
 		return
 
 	// Basic dismantling.
-<<<<<<< HEAD
-=======
 	var/dismantle_toolspeed = 0
->>>>>>> 6489e47e1a7... Merge pull request #8371 from Atermonera/wall_deconstruction_fix
 	if(isnull(construction_stage) || !reinf_material)
 
 		var/cut_delay = 60 - material.cut_delay