cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 19:15:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation into tgui-input-conversions

Browse Source
This commit is contained in:
ItsSelis
2022-06-19 03:05:08 +02:00
parent 06c9b26252 b1c635ab35
commit 12611af1ee
22 changed files with 223 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
+8 -4
View File
@@ -20,14 +20,18 @@
name = "stack of teal carpet"
type_to_spawn = /obj/item/stack/tile/carpet/teal
/obj/fiftyspawner/decocarpet
name = "stack of deco carpet"
type_to_spawn = /obj/item/stack/tile/carpet/deco
/obj/fiftyspawner/geocarpet
name = "stack of geometric carpet"
type_to_spawn = /obj/item/stack/tile/carpet/geo
/obj/fiftyspawner/retrocarpet
name = "stack of retro carpet"
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
code/game/objects/items/stacks/tiles/tile_types.dm
+35 -4
View File
@@ -65,6 +65,26 @@
desc = "An easy to fit wooden floor tile. It's blue!"
icon_state = "tile-sifwood"
/obj/item/stack/tile/wood/alt
name = "wood floor tile"
singular_name = "wood floor tile"
icon_state = "tile-wood_tile"
/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."
@@ -73,6 +93,8 @@
stacktype = /obj/item/stack/tile/wood
build_type = /obj/item/stack/tile/wood
/*
* Carpets
*/
@@ -97,6 +119,19 @@
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"
/obj/item/stack/tile/carpet/blucarpet
@@ -111,10 +146,6 @@
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/oracarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/deco
icon_state = "tile-carpet-deco"
/obj/item/stack/tile/carpet/retro
icon_state = "tile-carpet-retro"
/obj/item/stack/tile/floor
name = "floor tile"