diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index d2cb3baa6a..bb053dfbf9 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -36,7 +36,7 @@ icon/MaxColors(icon) The icon is blended with a second icon where the maximum of each RGB pixel is the result. Opacity may increase, as if the icons were blended with ICON_OR. You may supply a color in place of an icon. icon/Opaque(background = "#000000") - All alpha values are set to 255 throughout the icon. Transparent pixels become black, or whatever background color you specify. + All alpha values are set to 255 throughout the icon. Transparen pixels become black, or whatever background color you specify. icon/BecomeAlphaMask() You can convert a simple grayscale icon into an alpha mask to use with other icons very easily with this proc. The black parts become transparent, the white parts stay white, and anything in between becomes a translucent shade of white. 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 bb5e474f82..ef4f215db0 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1439,6 +1439,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