diff --git a/modular_ss220/aesthetics/_aesthetics.dm b/modular_ss220/aesthetics/_aesthetics.dm index 4ad8ff03e198..aef783670380 100644 --- a/modular_ss220/aesthetics/_aesthetics.dm +++ b/modular_ss220/aesthetics/_aesthetics.dm @@ -13,28 +13,44 @@ GLOB.wood_recipes += list( null, new /datum/stack_recipe_list("Деревянный пол", list( - new /datum/stack_recipe("Обычный деревянный пол", /obj/item/stack/tile/wood, 1, 4, 20), - new /datum/stack_recipe("Дубовый деревянный пол", /obj/item/stack/tile/wood/oak, 1, 4, 20), - new /datum/stack_recipe("Берёзовый деревянный пол", /obj/item/stack/tile/wood/birch, 1, 4, 20), - new /datum/stack_recipe("Вишнёвый деревянный пол", /obj/item/stack/tile/wood/cherry, 1, 4, 20), + new /datum/stack_recipe("Обычный", /obj/item/stack/tile/wood, 1, 4, 20), + new /datum/stack_recipe("Дубовый", /obj/item/stack/tile/wood/oak, 1, 4, 20), + new /datum/stack_recipe("Берёзовый", /obj/item/stack/tile/wood/birch, 1, 4, 20), + new /datum/stack_recipe("Вишнёвый", /obj/item/stack/tile/wood/cherry, 1, 4, 20), + new /datum/stack_recipe("Амарантовый", /obj/item/stack/tile/wood/amaranth, 1, 4, 20), + new /datum/stack_recipe("Эбонитовый", /obj/item/stack/tile/wood/ebonite, 5, 4, 20), + new /datum/stack_recipe("Умниниевый", /obj/item/stack/tile/wood/pink_ivory, 5, 4, 20), + new /datum/stack_recipe("Бакаутовый", /obj/item/stack/tile/wood/guaiacum, 5, 4, 20), )), new /datum/stack_recipe_list("Деревянный пол (Цельный)", list( - new /datum/stack_recipe("Обычный цельный деревянный пол", /obj/item/stack/tile/wood/fancy, 1, 4, 20), - new /datum/stack_recipe("Дубовый цельный деревянный пол", /obj/item/stack/tile/wood/fancy/oak, 1, 4, 20), - new /datum/stack_recipe("Берёзовый цельный деревянный пол", /obj/item/stack/tile/wood/fancy/birch, 1, 4, 20), - new /datum/stack_recipe("Вишнёвый цельный деревянный пол", /obj/item/stack/tile/wood/fancy/cherry, 1, 4, 20), + new /datum/stack_recipe("Обычный", /obj/item/stack/tile/wood/fancy, 1, 4, 20), + new /datum/stack_recipe("Дубовый", /obj/item/stack/tile/wood/fancy/oak, 1, 4, 20), + new /datum/stack_recipe("Берёзовый", /obj/item/stack/tile/wood/fancy/birch, 1, 4, 20), + new /datum/stack_recipe("Вишнёвый", /obj/item/stack/tile/wood/fancy/cherry, 1, 4, 20), + new /datum/stack_recipe("Амарантовый ", /obj/item/stack/tile/wood/fancy/amaranth, 1, 4, 20), + new /datum/stack_recipe("Эбонитовый ", /obj/item/stack/tile/wood/fancy/ebonite, 5, 4, 20), + new /datum/stack_recipe("Умниниевый ", /obj/item/stack/tile/wood/fancy/pink_ivory, 5, 4, 20), + new /datum/stack_recipe("Бакаутовый ", /obj/item/stack/tile/wood/fancy/guaiacum, 5, 4, 20), )), new /datum/stack_recipe_list("Паркет", list( - new /datum/stack_recipe("Обычный паркет", /obj/item/stack/tile/wood/parquet, 1, 4, 20), - new /datum/stack_recipe("Дубовый паркет", /obj/item/stack/tile/wood/parquet/oak, 1, 4, 20), - new /datum/stack_recipe("Берёзовый паркет", /obj/item/stack/tile/wood/parquet/birch, 1, 4, 20), - new /datum/stack_recipe("Вишнёвый паркет", /obj/item/stack/tile/wood/parquet/cherry, 1, 4, 20), + new /datum/stack_recipe("Обычный", /obj/item/stack/tile/wood/parquet, 1, 4, 20), + new /datum/stack_recipe("Дубовый", /obj/item/stack/tile/wood/parquet/oak, 1, 4, 20), + new /datum/stack_recipe("Берёзовый", /obj/item/stack/tile/wood/parquet/birch, 1, 4, 20), + new /datum/stack_recipe("Вишнёвый", /obj/item/stack/tile/wood/parquet/cherry, 1, 4, 20), + new /datum/stack_recipe("Амарантовый", /obj/item/stack/tile/wood/parquet/amaranth, 1, 4, 20), + new /datum/stack_recipe("Эбонитовый", /obj/item/stack/tile/wood/parquet/ebonite, 5, 4, 20), + new /datum/stack_recipe("Умниниевый", /obj/item/stack/tile/wood/parquet/pink_ivory, 5, 4, 20), + new /datum/stack_recipe("Бакаутовый", /obj/item/stack/tile/wood/parquet/guaiacum, 5, 4, 20), )), new /datum/stack_recipe_list("Паркет (Классический)", list( - new /datum/stack_recipe("Классический обычный паркет", /obj/item/stack/tile/wood/parquet/tile, 1, 4, 20), - new /datum/stack_recipe("Классический дубовый паркет", /obj/item/stack/tile/wood/parquet/tile/oak, 1, 4, 20), - new /datum/stack_recipe("Классический берёзовый паркет", /obj/item/stack/tile/wood/parquet/tile/birch, 1, 4, 20), - new /datum/stack_recipe("Классический вишнёвый паркет", /obj/item/stack/tile/wood/parquet/tile/cherry, 1, 4, 20), + new /datum/stack_recipe("Обычный", /obj/item/stack/tile/wood/parquet/tile, 1, 4, 20), + new /datum/stack_recipe("Дубовый", /obj/item/stack/tile/wood/parquet/tile/oak, 1, 4, 20), + new /datum/stack_recipe("Берёзовый", /obj/item/stack/tile/wood/parquet/tile/birch, 1, 4, 20), + new /datum/stack_recipe("Вишнёвый", /obj/item/stack/tile/wood/parquet/tile/cherry, 1, 4, 20), + new /datum/stack_recipe("Амарантовый", /obj/item/stack/tile/wood/parquet/tile/amaranth, 1, 4, 20), + new /datum/stack_recipe("Эбонитовый", /obj/item/stack/tile/wood/parquet/tile/ebonite, 5, 4, 20), + new /datum/stack_recipe("Умниниевый", /obj/item/stack/tile/wood/parquet/tile/pink_ivory, 5, 4, 20), + new /datum/stack_recipe("Бакаутовый", /obj/item/stack/tile/wood/parquet/tile/guaiacum, 5, 4, 20), )), null) diff --git a/modular_ss220/aesthetics/floors/code/wood.dm b/modular_ss220/aesthetics/floors/code/wood.dm index ce26466fd17a..355e165bef8f 100644 --- a/modular_ss220/aesthetics/floors/code/wood.dm +++ b/modular_ss220/aesthetics/floors/code/wood.dm @@ -8,8 +8,8 @@ floor_tile = ##tile/oak;\ }\ ##tile/oak {\ - name = "oak wood floor tiles";\ - singular_name = "oak wood floor tile";\ + name = "oak floor tiles";\ + singular_name = "oak floor tile";\ color = "#644526";\ turf_type = ##path/oak;\ merge_type = ##tile/oak;\ @@ -19,8 +19,8 @@ floor_tile = ##tile/birch;\ }\ ##tile/birch {\ - name = "birch wood floor tiles";\ - singular_name = "birch wood floor tile";\ + name = "birch floor tiles";\ + singular_name = "birch floor tile";\ color = "#FFECB3";\ turf_type = ##path/birch;\ merge_type = ##tile/birch;\ @@ -30,12 +30,56 @@ floor_tile = ##tile/cherry;\ }\ ##tile/cherry {\ - name = "cherry wood floor tiles";\ - singular_name = "cherry wood floor tile";\ + name = "cherry floor tiles";\ + singular_name = "cherry floor tile";\ color = "#643412";\ turf_type = ##path/cherry;\ merge_type = ##tile/cherry;\ }\ +##path/amaranth {\ + color = "#6B2E3E";\ + floor_tile = ##tile/amaranth;\ +}\ +##tile/amaranth {\ + name = "amaranth floor tiles";\ + singular_name = "amaranth floor tile";\ + color = "#6B2E3E";\ + turf_type = ##path/amaranth;\ + merge_type = ##tile/amaranth;\ +}\ +##path/ebonite {\ + color = "#363649";\ + floor_tile = ##tile/ebonite;\ +}\ +##tile/ebonite {\ + name = "ebonite floor tiles";\ + singular_name = "ebonite floor tile";\ + color = "#363649";\ + turf_type = ##path/ebonite;\ + merge_type = ##tile/ebonite;\ +}\ +##path/pink_ivory {\ + color = "#D78575";\ + floor_tile = ##tile/pink_ivory;\ +}\ +##tile/pink_ivory {\ + name = "pink ivory floor tiles";\ + singular_name = "pink ivory floor tile";\ + color = "#D78575";\ + turf_type = ##path/pink_ivory;\ + merge_type = ##tile/pink_ivory;\ +}\ +##path/guaiacum {\ + color = "#5C6250";\ + floor_tile = ##tile/guaiacum;\ +}\ +##tile/guaiacum {\ + name = "guaiacum floor tiles";\ + singular_name = "guaiacum floor tile";\ + color = "#5C6250";\ + turf_type = ##path/guaiacum;\ + merge_type = ##tile/guaiacum;\ +}\ // Wood /obj/item/stack/tile/wood @@ -53,7 +97,7 @@ WOODEN_FLOOR_HELPER(/turf/simulated/floor/wood, /obj/item/stack/tile/wood) // Fancy Wood /obj/item/stack/tile/wood/fancy - name = "fancy light oak wood floor tiles" + name = "fancy wood floor tiles" singular_name = "fancy wood floor tile" icon_state = "tile-wood-fancy" color = "#864A2D" @@ -72,8 +116,8 @@ WOODEN_FLOOR_HELPER(/turf/simulated/floor/wood/fancy, /obj/item/stack/tile/wood/ // Parquet /obj/item/stack/tile/wood/parquet - name = "parquet wood floor tiles" - singular_name = "wood parquet floor tile" + name = "parquet floor tiles" + singular_name = "parquet floor tile" icon_state = "tile-wood-parquet" color = "#864A2D" turf_type = /turf/simulated/floor/wood/parquet @@ -91,8 +135,8 @@ WOODEN_FLOOR_HELPER(/turf/simulated/floor/wood/parquet, /obj/item/stack/tile/woo // Tiled Parquet /obj/item/stack/tile/wood/parquet/tile - name = "tiled parquet wood floor tiles" - singular_name = "wood tiled parquet floor tile" + name = "tiled parquet floor tiles" + singular_name = "tiled parquet floor tile" icon_state = "tile-wood-tile" color = "#864A2D" turf_type = /turf/simulated/floor/wood/parquet/tile