From dc089a8da9233ed298380ed9f17ee1ce388f7c6e Mon Sep 17 00:00:00 2001
From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
Date: Mon, 30 May 2022 10:38:36 -0400
Subject: [PATCH] Fixes reinforced wall deconstruction and description (#14139)

---
 code/game/objects/structures/girders.dm   | 3 ++-
 code/game/turfs/simulated/wall_attacks.dm | 2 +-
 code/game/turfs/simulated/wall_types.dm   | 5 +++++
 html/changelogs/doxxmedearly-rwallfix.yml | 5 +++++
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/doxxmedearly-rwallfix.yml

diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 5c6e2b774e3..6620a27474f 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -2,7 +2,8 @@
 	desc = "The basic building block of all walls."
 	desc_info = "Use metal sheets on this to build a normal wall.<br>\
 	A false wall can be made by using a crowbar on this girder, and then adding some material.<br>\
-	You can dismantle the grider with a wrench, or add support struts with a screwdriver to enable further reinforcement."
+	You can dismantle the grider with a wrench, or add support struts with a screwdriver to enable further reinforcement.<br>\
+	If reinforced, before you can dismantle it, you must first unscrew the support struts, then cut them with wirecutters."
 	icon_state = "girder"
 	anchored = 1
 	density = 1
diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm
index 06560b25509..69b52324c30 100644
--- a/code/game/turfs/simulated/wall_attacks.dm
+++ b/code/game/turfs/simulated/wall_attacks.dm
@@ -341,7 +341,7 @@
 					cut_cover = 1
 				if(cut_cover)
 					to_chat(user, SPAN_NOTICE("You begin slicing through the support rods."))
-					if(!!W.use_tool(src, user , 70, volume = 50) || !istype(src, /turf/simulated/wall) || construction_stage != 1)
+					if(!W.use_tool(src, user , 70, volume = 50) || !istype(src, /turf/simulated/wall) || construction_stage != 1)
 						return
 					construction_stage = 0
 					update_icon()
diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm
index 10d02d17a6b..a12caa26537 100644
--- a/code/game/turfs/simulated/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types.dm
@@ -1,5 +1,10 @@
 /turf/simulated/wall/r_wall
 	icon_state = "rgeneric"
+	desc_info = "You can deconstruct this by with the following steps:<br>\
+	Cut the outer grill with wirecutters, then unscrew them.<br>\
+	Slice the cover with a welder, then pry it off with a crowbar.<br>\
+	Use a wrench to loosen the anchor bolts, then cut the supports with a welder.<br>\
+	Pry off the sheath with a crowbar to expose the girder. Examine it to see how to deconstruct it."
 
 /turf/simulated/wall/r_wall/Initialize(mapload)
 	. = ..(mapload, "plasteel","plasteel") //3strong
diff --git a/html/changelogs/doxxmedearly-rwallfix.yml b/html/changelogs/doxxmedearly-rwallfix.yml
new file mode 100644
index 00000000000..b1f30e900f9
--- /dev/null
+++ b/html/changelogs/doxxmedearly-rwallfix.yml
@@ -0,0 +1,5 @@
+author: Doxxmedearly
+delete-after: True
+changes:
+  - bugfix: "You can now dismantle reinforced walls again."
+  - bugfix: "The additional description info for reinforced walls and girders now shows the correct disassembly steps."