diff --git a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm index 0ac18b8ae1..f9634d7608 100644 --- a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm +++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm @@ -36,6 +36,22 @@ name = "stack of happy carpet" type_to_spawn = /obj/item/stack/tile/carpet/happy +/obj/fiftyspawner/brncarpet + name = "stack of brown carpet" + type_to_spawn = /obj/item/stack/tile/carpet/brncarpet + +/obj/fiftyspawner/brncarpet + name = "stack of blue carpet" + type_to_spawn = /obj/item/stack/tile/carpet/blucarpet2 + +/obj/fiftyspawner/brncarpet + name = "stack of green carpet" + type_to_spawn = /obj/item/stack/tile/carpet/greencarpet + +/obj/fiftyspawner/brncarpet + name = "stack of purple carpet" + type_to_spawn = /obj/item/stack/tile/carpet/purplecarpet + /obj/fiftyspawner/floor name = "stack of floor tiles" type_to_spawn = /obj/item/stack/tile/floor diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 07add4d7f1..202e8ce156 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -150,6 +150,14 @@ icon_state = "tile-carpet" /obj/item/stack/tile/carpet/oracarpet icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/brncarpet + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/blucarpet2 + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/greencarpet + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/purplecarpet + icon_state = "tile-carpet" /obj/item/stack/tile/floor name = "floor tile" diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index f9b89f0a56..9c707d4a1f 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -320,6 +320,26 @@ var/list/flooring_types icon_base = "tealcarpet" build_type = /obj/item/stack/tile/carpet/teal +/decl/flooring/carpet/browncarpet + name = "brown carpet" + icon_base = "brncarpet" + build_type = /obj/item/stack/tile/carpet/brncarpet + +/decl/flooring/carpet/blucarpet2 + name = "blue carpet" + icon_base = "blue1" + build_type = /obj/item/stack/tile/carpet/blucarpet2 + +/decl/flooring/carpet/greencarpet + name = "green carpet" + icon_base = "green" + build_type = /obj/item/stack/tile/carpet/greencarpet + +/decl/flooring/carpet/purplecarpet + name = "purple carpet" + icon_base = "purple" + build_type = /obj/item/stack/tile/carpet/purplecarpet + /decl/flooring/carpet/geo name = "geometric carpet" icon_base = "geocarpet" diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index 969ffea17c..bb3ad500af 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -60,6 +60,26 @@ icon_state = "oracarpet" initial_flooring = /decl/flooring/carpet/oracarpet +/turf/simulated/floor/carpet/brown + name = "brown carpet" + icon_state = "brncarpet" + initial_flooring = /decl/flooring/carpet/browncarpet + +/turf/simulated/floor/carpet/blue2 + name = "blue carpet" + icon_state = "blue1" + initial_flooring = /decl/flooring/carpet/blucarpet2 + +/turf/simulated/floor/carpet/green + name = "green carpet" + icon_state = "green" + initial_flooring = /decl/flooring/carpet/greencarpet + +/turf/simulated/floor/carpet/purple + name = "purple carpet" + icon_state = "purple" + initial_flooring = /decl/flooring/carpet/purplecarpet + /turf/simulated/floor/carpet/geo name = "geometric carpet" icon_state = "geocarpet" diff --git a/icons/turf/flooring/carpet.dmi b/icons/turf/flooring/carpet.dmi index f7dcf3c046..9e3472fcbf 100644 Binary files a/icons/turf/flooring/carpet.dmi and b/icons/turf/flooring/carpet.dmi differ