diff --git a/code/datums/supplypacks/flooring.dm b/code/datums/supplypacks/flooring.dm index d4e03bd2d5b4b..2d6f550866148 100644 --- a/code/datums/supplypacks/flooring.dm +++ b/code/datums/supplypacks/flooring.dm @@ -55,6 +55,12 @@ cost = 15 containername = "red carpet crate" +/singleton/hierarchy/supply_pack/flooring/carpetblack + name = "Black carpet" + contains = list(/obj/item/stack/tile/carpetblack/fifty) + cost = 15 + containername = "black carpet crate" + /singleton/hierarchy/supply_pack/flooring/linoleum name = "Linoleum" contains = list(/obj/item/stack/tile/linoleum/fifty) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 337d5b977d70d..86533483ba592 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -316,6 +316,16 @@ /obj/item/stack/tile/carpetred/fifty amount = 50 +/obj/item/stack/tile/carpetblack + name = "black carpet" + desc = "A piece of black carpet." + singular_name = "black carpet" + icon_state = "tile_carpetblack" + build_type = /obj/item/stack/tile/carpetblack + +/obj/item/stack/tile/carpetblack/fifty + amount = 50 + /obj/item/stack/tile/pool name = "pool tiling" desc = "A set of tiles designed to build fluid pools." diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index bf64fdc26f8d8..5b5008c73d8d7 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -141,6 +141,11 @@ icon_base = "red" build_type = /obj/item/stack/tile/carpetred +/singleton/flooring/carpet/black + name = "black carpet" + icon_base = "black" + build_type = /obj/item/stack/tile/carpetblack + /singleton/flooring/linoleum name = "linoleum" desc = "It's like the 2090's all over again." diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index d21344ac1480d..1a93980f24e01 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -134,6 +134,11 @@ icon_state = "red" initial_flooring = /singleton/flooring/carpet/red +/turf/simulated/floor/carpet/black + name = "black carpet" + icon_state = "black" + initial_flooring = /singleton/flooring/carpet/black + /turf/simulated/floor/reinforced name = "reinforced floor" icon = 'icons/turf/flooring/tiles.dmi' diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index cf325ea0caba3..50b613cc2e56a 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/flooring/carpet.dmi b/icons/turf/flooring/carpet.dmi index c7731d595933a..1b129a513b2a7 100644 Binary files a/icons/turf/flooring/carpet.dmi and b/icons/turf/flooring/carpet.dmi differ