Merge pull request #11848 from xxalpha/smoothlattice

Lattices and catwalks now use generic icon smoothing.

code/game/objects/effects/aliens.dm

@@ -29,7 +29,7 @@
 	canSmoothWith = list(/obj/structure/alien/resin)
 	var/health = 200
 	var/resintype = null
-	smooth = 1
+	smooth = SMOOTH_TRUE
 
 
 /obj/structure/alien/resin/New(location)

code/game/objects/structures/false_walls.dm

@@ -19,7 +19,7 @@
 	/obj/structure/falsewall/reinforced,  // WHY DO WE SMOOTH WITH FALSE R-WALLS WHEN WE DON'T SMOOTH WITH REAL R-WALLS.
 	/turf/simulated/wall/rust,
 	/turf/simulated/wall/r_wall/rust)
-	smooth = 1
+	smooth = SMOOTH_TRUE
 	can_be_unanchored = 0
 
 /obj/structure/falsewall/attack_hand(mob/user)
@@ -49,15 +49,15 @@
 
 /obj/structure/falsewall/proc/do_the_flick()
 	if(density)
-		smooth = 0
-		clear_overlays(src)
+		smooth = SMOOTH_FALSE
+		clear_smooth_overlays()
 		icon_state = "fwall_opening"
 	else
 		icon_state = "fwall_closing"
 
 /obj/structure/falsewall/update_icon()//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open
 	if(density)
-		smooth = 1
+		smooth = SMOOTH_TRUE
 		smooth_icon(src)
 		icon_state = ""
 	else

code/game/objects/structures/lattice.dm

@@ -1,12 +1,17 @@
 /obj/structure/lattice
 	name = "lattice"
 	desc = "A lightweight support lattice. These hold our station together."
-	icon = 'icons/obj/structures.dmi'
-	icon_state = "latticefull"
+	icon = 'icons/obj/smooth_structures/lattice.dmi'
+	icon_state = "lattice"
 	density = 0
 	anchored = 1
 	layer = 2.3 //under pipes
 	var/obj/item/stack/rods/stored
+	canSmoothWith = list(/obj/structure/lattice,
+	/turf/simulated/floor,
+	/turf/simulated/wall,
+	/obj/structure/falsewall)
+	smooth = SMOOTH_MORE
 	//	flags = CONDUCT
 
 /obj/structure/lattice/New()
@@ -17,21 +22,6 @@
 		if(LAT != src)
 			qdel(LAT)
 	stored = new/obj/item/stack/rods(src)
-	icon = 'icons/obj/smoothlattice.dmi'
-	updateOverlays()
-	for (var/dir in cardinal)
-		var/obj/structure/lattice/L
-		if(locate(/obj/structure/lattice, get_step(src, dir)))
-			L = locate(/obj/structure/lattice, get_step(src, dir))
-			L.updateOverlays()
-
-/obj/structure/lattice/Destroy()
-	for (var/dir in cardinal)
-		var/obj/structure/lattice/L
-		if(locate(/obj/structure/lattice, get_step(src, dir)))
-			L = locate(/obj/structure/lattice, get_step(src, dir))
-			L.updateOverlays(src.loc)
-	return ..()
 
 /obj/structure/lattice/blob_act()
 	qdel(src)
@@ -63,27 +53,9 @@
 			Deconstruct()
 	return
 
-/obj/structure/lattice/proc/updateOverlays()
-	//if(!(istype(src.loc, /turf/space)))
-	//	qdel(src)
-	overlays.Cut()
-
-	var/dir_sum = 0
-
-	for (var/direction in cardinal)
-		if(locate(/obj/structure/lattice, get_step(src, direction)))
-			dir_sum += direction
-		else
-			if(!(istype(get_step(src, direction), /turf/space)))
-				dir_sum += direction
-
-	icon_state = "[name][dir_sum]"
-	return
-
 /obj/structure/lattice/Deconstruct()
 	var/turf/T = loc
 	stored.loc = T
-	updateOverlays()
 	..()
 
 /obj/structure/lattice/singularity_pull(S, current_size)
@@ -93,7 +65,10 @@
 /obj/structure/lattice/catwalk
 	name = "catwalk"
 	desc = "A catwalk for easier EVA manuevering and cable placement."
-	icon_state = "catwalkfull"
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
+	icon_state = "catwalk"
+	smooth = SMOOTH_TRUE
+	canSmoothWith = null
 
 /obj/structure/lattice/catwalk/Move()
 	var/turf/T = loc
@@ -113,15 +88,3 @@
 		var/turf/T = get_turf(src)
 		T.attackby(C, user) //catwalks 'enable' coil laying on space tiles, not the catwalks themselves
 		return
-
-/obj/structure/lattice/catwalk/updateOverlays()
-	overlays.Cut()
-
-	var/dir_sum = 0
-
-	for (var/direction in cardinal)
-		if(locate(/obj/structure/lattice/catwalk, get_step(src, direction))) //so we only blend with other catwalks
-			dir_sum += direction
-
-	icon_state = "[name][dir_sum]"
-	return

code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

@@ -6,7 +6,7 @@
 	icon = 'icons/obj/smooth_structures/alien/nest.dmi'
 	icon_state = "nest"
 	var/health = 100
-	smooth = 1
+	smooth = SMOOTH_TRUE
 	can_be_unanchored = 0
 	canSmoothWith = null
 	var/image/nest_overlay

code/game/objects/structures/tables_racks.dm

@@ -28,7 +28,7 @@
 	var/buildstackamount = 1
 	var/framestackamount = 2
 	var/mob/tableclimber
-	smooth = 1
+	smooth = SMOOTH_TRUE
 	canSmoothWith = list(/obj/structure/table, /obj/structure/table/reinforced)
 
 /obj/structure/table/New()

code/game/objects/structures/window.dm

@@ -441,7 +441,7 @@
 	dir = 5
 	maxhealth = 50
 	fulltile = 1
-	smooth = 1
+	smooth = SMOOTH_TRUE
 	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile)
 
 /obj/structure/window/reinforced/fulltile
@@ -450,7 +450,7 @@
 	dir = 5
 	maxhealth = 100
 	fulltile = 1
-	smooth = 1
+	smooth = SMOOTH_TRUE
 	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile)
 
 /obj/structure/window/reinforced/tinted/fulltile
@@ -458,7 +458,7 @@
 	icon_state = "tinted_window"
 	dir = 5
 	fulltile = 1
-	smooth = 1
+	smooth = SMOOTH_TRUE
 	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile)
 
 /obj/structure/window/shuttle
@@ -471,6 +471,6 @@
 	wtype = "shuttle"
 	fulltile = 1
 	reinf = 1
-	smooth = 1
+	smooth = SMOOTH_TRUE
 	canSmoothWith = null
 	explosion_block = 1