diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm index f7787772e6ba..552dbfa621fb 100644 --- a/code/game/objects/effects/decals/turfdecal/markings.dm +++ b/code/game/objects/effects/decals/turfdecal/markings.dm @@ -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" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 35ec28b5e3e5..b28344641425 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -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), diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 8f0808ac5bda..6d9365afbb8f 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -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" diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 5e47d159cec4..c6ec1637b061 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -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' diff --git a/goon/icons/turfs/floors.dmi b/goon/icons/turfs/floors.dmi index 6287504c132b..b5b3a57b9852 100644 Binary files a/goon/icons/turfs/floors.dmi and b/goon/icons/turfs/floors.dmi differ diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index b69c131a49c9..d873de1947a0 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/decals.dmi b/icons/turf/decals.dmi index d43a1b51df47..4429ebf8491b 100644 Binary files a/icons/turf/decals.dmi and b/icons/turf/decals.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 9e955d650a93..ae4df232e249 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ