bugfix: Icon fixes: Eternal suffering edition (ss220-space#5396)

code/game/gamemodes/miniantags/revenant/revenant_abilities.dm

@@ -500,11 +500,11 @@
 		new/obj/effect/temp_visual/revenant(loc)
 		ChangeTurf(/turf/simulated/wall/rust)
 
-/turf/simulated/r_wall/defile()
+/turf/simulated/wall/r_wall/defile()
 	..()
 	if(prob(15))
 		new/obj/effect/temp_visual/revenant(loc)
-		ChangeTurf(/turf/simulated/r_wall/rust)
+		ChangeTurf(/turf/simulated/wall/r_wall/rust)
 
 /obj/structure/window/defile()
 	take_damage(rand(30,80))
@@ -527,7 +527,7 @@
 /atom/proc/defile()
 	return
 
-/turf/simulated/r_wall/rust/defile()
+/turf/simulated/wall/r_wall/rust/defile()
 	return
 
 /turf/simulated/wall/shuttle/defile()

code/game/objects/structures/false_walls.dm

@@ -11,7 +11,7 @@
 	desc = "A huge chunk of metal used to seperate rooms."
 	anchored = TRUE
 	icon = 'icons/turf/walls/wall.dmi'
-	icon_state = "wall"
+	icon_state = "wall-0"
 	base_icon_state = "wall"
 
 	var/mineral = /obj/item/stack/sheet/metal
@@ -189,7 +189,7 @@
 	name = "reinforced wall"
 	desc = "A huge chunk of reinforced metal used to seperate rooms."
 	icon = 'icons/turf/walls/reinforced_wall.dmi'
-	icon_state = "r_wall"
+	icon_state = "r_wall-0"
 	base_icon_state = "r_wall"
 	walltype = /turf/simulated/wall/r_wall
 	mineral = /obj/item/stack/sheet/plasteel
@@ -218,7 +218,7 @@
 	name = "uranium wall"
 	desc = "A wall with uranium plating. This is probably a bad idea."
 	icon = 'icons/turf/walls/uranium_wall.dmi'
-	icon_state = "uranium"
+	icon_state = "uranium_wall-0"
 	base_icon_state = "uranium_wall"
 	mineral = /obj/item/stack/sheet/mineral/uranium
 	walltype = /turf/simulated/wall/mineral/uranium
@@ -244,7 +244,7 @@
 	name = "gold wall"
 	desc = "A wall with gold plating. Swag!"
 	icon = 'icons/turf/walls/gold_wall.dmi'
-	icon_state = "gold"
+	icon_state = "gold_wall-0"
 	base_icon_state = "gold_wall"
 	mineral = /obj/item/stack/sheet/mineral/gold
 	walltype = /turf/simulated/wall/mineral/gold
@@ -255,7 +255,7 @@
 	name = "silver wall"
 	desc = "A wall with silver plating. Shiny."
 	icon = 'icons/turf/walls/silver_wall.dmi'
-	icon_state = "silver"
+	icon_state = "silver_wall-0"
 	base_icon_state = "silver_wall"
 	mineral = /obj/item/stack/sheet/mineral/silver
 	walltype = /turf/simulated/wall/mineral/silver
@@ -266,7 +266,7 @@
 	name = "diamond wall"
 	desc = "A wall with diamond plating. You monster."
 	icon = 'icons/turf/walls/diamond_wall.dmi'
-	icon_state = "diamond"
+	icon_state = "diamond_wall-0"
 	base_icon_state = "diamond_wall"
 	mineral = /obj/item/stack/sheet/mineral/diamond
 	walltype = /turf/simulated/wall/mineral/diamond
@@ -279,7 +279,7 @@
 	name = "plasma wall"
 	desc = "A wall with plasma plating. This is definately a bad idea."
 	icon = 'icons/turf/walls/plasma_wall.dmi'
-	icon_state = "plasma"
+	icon_state = "plasma_wall-0"
 	base_icon_state = "plasma_wall"
 	mineral = /obj/item/stack/sheet/mineral/plasma
 	walltype = /turf/simulated/wall/mineral/plasma
@@ -310,7 +310,7 @@
 	name = "alien wall"
 	desc = "A strange-looking alien wall."
 	icon = 'icons/turf/walls/plasma_wall.dmi'
-	icon_state = "plasma"
+	icon_state = "plasma_wall-0"
 	base_icon_state = "plasma_wall"
 	mineral = /obj/item/stack/sheet/mineral/abductor
 	walltype = /turf/simulated/wall/mineral/abductor
@@ -322,7 +322,7 @@
 	name = "bananium wall"
 	desc = "A wall with bananium plating. Honk!"
 	icon = 'icons/turf/walls/bananium_wall.dmi'
-	icon_state = "bananium"
+	icon_state = "bananium_wall-0"
 	base_icon_state = "bananium_wall"
 	mineral = /obj/item/stack/sheet/mineral/bananium
 	walltype = /turf/simulated/wall/mineral/bananium
@@ -333,7 +333,7 @@
 	name = "sandstone wall"
 	desc = "A wall with sandstone plating."
 	icon = 'icons/turf/walls/sandstone_wall.dmi'
-	icon_state = "sandstone"
+	icon_state = "sandstone_wall-0"
 	base_icon_state = "sandstone_wall"
 	mineral = /obj/item/stack/sheet/mineral/sandstone
 	walltype = /turf/simulated/wall/mineral/sandstone
@@ -344,7 +344,7 @@
 	name = "wooden wall"
 	desc = "A wall with wooden plating. Stiff."
 	icon = 'icons/turf/walls/wood_wall.dmi'
-	icon_state = "wood"
+	icon_state = "wood_wall-0"
 	base_icon_state = "wood_wall"
 	mineral = /obj/item/stack/sheet/wood
 	walltype = /turf/simulated/wall/mineral/wood
@@ -355,7 +355,7 @@
 	name = "rough metal wall"
 	desc = "A wall with rough metal plating."
 	icon = 'icons/turf/walls/iron_wall.dmi'
-	icon_state = "iron"
+	icon_state = "iron_wall-0"
 	base_icon_state = "iron_wall"
 	mineral = /obj/item/stack/rods
 	mineral_amount = 5
@@ -367,7 +367,7 @@
 	name = "alien wall"
 	desc = "A wall with alien alloy plating."
 	icon = 'icons/turf/walls/abductor_wall.dmi'
-	icon_state = "abductor"
+	icon_state = "abductor_wall-0"
 	base_icon_state = "abductor_wall"
 	smooth = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
 	mineral = /obj/item/stack/sheet/mineral/abductor
@@ -379,7 +379,7 @@
 	name = "gingerbread wall"
 	desc = "Don't even try to bite it!"
 	icon = 'icons/turf/walls/gingerbread_wall.dmi'
-	icon_state = "gingerbread"
+	icon_state = "gingerbread_wall-0"
 	base_icon_state = "gingerbread_wall"
 	mineral = /obj/item/stack/sheet/gingerbread
 	mineral_amount = 5
@@ -401,7 +401,7 @@
 /obj/structure/falsewall/plastitanium
 	desc = "An evil wall of plasma and titanium."
 	icon = 'icons/turf/walls/plastitanium_wall.dmi'
-	icon_state = "shuttle"
+	icon_state = "plastitanium_wall-0"
 	base_icon_state = "plastitanium_wall"
 	mineral = /obj/item/stack/sheet/mineral/plastitanium
 	walltype = /turf/simulated/wall/mineral/plastitanium
@@ -414,7 +414,7 @@
 	desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
 	icon = 'icons/turf/walls/clockwork_wall.dmi'
 	base_icon_state = "clockwork_wall"
-	icon_state = "clockwork_wall"
+	icon_state = "clockwork_wall-0"
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	mineral_amount = 1
 	smooth = SMOOTH_BITMASK
@@ -428,7 +428,7 @@
 	name = "clockwork wall"
 	desc = "A huge chunk of warm metal. The clanging of machinery emanates from within. You feel a wind."
 	icon = 'icons/turf/walls/clockwork_wall.dmi'
-	icon_state = "clockwork_wall"
+	icon_state = "clockwork_wall-0"
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	mineral_amount = 1
 	canSmoothWith = SMOOTH_GROUP_CLOCKWORK_WALLS

code/game/objects/structures/lattice.dm

@@ -2,7 +2,7 @@
 	name = "lattice"
 	desc = "A lightweight support lattice."
 	icon = 'icons/obj/smooth_structures/lattice.dmi'
-	icon_state = "lattice-0"
+	icon_state = "lattice-31"
 	base_icon_state = "lattice"
 	density = FALSE
 	anchored = TRUE

code/game/turfs/simulated/floor/fancy_floor.dm

@@ -191,62 +191,71 @@
 	icon = 'icons/turf/floors/carpet_black.dmi'
 	floor_tile = /obj/item/stack/tile/carpet/black
 	base_icon_state = "carpet_black"
+	icon_state = "carpet_black-0"
 	canSmoothWith = SMOOTH_GROUP_CARPET_BLACK
 	smoothing_groups = SMOOTH_GROUP_CARPET_BLACK
 
 /turf/simulated/floor/carpet/blue
 	icon = 'icons/turf/floors/carpet_blue.dmi'
 	floor_tile = /obj/item/stack/tile/carpet/blue
 	base_icon_state = "carpet_blue"
+	icon_state = "carpet_blue-0"
 	canSmoothWith = SMOOTH_GROUP_CARPET_BLUE
 	smoothing_groups = SMOOTH_GROUP_CARPET_BLUE
 
 /turf/simulated/floor/carpet/cyan
 	icon = 'icons/turf/floors/carpet_cyan.dmi'
 	floor_tile = /obj/item/stack/tile/carpet/cyan
 	base_icon_state = "carpet_cyan"
+	icon_state = "carpet_cyan-0"
 	canSmoothWith = SMOOTH_GROUP_CARPET_CYAN
 	smoothing_groups = SMOOTH_GROUP_CARPET_CYAN
 
 /turf/simulated/floor/carpet/green
 	icon = 'icons/turf/floors/carpet_green.dmi'
 	floor_tile = /obj/item/stack/tile/carpet/green
 	base_icon_state = "carpet_green"
+	icon_state = "carpet_green-0"
 	canSmoothWith = SMOOTH_GROUP_CARPET_GREEN
 	smoothing_groups = SMOOTH_GROUP_CARPET_GREEN
 
 /turf/simulated/floor/carpet/orange
 	icon = 'icons/turf/floors/carpet_orange.dmi'
 	floor_tile = /obj/item/stack/tile/carpet/orange
 	base_icon_state = "carpet_orange"
+	icon_state = "carpet_orange-0"
 	canSmoothWith = SMOOTH_GROUP_CARPET_ORANGE
 	smoothing_groups = SMOOTH_GROUP_CARPET_ORANGE
 
 /turf/simulated/floor/carpet/purple
 	icon = 'icons/turf/floors/carpet_purple.dmi'
 	floor_tile = /obj/item/stack/tile/carpet/purple
 	base_icon_state = "carpet_purple"
+	icon_state = "carpet_purple-0"
 	canSmoothWith = SMOOTH_GROUP_CARPET_PURPLE
 	smoothing_groups = SMOOTH_GROUP_CARPET_PURPLE
 
 /turf/simulated/floor/carpet/red
 	icon = 'icons/turf/floors/carpet_red.dmi'
 	floor_tile = /obj/item/stack/tile/carpet/red
 	base_icon_state = "carpet_red"
+	icon_state = "carpet_red-0"
 	canSmoothWith = SMOOTH_GROUP_CARPET_RED
 	smoothing_groups = SMOOTH_GROUP_CARPET_RED
 
 /turf/simulated/floor/carpet/royalblack
 	icon = 'icons/turf/floors/carpet_royalblack.dmi'
 	floor_tile = /obj/item/stack/tile/carpet/royalblack
 	base_icon_state = "carpet_royalblack"
+	icon_state = "carpet_royalblack-0"
 	canSmoothWith = SMOOTH_GROUP_CARPET_ROYAL_BLACK
 	smoothing_groups = SMOOTH_GROUP_CARPET_ROYAL_BLACK
 
 /turf/simulated/floor/carpet/royalblue
 	icon = 'icons/turf/floors/carpet_royalblue.dmi'
 	floor_tile = /obj/item/stack/tile/carpet/royalblue
 	base_icon_state = "carpet_royalblue"
+	icon_state = "carpet_royalblue-0"
 	canSmoothWith = SMOOTH_GROUP_CARPET_ROYAL_BLUE
 	smoothing_groups = SMOOTH_GROUP_CARPET_ROYAL_BLUE
 

code/game/turfs/simulated/minerals.dm

@@ -3,7 +3,7 @@
 /turf/simulated/mineral //wall piece
 	name = "rock"
 	icon = 'icons/turf/smoothrocks.dmi'
-	icon_state = "smoothrocks"
+	icon_state = "smoothrocks-0"
 	base_icon_state = "smoothrocks"
 	smooth = SMOOTH_BITMASK
 	canSmoothWith = SMOOTH_GROUP_MINERAL_WALLS
@@ -369,7 +369,7 @@
 
 /turf/simulated/mineral/random/volcanic/hard
 	name = "hardened basalt"
-	icon_state = "rock_hard"
+	icon_state = "smoothrocks_hard-0"
 	icon = 'icons/turf/smoothrocks_hard.dmi'
 	base_icon_state = "smoothrocks_hard"
 	mineralChance = 24
@@ -382,7 +382,7 @@
 
 /turf/simulated/mineral/random/volcanic/hard/double
 	name = "hardened volcanic basalt"
-	icon_state = "rock_volcanic"
+	icon_state = "smoothrocks_volcanic-0"
 	icon = 'icons/turf/smoothrocks_volcanic.dmi'
 	base_icon_state = "smoothrocks_volcanic"
 	mineralChance = 60

code/game/turfs/simulated/walls_misc.dm

@@ -84,6 +84,7 @@
 	icon = 'icons/turf/walls/coated_reinforced_wall.dmi'
 	max_temperature = INFINITY
 	smooth = SMOOTH_BITMASK
+	icon_state = "coated_reinforced_wall-0"
 	base_icon_state = "coated_reinforced_wall"
 
 //Clockwork walls
@@ -92,6 +93,7 @@
 	desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
 	icon_state = "clockwork_wall-0"
 	base_icon_state = "clockwork_wall"
+	icon = 'icons/turf/walls/clockwork_wall.dmi'
 	canSmoothWith = SMOOTH_GROUP_CLOCKWORK_WALLS
 	smoothing_groups = SMOOTH_GROUP_CLOCKWORK_WALLS
 	smooth = SMOOTH_BITMASK