Fixes more bitmasking issues (#17261)

code/game/objects/structures/aliens.dm

@@ -120,7 +120,7 @@
 	layer = ABOVE_OPEN_TURF_LAYER
 	plane = FLOOR_PLANE
 	icon = 'icons/obj/smooth_structures/alien/weeds1.dmi'
-	icon_state = "weeds1-0"
+	icon_state = "weeds1"
 	base_icon_state = "weeds1"
 	max_integrity = 15
 	smoothing_flags = SMOOTH_BITMASK
@@ -175,7 +175,7 @@
 	name = "glowing resin"
 	desc = "Blue bioluminescence shines from beneath the surface."
 	icon = 'icons/obj/smooth_structures/alien/weednode.dmi'
-	icon_state = "weednode-0"
+	icon_state = "weednode"
 	base_icon_state = "weednode"
 	light_range = 1
 	var/node_range = NODERANGE

code/game/objects/structures/false_walls.dm

@@ -64,44 +64,42 @@
 /obj/structure/falsewall/proc/toggle(mob/user)
 	if(opening)
 		return
-
-	opening = 1
+	opening = TRUE
 	if(density)
 		flick("fwall_opening", src)
-		density = 0
-		set_opacity(0)
-		update_icon()
+		density = FALSE
+		set_opacity(FALSE)
+		clear_smooth_overlays()
+		icon_state = "fwall_opening"
 	else
 		var/srcturf = get_turf(src)
 		for(var/mob/living/obstacle in srcturf) //Stop people from using this as a shield
-			opening = 0
+			opening = FALSE
 			return
 		flick("fwall_closing", src)
-		density = 1
-		set_opacity(1)
-		update_icon()
-	air_update_turf(1)
-	opening = 0
+		density = TRUE
+		set_opacity(TRUE)
+		icon_state = "fwall_closing"
+	air_update_turf(TRUE)
+	opening = FALSE
 	update_icon()
 
-
 /obj/structure/falsewall/update_icon()
 	if(opening)
+		smoothing_flags = NONE
+		clear_smooth_overlays()
 		if(density)
 			icon_state = "fwall_opening"
-			smoothing_flags = NONE
-			clear_smooth_overlays()
-		else
-			icon_state = "fwall_closing"
-	else
-		if(density)
-			icon_state = initial(icon_state)
-			smoothing_flags = SMOOTH_CORNERS
-			icon_state = "[base_icon_state]-[smoothing_junction]"
-			smoothing_flags = SMOOTH_BITMASK
-			QUEUE_SMOOTH(src)
-		else
-			icon_state = "fwall_open"
+			return
+		icon_state = "fwall_closing"
+		return
+	if(!density)
+		icon_state = "fwall_open"
+		return
+	smoothing_flags = SMOOTH_BITMASK
+	icon_state = initial(icon_state)
+	icon_state = "[base_icon_state]-[smoothing_junction]"
+	QUEUE_SMOOTH(src)
 
 /obj/structure/falsewall/proc/ChangeToWall(delete = TRUE)
 	var/turf/T = get_turf(src)

code/game/objects/structures/lattice.dm

@@ -73,8 +73,8 @@
 	base_icon_state = "catwalk"
 	number_of_rods = 2
 	smoothing_flags = SMOOTH_BITMASK
-	smoothing_groups = list(SMOOTH_GROUP_LATTICE, SMOOTH_GROUP_FLOOR)
-	canSmoothWith = list(SMOOTH_GROUP_LATTICE)
+	smoothing_groups = list(SMOOTH_GROUP_CATWALK, SMOOTH_GROUP_LATTICE, SMOOTH_GROUP_FLOOR)
+	canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_CATWALK)
 
 /obj/structure/lattice/catwalk/deconstruction_hints(mob/user)
 	to_chat(user, "<span class='notice'>The supporting rods look like they could be <b>cut</b>.</span>")