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

This commit is contained in:
Detective Google
2020-10-01 13:41:10 -05:00
205 changed files with 167252 additions and 84330 deletions
@@ -74,6 +74,24 @@
/turf/open/floor/wood/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/wood/wood_large
desc = "Stylish dark wood."
icon_state = "large_wood"
floor_tile = /obj/item/stack/tile/wood/wood_large
broken_states = list("large_wood-broken", "large_wood-broken2", "large_wood-broken3")
/turf/open/floor/wood/wood_tiled
desc = "Stylish dark wood."
icon_state = "wood_tile"
floor_tile = /obj/item/stack/tile/wood/wood_tiled
broken_states = list("wood_tile-broken", "wood_tile-broken2", "wood_tile-broken3")
/turf/open/floor/wood/wood_diagonal
desc = "Stylish dark wood."
icon_state = "diagonal_wood"
floor_tile = /obj/item/stack/tile/wood/wood_diagonal
broken_states = list("diagonal_wood-broken", "diagonal_wood-broken2", "diagonal_wood-broken3")
/turf/open/floor/grass
name = "grass patch"
desc = "You can't tell if this is real grass or just cheap plastic imitation."