[MIRROR] Fixes false walls icons using the wrong icon files [MDB IGNO…

…RE] (#25504) * Fixes false walls icons using the wrong icon files * Update false_walls.dm --------- Co-authored-by: Bloop <[email protected]>
Fluffy-Frontier · Dec 8, 2023 · 1b904cc · 1b904cc
1 parent 0430061
commit 1b904cc
Showing 1 changed file with 12 additions and 0 deletions.
diff --git 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)