diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 907b26c75c..5858c1debe 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -111,6 +111,14 @@ /obj/item/stack/tile/carpet/black/fifty amount = 50 +/obj/item/stack/tile/carpet/red + name = "red carpet" + icon_state = "tile-carpet-red" + turf_type = /turf/open/floor/carpet/red + +/obj/item/stack/tile/carpet/red/fifty + amount = 50 + /obj/item/stack/tile/fakespace name = "astral carpet" singular_name = "astral carpet" diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 195245d967..034fd0e606 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -182,6 +182,11 @@ floor_tile = /obj/item/stack/tile/carpet/black canSmoothWith = list(/turf/open/floor/carpet/black) +/turf/open/floor/carpet/red + icon = 'icons/turf/floors/carpet_red.dmi' + floor_tile = /obj/item/stack/tile/carpet/red + icon_state ="tile-carpet-red" + canSmoothWith = list(/turf/open/floor/carpet/red) /turf/open/floor/carpet/narsie_act(force, ignore_mobs, probability = 20) . = (prob(probability) || force) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 6ad00a47ea..54413bbfb5 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1448,6 +1448,8 @@ cost = 1000 contains = list(/obj/item/stack/tile/carpet/fifty, /obj/item/stack/tile/carpet/fifty, + /obj/item/stack/tile/carpet/red/fifty, + /obj/item/stack/tile/carpet/red/fifty, /obj/item/stack/tile/carpet/black/fifty, /obj/item/stack/tile/carpet/black/fifty) crate_name = "premium carpet crate" diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 8b439d2bad..99f976a873 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/floors/carpet_red.dmi b/icons/turf/floors/carpet_red.dmi new file mode 100644 index 0000000000..e75ce04381 Binary files /dev/null and b/icons/turf/floors/carpet_red.dmi differ