diff --git a/code/datums/supplypacks/materials.dm b/code/datums/supplypacks/materials.dm index 87780766d96..3cc385eac18 100644 --- a/code/datums/supplypacks/materials.dm +++ b/code/datums/supplypacks/materials.dm @@ -59,6 +59,15 @@ /obj/fiftyspawner/tealcarpet ) +/datum/supply_pack/materials/arcade_carpet + name = "Retro carpets" + containertype = /obj/structure/closet/crate/grayson + containername = "Retro carpets crate" + cost = 15 + contains = list( + /obj/fiftyspawner/decocarpet, + /obj/fiftyspawner/retrocarpet + ) /datum/supply_pack/misc/linoleum name = "Linoleum" 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 e9d5f6a2a51..a730263afa1 100644 --- a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm +++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm @@ -28,6 +28,14 @@ name = "stack of teal carpet" type_to_spawn = /obj/item/stack/tile/carpet/teal +/obj/fiftyspawner/decocarpet + name = "stack of deco carpet" + type_to_spawn = /obj/item/stack/tile/carpet/deco + +/obj/fiftyspawner/retrocarpet + name = "stack of retro carpet" + type_to_spawn = /obj/item/stack/tile/carpet/retro + /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 62e6ec2774a..3c17fb0acf8 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -121,6 +121,10 @@ icon_state = "tile-carpet" /obj/item/stack/tile/carpet/oracarpet icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/deco + icon_state = "tile-carpet-deco" +/obj/item/stack/tile/carpet/retro + icon_state = "tile-carpet-retro" /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 e1900bfe97d..df2e885026c 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -321,6 +321,18 @@ var/list/flooring_types icon_base = "tealcarpet" build_type = /obj/item/stack/tile/carpet/teal +/decl/flooring/carpet/deco + name = "deco carpet" + icon_base = "decocarpet" + build_type = /obj/item/stack/tile/carpet/deco + flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN + +/decl/flooring/carpet/retro + name = "retro carpet" + icon_base = "retrocarpet" + build_type = /obj/item/stack/tile/carpet/retro + flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN + /decl/flooring/tiling name = "floor" desc = "Scuffed from the passage of countless greyshirts." diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index 9cad0bd727b..1e0b5c1a6aa 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -19,6 +19,16 @@ icon_state = "tealcarpet" initial_flooring = /decl/flooring/carpet/tealcarpet +/turf/simulated/floor/carpet/deco + name = "deco carpet" + icon_state = "decocarpet" + initial_flooring = /decl/flooring/carpet/deco + +/turf/simulated/floor/carpet/retro + name = "retro carpet" + icon_state = "retrocarpet" + initial_flooring = /decl/flooring/carpet/retro + // Legacy support for existing paths for blue carpet /turf/simulated/floor/carpet/blue name = "blue carpet" diff --git a/icons/obj/stacks.dmi b/icons/obj/stacks.dmi index 430314b223f..e3b58e3bd13 100644 Binary files a/icons/obj/stacks.dmi and b/icons/obj/stacks.dmi differ diff --git a/icons/turf/flooring/carpet.dmi b/icons/turf/flooring/carpet.dmi index 395cc709019..f668ae8943c 100644 Binary files a/icons/turf/flooring/carpet.dmi and b/icons/turf/flooring/carpet.dmi differ