Merge pull request #235 from Mirag1993/Мердж-с-оффами

"fixes" material tiles (shiptest-ss13#2603)
CeladonSS13 · Dec 21, 2023 · c9e5964 · c9e5964
2 parents 71a0139 + 36bbc9a
commit c9e5964
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm
@@ -281,8 +281,6 @@
 	name = "floor"
 	icon_state = "materialfloor"
 	material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
-	icon = 'icons/turf/floors/tiles.dmi'
-	icon_state = "tiled"
 
 /turf/open/floor/material/spawn_tile()
 	for(var/i in custom_materials)

diff --git a/icons/turf/floors/tiles.dmi b/icons/turf/floors/tiles.dmi