Skip to content

Commit

Permalink
New Carpets (#5721)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Adds a few new carpet varieties, taken from Nebula. Mostly for mapping,
right now.

Credit to Sabiram / Daniel Thompson (from git BLAME, not sure who
made/added these to bay/nebula)

## Why It's Good For The Game
More carpets.
  • Loading branch information
Mazianni authored Jul 19, 2023
1 parent 2831ea7 commit 8027ad1
Show file tree
Hide file tree
Showing 5 changed files with 155 additions and 0 deletions.
64 changes: 64 additions & 0 deletions code/game/objects/items/stacks/tiles/tile_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,42 +122,106 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \
singular_name = "black carpet"
desc = "A piece of black carpet. It is the same size as a normal floor tile!"
icon_state = "tile-bcarpet"

/obj/item/stack/tile/carpet/blucarpet
name = "blue carpet"
singular_name = "blue carpet"
desc = "A piece of blue carpet. It is the same size as a normal floor tile!"
icon_state = "tile-blucarpet"

/obj/item/stack/tile/carpet/turcarpet
name = "tur carpet"
singular_name = "tur carpet"
desc = "A piece of turquoise carpet. It is the same size as a normal floor tile!"
icon_state = "tile-turcarpet"

/obj/item/stack/tile/carpet/sblucarpet
name = "silver-blue carpet"
singular_name = "silver-blue carpet"
desc = "A piece of silver-blue carpet. It is the same size as a normal floor tile!"
icon_state = "tile-sblucarpet"

/obj/item/stack/tile/carpet/gaycarpet
name = "funny carpet"
singular_name = "funny carpet"
desc = "A piece of funny carpet. Perfect for clowning around on."
icon_state = "tile-gaycarpet"

/obj/item/stack/tile/carpet/purcarpet
name = "purple carpet"
singular_name = "purple carpet"
desc = "A piece of purple carpet. It is the same size as a normal floor tile!"
icon_state = "tile-purcarpet"

/obj/item/stack/tile/carpet/oracarpet
name = "orange carpet"
singular_name = "orange carpet"
desc = "A piece of orange carpet. It is the same size as a normal floor tile!"
icon_state = "tile-oracarpet"

/obj/item/stack/tile/carpet/arcadecarpet
name = "arcadey carpet"
singular_name = "arcadey carpet"
desc = "A piece of arcadey carpet. It is the same size as a normal floor tile!"
icon_state = "tile-carpet-arcade"

/obj/item/stack/tile/carpet/patterned
no_variants = TRUE

/obj/item/stack/tile/carpet/patterned/brown
name = "brown patterned carpet"
singular_name = "brown patterned carpet"
desc = "A piece of brown carpet with a fetching light brown pattern. It is the same size as a normal floor tile!"
icon_state = "tile-carpetbrown"

/obj/item/stack/tile/carpet/patterned/green
name = "green patterned carpet"
singular_name = "green patterned carpet"
desc = "A piece of green carpet with a fetching light green pattern. It is the same size as a normal floor tile!"
icon_state = "tile-carpetgreen"

/obj/item/stack/tile/carpet/patterned/red
name = "red patterned carpet"
singular_name = "red patterned carpet"
desc = "A piece of red carpet with a fetching gold pattern. It is the same size as a normal floor tile!"
icon_state = "tile-carpetred"

/obj/item/stack/tile/carpet/patterned/blue
name = "blue patterned carpet"
singular_name = "blue patterned carpet"
desc = "A piece of brown carpet with a fetching gold pattern. It is the same size as a normal floor tile!"
icon_state = "tile-carpetblue"

/obj/item/stack/tile/carpet/patterned/blue/alt
name = "blue patterned carpet"
singular_name = "blue patterned carpet"
desc = "A piece of blue carpet with a fetching white pattern. It is the same size as a normal floor tile!"
icon_state = "tile-carpetblue2"

/obj/item/stack/tile/carpet/patterned/blue/alt2
name = "blue patterned carpet"
singular_name = "blue patterned carpet"
desc = "A piece of blue carpet with a fetching seafoam green pattern. It is the same size as a normal floor tile!"
icon_state = "tile-carpetblue3"

/obj/item/stack/tile/carpet/patterned/magenta
name = "magenta patterned carpet"
singular_name = "magenta patterned carpet"
desc = "A piece of magenta carpet with a fetching gold pattern. It is the same size as a normal floor tile!"
icon_state = "tile-carpetmagenta"

/obj/item/stack/tile/carpet/patterned/purple
name = "purple patterned carpet"
singular_name = "purple patterned carpet"
desc = "A piece of purple carpet with a fetching gold pattern. It is the same size as a normal floor tile!"
icon_state = "tile-carpetpurple"

/obj/item/stack/tile/carpet/patterned/orange
name = "orange patterned carpet"
singular_name = "orange patterned carpet"
desc = "A piece of orange carpet with a fetching gold pattern. It is the same size as a normal floor tile!"
icon_state = "tile-carpetorange"

/obj/item/stack/tile/floor
name = "floor tile"
singular_name = "floor tile"
Expand Down
46 changes: 46 additions & 0 deletions code/game/turfs/simulated/flooring/_flooring.dm
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,52 @@ var/list/flooring_types
icon_base = "arcade"
build_type = /obj/item/stack/tile/carpet/arcadecarpet

/singleton/flooring/carpet/patterened/brown
name = "brown patterened carpet"
icon_base = "brown"
build_type = /obj/item/stack/tile/carpet/patterned/brown

/singleton/flooring/carpet/patterened/red
name = "red patterened carpet"
icon_base = "red"
build_type = /obj/item/stack/tile/carpet/patterned/red

/singleton/flooring/carpet/patterened/blue
name = "blue patterened carpet"
icon_base = "blue1"
build_type = /obj/item/stack/tile/carpet/patterned/blue

/singleton/flooring/carpet/patterened/blue/alt
name = "blue patterened carpet"
icon_base = "blue2"
build_type = /obj/item/stack/tile/carpet/patterned/blue/alt

/singleton/flooring/carpet/patterened/blue/alt2
name = "blue patterened carpet"
icon_base = "blue3"
build_type = /obj/item/stack/tile/carpet/patterned/blue/alt2

/singleton/flooring/carpet/patterened/green
name = "green patterened carpet"
icon_base = "green"
build_type = /obj/item/stack/tile/carpet/patterned/green

/singleton/flooring/carpet/patterened/magenta
name = "magenta patterened carpet"
icon_base = "magenta"
build_type = /obj/item/stack/tile/carpet/patterned/magenta

/singleton/flooring/carpet/patterened/purple
name = "purple patterened carpet"
icon_base = "purple"
build_type = /obj/item/stack/tile/carpet/patterned/purple

/singleton/flooring/carpet/patterened/orange
name = "orange patterened carpet"
icon_base = "orange"
build_type = /obj/item/stack/tile/carpet/patterned/orange


/singleton/flooring/tiling
name = "floor"
desc = "Scuffed from the passage of countless greyshirts."
Expand Down
45 changes: 45 additions & 0 deletions code/game/turfs/simulated/flooring/flooring_premade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,51 @@
icon_state = "arcade"
initial_flooring = /singleton/flooring/carpet/arcadecarpet

/turf/simulated/floor/carpet/patterened/brown
name = "brown patterend carpet"
icon_state = "brown"
initial_flooring = /singleton/flooring/carpet/patterened/brown

/turf/simulated/floor/carpet/patterened/blue
name = "blue patterend carpet"
icon_state = "blue1"
initial_flooring = /singleton/flooring/carpet/patterened/blue

/turf/simulated/floor/carpet/patterened/blue/alt
name = "blue patterend carpet"
icon_state = "blue2"
initial_flooring = /singleton/flooring/carpet/patterened/blue/alt

/turf/simulated/floor/carpet/patterened/blue/alt2
name = "blue patterend carpet"
icon_state = "blue3"
initial_flooring = /singleton/flooring/carpet/patterened/blue/alt2

/turf/simulated/floor/carpet/patterened/red
name = "red patterend carpet"
icon_state = "red"
initial_flooring = /singleton/flooring/carpet/patterened/red

/turf/simulated/floor/carpet/patterened/green
name = "green patterend carpet"
icon_state = "green"
initial_flooring = /singleton/flooring/carpet/patterened/green

/turf/simulated/floor/carpet/patterened/magneta
name = "magenta patterend carpet"
icon_state = "magenta"
initial_flooring = /singleton/flooring/carpet/patterened/magenta

/turf/simulated/floor/carpet/patterened/purple
name = "purple patterend carpet"
icon_state = "purple"
initial_flooring = /singleton/flooring/carpet/patterened/purple

/turf/simulated/floor/carpet/patterened/orange
name = "orange patterend carpet"
icon_state = "orange"
initial_flooring = /singleton/flooring/carpet/patterened/orange

/turf/simulated/floor/bluegrid
name = "mainframe floor"
icon = 'icons/turf/flooring/circuit.dmi'
Expand Down
Binary file modified icons/obj/stacks.dmi
Binary file not shown.
Binary file modified icons/turf/flooring/carpet.dmi
Binary file not shown.

0 comments on commit 8027ad1

Please sign in to comment.