From 1b904cc15e98586edf95765a57db1c416c30ca52 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 8 Dec 2023 22:40:48 +0100
Subject: [PATCH] [MIRROR] Fixes false walls icons using the wrong icon files
 [MDB IGNORE] (#25504)

* Fixes false walls icons using the wrong icon files

* Update false_walls.dm

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
---
 code/game/objects/structures/false_walls.dm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 4f7b12e5303..b812b416ef0 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -72,9 +72,21 @@
 
 /obj/structure/falsewall/update_icon_state()
 	if(opening)
+<<<<<<< HEAD
 		icon_state = "fwall_[density ? "opening" : "closing"]"
 		return ..()
 	icon_state = density ? "[base_icon_state]-[smoothing_junction]" : "fwall_open"
+=======
+		icon = initial(icon)
+		icon_state = "[base_icon_state]-[density ? "opening" : "closing"]"
+		return ..()
+	if(density)
+		icon = fake_icon
+		icon_state = "[base_icon_state]-[smoothing_junction]"
+	else
+		icon = initial(icon)
+		icon_state = "[base_icon_state]-open"
+>>>>>>> d73a0183 ([MIRROR] Fixes false walls icons using the wrong icon files [MDB IGNORE] (#25504))
 	return ..()
 
 /obj/structure/falsewall/proc/ChangeToWall(delete = 1)