cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-15 12:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8556 from Cerebulon/arcadecarpets

Browse Source 
Adds Some More Decorative Flooring Types
This commit is contained in:
Sypsoti
2022-04-19 11:12:31 -05:00
committed by GitHub
parent 61084723c7 8e488776e8
commit f7cc15b098
8 changed files with 115 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/datums/supplypacks/materials.dm
View File

@@ -59,8 +59,18 @@
/obj/fiftyspawner/tealcarpet
)
/datum/supply_pack/materials/retrocarpet
name = "Retro carpet"
containertype = /obj/structure/closet/crate/grayson
containername = "Retro carpet crate"
cost = 15
contains = list(
/obj/fiftyspawner/geocarpet,
/obj/fiftyspawner/retrocarpet,
/obj/fiftyspawner/retrocarpet_red
)
/datum/supply_pack/misc/linoleum
/datum/supply_pack/materials/linoleum
name = "Linoleum"
containertype = /obj/structure/closet/crate/grayson
containername = "Linoleum crate"

12
code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
View File

@@ -28,6 +28,18 @@
name = "stack of teal carpet"
type_to_spawn = /obj/item/stack/tile/carpet/teal
/obj/fiftyspawner/geocarpet
name = "stack of geometric carpet"
type_to_spawn = /obj/item/stack/tile/carpet/geo
/obj/fiftyspawner/retrocarpet
name = "stack of blue retro carpet"
type_to_spawn = /obj/item/stack/tile/carpet/retro
/obj/fiftyspawner/retrocarpet_red
name = "stack of red retro carpet"
type_to_spawn = /obj/item/stack/tile/carpet/retro_red
/obj/fiftyspawner/floor
name = "stack of floor tiles"
type_to_spawn = /obj/item/stack/tile/floor

29
code/game/objects/items/stacks/tiles/tile_types.dm
View File

@@ -75,6 +75,21 @@
desc = "An easy to fit wooden floor tile. It's blue!"
icon_state = "tile-sifwood"
/obj/item/stack/tile/wood/parquet
name = "parquet wood floor tile"
singular_name = "parquet wood floor tile"
icon_state = "tile-wood_parquet"
/obj/item/stack/tile/wood/panel
name = "large wood floor tile"
singular_name = "large wood floor tile"
icon_state = "tile-wood_large"
/obj/item/stack/tile/wood/tile
name = "tiled wood floor tile"
singular_name = "tiled wood floor tile"
icon_state = "tile-wood_tile"
/obj/item/stack/tile/wood/cyborg
name = "wood floor tile synthesizer"
desc = "A device that makes wood floor tiles."
@@ -83,6 +98,8 @@
stacktype = /obj/item/stack/tile/wood
build_type = /obj/item/stack/tile/wood
/*
* Carpets
*/
@@ -107,6 +124,18 @@
icon_state = "tile-tealcarpet"
no_variants = FALSE
/obj/item/stack/tile/carpet/geo
icon_state = "tile-carpet-deco"
desc = "A piece of carpet with a gnarly geometric design. It is the same size as a normal floor tile!"
/obj/item/stack/tile/carpet/retro
icon_state = "tile-carpet-retro"
desc = "A piece of carpet with totally wicked blue space patterns. It is the same size as a normal floor tile!"
/obj/item/stack/tile/carpet/retro_red
icon_state = "tile-carpet-retro-red"
desc = "A piece of carpet with red-ical space patterns. It is the same size as a normal floor tile!"
// TODO - Add descriptions to these
/obj/item/stack/tile/carpet/bcarpet
icon_state = "tile-carpet"

36
code/game/turfs/flooring/flooring.dm
View File

@@ -321,6 +321,24 @@ var/list/flooring_types
icon_base = "tealcarpet"
build_type = /obj/item/stack/tile/carpet/teal
/decl/flooring/carpet/geo
name = "geometric carpet"
icon_base = "geocarpet"
build_type = /obj/item/stack/tile/carpet/geo
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
/decl/flooring/carpet/retro
name = "blue retro carpet"
icon_base = "retrocarpet"
build_type = /obj/item/stack/tile/carpet/retro
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
/decl/flooring/carpet/retro_red
name = "red retro carpet"
icon_base = "retrocarpet_red"
build_type = /obj/item/stack/tile/carpet/retro_red
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
/decl/flooring/tiling
name = "floor"
desc = "Scuffed from the passage of countless greyshirts."
@@ -484,6 +502,24 @@ var/list/flooring_types
icon_base = "sifwood"
build_type = /obj/item/stack/tile/wood/sif
/decl/flooring/wood/panel
desc = "Polished wooden panels."
icon_base = "wood_large"
build_type = /obj/item/stack/tile/wood/panel
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
/decl/flooring/wood/parquet
desc = "Polished wooden tiles."
icon_base = "wood_parquet"
build_type = /obj/item/stack/tile/wood/parquet
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
/decl/flooring/wood/tile
desc = "Polished wooden tiles."
icon_base = "wood_tile"
build_type = /obj/item/stack/tile/wood/tile
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN
/decl/flooring/reinforced
name = "reinforced floor"
desc = "Heavily reinforced with steel rods."

28
code/game/turfs/flooring/flooring_premade.dm
View File

@@ -50,6 +50,21 @@
icon_state = "oracarpet"
initial_flooring = /decl/flooring/carpet/oracarpet
/turf/simulated/floor/carpet/geo
name = "geometric carpet"
icon_state = "geocarpet"
initial_flooring = /decl/flooring/carpet/geo
/turf/simulated/floor/carpet/retro
name = "blue retro carpet"
icon_state = "retrocarpet"
initial_flooring = /decl/flooring/carpet/retro
/turf/simulated/floor/carpet/retro_red
name = "red retro carpet"
icon_state = "retrocarpet_red"
initial_flooring = /decl/flooring/carpet/retro_red
/turf/simulated/floor/bluegrid
name = "mainframe floor"
icon = 'icons/turf/flooring/circuit.dmi'
@@ -77,7 +92,6 @@
/turf/simulated/floor/wood/sif
name = "alien wooden floor"
icon = 'icons/turf/flooring/wood.dmi'
icon_state = "sifwood"
initial_flooring = /decl/flooring/wood/sif
@@ -88,6 +102,18 @@
break_tile()
return ..()
/turf/simulated/floor/wood/tile
icon_state = "wood_tile"
initial_flooring = /decl/flooring/wood/tile
/turf/simulated/floor/wood/panel
icon_state = "wood_panel"
initial_flooring = /decl/flooring/wood/panel
/turf/simulated/floor/wood/parquet
icon_state = "wood_parquet"
initial_flooring = /decl/flooring/wood/parquet
/turf/simulated/floor/grass
name = "grass patch"
icon = 'icons/turf/flooring/grass.dmi'