[PORT] Wood Floor Tiles from TG. Resprite and new tiles! (#20919)

* newfloors

* e

* tiles.dmi

* floors.dmi

* tile_types.dm

* e

* color

* e

* e

* e

* fuuuck

* crafting recipes

* i dont know what im doing

* fixes them turning into CRINGE tiles

* indented x2

* fixes broken wood tiles not working right

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

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

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

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

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

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

---------

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
This commit is contained in:
Cark
2023-11-22 13:11:39 -08:00
committed by GitHub
parent 0d656bd8f4
commit d5def4cc6f
8 changed files with 91 additions and 2 deletions

View File

@@ -249,7 +249,7 @@
/obj/effect/turf_decal/siding/wood
icon_state = "siding_wood_line"
color = "#55391A"
color = "#5d341f"
/obj/effect/turf_decal/siding/wood/corner
icon_state = "siding_wood_corner"
@@ -257,6 +257,15 @@
/obj/effect/turf_decal/siding/wood/end
icon_state = "siding_wood_end"
/obj/effect/turf_decal/siding/wood/thin
icon_state = "siding_wood_line_thin"
/obj/effect/turf_decal/siding/wood/corner/thin
icon_state = "siding_wood_corner_thin"
/obj/effect/turf_decal/siding/wood/end/thin
icon_state = "siding_wood_end_thin"
/obj/effect/turf_decal/siding/thinplating
icon_state = "siding_thinplating_line"
color = "#aaaaaa"

View File

@@ -223,7 +223,6 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \
new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wooden, 3, time = 10),\
@@ -233,6 +232,12 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
new/datum/stack_recipe_list("floor tiles", list( \
new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
new/datum/stack_recipe("parquet wood floor tile", /obj/item/stack/tile/wood/parquet, 1, 4, 20), \
new/datum/stack_recipe("large wood floor tile", /obj/item/stack/tile/wood/large, 1, 4, 20), \
new/datum/stack_recipe("tiled wood floor tile", /obj/item/stack/tile/wood/tile, 1, 4, 20), \
)), \
null, \
new/datum/stack_recipe_list("pews", list(
new /datum/stack_recipe("pew (left)", /obj/structure/chair/pew/left, 3, one_per_turf = TRUE, on_floor = TRUE),

View File

@@ -153,6 +153,24 @@
turf_type = /turf/open/floor/wood
resistance_flags = FLAMMABLE
/obj/item/stack/tile/wood/parquet
name = "parquet wood floor tile"
singular_name = "parquet wood floor tile"
icon_state = "tile-wood_parquet"
turf_type = /turf/open/floor/wood/parquet
/obj/item/stack/tile/wood/large
name = "large wood floor tile"
singular_name = "large wood floor tile"
icon_state = "tile-wood_large"
turf_type = /turf/open/floor/wood/large
/obj/item/stack/tile/wood/tile
name = "tiled wood floor tile"
singular_name = "tiled wood floor tile"
icon_state = "tile-wood_tile"
turf_type = /turf/open/floor/wood/tile
//Bamboo
/obj/item/stack/tile/bamboo
name = "bamboo mat pieces"

View File

@@ -63,6 +63,21 @@
to_chat(user, span_notice("You forcefully pry off the planks, destroying them in the process."))
return make_plating()
/turf/open/floor/wood/parquet
icon_state = "wood-parquet"
floor_tile = /obj/item/stack/tile/wood/parquet
broken_states = list("wood-parquet-broken", "wood-parquet-broken2", "wood-parquet-broken3", "wood-parquet-broken4", "wood-parquet-broken5", "wood-parquet-broken6", "wood-parquet-broken7")
/turf/open/floor/wood/tile
icon_state = "wood-tile"
floor_tile = /obj/item/stack/tile/wood/tile
broken_states = list("wood-tile-broken", "wood-tile-broken2", "wood-tile-broken3")
/turf/open/floor/wood/large
icon_state = "wood-large"
floor_tile = /obj/item/stack/tile/wood/large
broken_states = list("wood-large-broken", "wood-large-broken2", "wood-large-broken3")
/turf/open/floor/wood/cold
initial_gas_mix = KITCHEN_COLDROOM_ATMOS
@@ -160,6 +175,48 @@
/turf/open/floor/wood/cold/broken/seven
icon_state = "wood-broken7"
/turf/open/floor/wood/parquet/broken
icon_state = "wood-parquet-broken"
broken = TRUE
/turf/open/floor/wood/parquet/broken/two
icon_state = "wood-parquet-broken2"
/turf/open/floor/wood/parquet/broken/three
icon_state = "wood-parquet-broken3"
/turf/open/floor/wood/parquet/broken/four
icon_state = "wood-parquet-broken4"
/turf/open/floor/wood/parquet/broken/five
icon_state = "wood-parquet-broken5"
/turf/open/floor/wood/parquet/broken/six
icon_state = "wood-parquet-broken6"
/turf/open/floor/wood/parquet/broken/seven
icon_state = "wood-parquet-broken7"
/turf/open/floor/wood/tile/broken
icon_state = "wood-tile-broken"
broken = TRUE
/turf/open/floor/wood/tile/broken/two
icon_state = "wood-tile-broken2"
/turf/open/floor/wood/tile/broken/three
icon_state = "wood-tile-broken3"
/turf/open/floor/wood/large/broken
icon_state = "wood-large-broken"
broken = TRUE
/turf/open/floor/wood/large/broken/two
icon_state = "wood-large-broken2"
/turf/open/floor/wood/large/broken/three
icon_state = "wood-large-broken3"
/turf/open/floor/bamboo
desc = "A bamboo mat with a decorative trim."
icon = 'icons/turf/floors/bamboo_mat.dmi'

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 KiB

After

Width:  |  Height:  |  Size: 234 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 KiB

After

Width:  |  Height:  |  Size: 348 KiB