shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into arcade-carpets

Browse Source
This commit is contained in:
Detective Google
2020-10-01 13:41:10 -05:00
parent 643421bc23 ef311cd1ec
commit 98703e6ad6
205 changed files with 167252 additions and 84330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/tile_types.dm
+19 -1
View File
@@ -154,13 +154,31 @@
//Wood
/obj/item/stack/tile/wood
name = "wood floor tile"
name = "wooden plank floor tile"
singular_name = "wood floor tile"
desc = "An easy to fit wood floor tile."
icon_state = "tile-wood"
turf_type = /turf/open/floor/wood
resistance_flags = FLAMMABLE
/obj/item/stack/tile/wood/wood_large
name = "large wooden plank floor tile"
singular_name = "large wooden plank floor tile"
icon_state = "tile-wood_large"
turf_type = /turf/open/floor/wood/wood_large
/obj/item/stack/tile/wood/wood_tiled
name = "tiled wooden plank floor tile"
singular_name = "tiled wooden plank floor tile"
icon_state = "tile-wood_tile"
turf_type = /turf/open/floor/wood/wood_tiled
/obj/item/stack/tile/wood/wood_diagonal
name = "diagonal wooden plank floor tile"
singular_name = "diagonal wooden plank floor tile"
icon_state = "tile-wood_diagonal"
turf_type = /turf/open/floor/wood/wood_diagonal
//Cloth Floors
/obj/item/stack/tile/padded