Skip to content

Commit

Permalink
[MIRROR] Add Black Carpet
Browse files Browse the repository at this point in the history
  • Loading branch information
SegaCD authored and LordNest committed Feb 21, 2024
1 parent 4428016 commit a721f0a
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 0 deletions.
6 changes: 6 additions & 0 deletions code/datums/supplypacks/flooring.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 10 additions & 0 deletions code/game/objects/items/stacks/tiles/tile_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
5 changes: 5 additions & 0 deletions code/game/turfs/flooring/flooring.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
5 changes: 5 additions & 0 deletions code/game/turfs/flooring/flooring_premade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Binary file modified icons/obj/tiles.dmi
Binary file not shown.
Binary file modified icons/turf/flooring/carpet.dmi
Binary file not shown.

0 comments on commit a721f0a

Please sign in to comment.