diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index ace334c5ba..8bc856ccf5 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -329,6 +329,136 @@ - plating - floor_laundry +# Carpets +- type: entity + name: blue arcade floor + parent: FloorTileItemBase + id: FloorTileItemArcadeBlue + components: + - type: Sprite + state: arcadeblue + - type: Item + HeldPrefix: arcadeblue + - type: FloorTile + outputs: + - plating + - FloorArcadeBlue + - type: Stack + stackType: FloorTileStackArcadeBlue + +- type: entity + name: red arcade floor + parent: FloorTileItemBase + id: FloorTileItemArcadeRed + components: + - type: Sprite + state: arcadered + - type: Item + HeldPrefix: arcadered + - type: FloorTile + outputs: + - plating + - FloorArcadeRed + - type: Stack + stackType: FloorTileStackArcadeRed + +- type: entity + name: eighties floor + parent: FloorTileItemBase + id: FloorTileItemEighties + components: + - type: Sprite + state: eighties + - type: Item + HeldPrefix: eighties + - type: FloorTile + outputs: + - plating + - FloorEighties + - type: Stack + stackType: FloorTileStackEighties + +# Shuttles +- type: entity + name: white shuttle floor + parent: FloorTileItemBase + id: FloorTileItemShuttleWhite + components: + - type: Sprite + state: shuttlewhite + - type: Item + HeldPrefix: shuttlewhite + - type: FloorTile + outputs: + - plating + - FloorShuttleWhite + - type: Stack + stackType: FloorTileStackShuttleWhite + +- type: entity + name: blue shuttle floor + parent: FloorTileItemBase + id: FloorTileItemShuttleBlue + components: + - type: Sprite + state: shuttleblue + - type: Item + HeldPrefix: shuttleblue + - type: FloorTile + outputs: + - plating + - FloorShuttleBlue + - type: Stack + stackType: FloorTileStackShuttleBlue + +- type: entity + name: orange shuttle floor + parent: FloorTileItemBase + id: FloorTileItemShuttleOrange + components: + - type: Sprite + state: shuttleorange + - type: Item + HeldPrefix: shuttleorange + - type: FloorTile + outputs: + - plating + - FloorShuttleOrange + - type: Stack + stackType: FloorTileStackShuttleOrange + +- type: entity + name: purple shuttle floor + parent: FloorTileItemBase + id: FloorTileItemShuttlePurple + components: + - type: Sprite + state: shuttlepurple + - type: Item + HeldPrefix: shuttlepurple + - type: FloorTile + outputs: + - plating + - FloorShuttlePurple + - type: Stack + stackType: FloorTileStackShuttlePurple + +- type: entity + name: red shuttle floor + parent: FloorTileItemBase + id: FloorTileItemShuttleRed + components: + - type: Sprite + state: shuttlered + - type: Item + HeldPrefix: shuttlered + - type: FloorTile + outputs: + - plating + - FloorShuttleRed + - type: Stack + stackType: FloorTileStackShuttleRed + # Materials - type: entity name: gold floor @@ -403,6 +533,20 @@ outputs: - plating - floor_grass + +- type: entity + name: jungle grass tile + parent: FloorTileItemBase + id: FloorTileItemGrassJungle + components: + - type: Sprite + state: grassjungle + - type: Item + HeldPrefix: grassjungle + - type: FloorTile + outputs: + - plating + - FloorGrassJungle - type: entity name: snow tile diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index ff5e68a980..53ba8a4529 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -67,3 +67,43 @@ id: FloorTileDirty name: dirty tile spawn: FloorTileItemDirty + +- type: stack + id: FloorTileStackShuttleWhite + name: white shuttle tile + spawn: FloorTileItemShuttleWhite + +- type: stack + id: FloorTileStackShuttleBlue + name: blue shuttle tile + spawn: FloorTileItemShuttleBlue + +- type: stack + id: FloorTileStackShuttleOrange + name: orange shuttle tile + spawn: FloorTileItemShuttleOrange + +- type: stack + id: FloorTileStackShuttlePurple + name: purple shuttle tile + spawn: FloorTileItemShuttlePurple + +- type: stack + id: FloorTileStackShuttleRed + name: red shuttle tile + spawn: FloorTileItemShuttleRed + +- type: stack + id: FloorTileStackEighties + name: eighties floor tile + spawn: FloorTileItemEighties + +- type: stack + id: FloorTileStackArcadeBlue + name: blue arcade tile + spawn: FloorTileItemArcadeBlue + +- type: stack + id: FloorTileStackArcadeRed + name: red arcade tile + spawn: FloorTileItemArcadeRed \ No newline at end of file diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 18e94d23a2..0a4c777a64 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -298,6 +298,129 @@ item_drop: FloorTileItemLaundry thermalConductivity: 0.04 heatCapacity: 10000 + +# Carpets (non smoothing) +- type: tile + id: FloorArcadeBlue + name: blue arcade floor + texture: arcadeblue + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemArcadeBlue + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorArcadeRed + name: red arcade floor + texture: arcadered + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemArcadeRed + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorEighties + name: eighties floor + texture: eighties + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemEighties + thermalConductivity: 0.04 + heatCapacity: 10000 + +# Shuttle +- type: tile + id: FloorShuttleWhite + name: white shuttle floor + texture: shuttlewhite + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemShuttleWhite + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorShuttleBlue + name: blue shuttle floor + texture: shuttleblue + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemShuttleBlue + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorShuttleOrange + name: orange shuttle floor + texture: shuttleorange + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemShuttleOrange + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorShuttlePurple + name: purple shuttle floor + texture: shuttlepurple + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemShuttlePurple + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorShuttleRed + name: red shuttle floor + texture: shuttlered + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemShuttleRed + thermalConductivity: 0.04 + heatCapacity: 10000 + # Materials - type: tile @@ -421,6 +544,21 @@ item_drop: FloorTileItemGrass thermalConductivity: 0.04 heatCapacity: 10000 + +- type: tile + id: FloorGrassJungle + name: jungle grass floor + texture: grassjungle + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemGrassJungle + thermalConductivity: 0.04 + heatCapacity: 10000 # Asteroid - type: tile @@ -506,3 +644,60 @@ friction: 0.30 thermalConductivity: 0.04 heatCapacity: 10000 + +- type: tile + id: FloorAsteroidIronsand1 + name: asteroid ironsand + texture: ironsand1 + base_turfs: + - space + is_subfloor: false + can_crowbar: false + footstep_sounds: + collection: footstep_asteroid + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorAsteroidIronsand2 + name: asteroid ironsand pebbles + texture: ironsand2 + base_turfs: + - space + is_subfloor: false + can_crowbar: false + footstep_sounds: + collection: footstep_asteroid + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorAsteroidIronsand3 + name: asteroid ironsand pebbles 2 + texture: ironsand3 + base_turfs: + - space + is_subfloor: false + can_crowbar: false + footstep_sounds: + collection: footstep_asteroid + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorAsteroidIronsand4 + name: asteroid ironsand rock + texture: ironsand4 + base_turfs: + - space + is_subfloor: false + can_crowbar: false + footstep_sounds: + collection: footstep_asteroid + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue.png b/Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue.png new file mode 100644 index 0000000000..b45699698b Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/arcadered.png b/Resources/Textures/Objects/Tiles/tile.rsi/arcadered.png new file mode 100644 index 0000000000..22ee34b073 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/arcadered.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/eighties.png b/Resources/Textures/Objects/Tiles/tile.rsi/eighties.png new file mode 100644 index 0000000000..b6bf9597d2 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/eighties.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png new file mode 100644 index 0000000000..8f3407369b Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index f3d4330013..45e8ab4d88 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional copyrights see tiles folder.", "size": { "x": 32, "y": 32 @@ -28,6 +28,9 @@ { "name": "grass" }, + { + "name": "grassjungle" + }, { "name": "kitchen" }, @@ -103,6 +106,30 @@ { "name": "wood" }, + { + "name": "arcadeblue" + }, + { + "name": "arcadered" + }, + { + "name": "eighties" + }, + { + "name": "shuttlewhite" + }, + { + "name": "shuttleblue" + }, + { + "name": "shuttleorange" + }, + { + "name": "shuttlepurple" + }, + { + "name": "shuttlered" + }, { "name": "bcircuit-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png new file mode 100644 index 0000000000..8fc34f3912 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png new file mode 100644 index 0000000000..517da85336 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png new file mode 100644 index 0000000000..c9459da1e8 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png new file mode 100644 index 0000000000..e4f073d6dc Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png new file mode 100644 index 0000000000..fcc482b34b Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png differ diff --git a/Resources/Textures/Tiles/arcadeblue.png b/Resources/Textures/Tiles/arcadeblue.png new file mode 100644 index 0000000000..760ab5e650 Binary files /dev/null and b/Resources/Textures/Tiles/arcadeblue.png differ diff --git a/Resources/Textures/Tiles/arcadered.png b/Resources/Textures/Tiles/arcadered.png new file mode 100644 index 0000000000..9efe7e680b Binary files /dev/null and b/Resources/Textures/Tiles/arcadered.png differ diff --git a/Resources/Textures/Tiles/copyright.txt b/Resources/Textures/Tiles/copyright.txt index 6cf1c4fc0c..7e9c6643c2 100644 --- a/Resources/Textures/Tiles/copyright.txt +++ b/Resources/Textures/Tiles/copyright.txt @@ -6,3 +6,9 @@ bar.png, laundry.png, mime.png, clown.png and kitchen.png are under CC-BY-SA-3.0 snow.png taken from TG at commit 67a5373b4649937dd63dd94153e05e8506f40a5d grass.png taken from TG at commit 73a638214c94da9b8c485f1c75f615cb79770883 reinforced.png taken from /tg/ at commit https://github.com/tgstation/tgstation/commit/4e2a36fe7e56fad93495adf01c697f4b5de04e90, licensed under CC-BY-SA-3.0 + + + +ironsand1-4, junglegrass, eightiesred and eighties taken from TG station at https://github.com/tgstation/tgstation/commit/8abb19545828230d92ba18827feeb42a67a55d49 +arcadeblue edited by Peptide90 based on eightiestred from TG. +shuttleblue, orange, purple, red and white taken from ParadiseSS13 at https://github.com/ParadiseSS13/Paradise/commit/69c831afcd9aef25a2889b507e4f36a3a5fc6def \ No newline at end of file diff --git a/Resources/Textures/Tiles/eighties.png b/Resources/Textures/Tiles/eighties.png new file mode 100644 index 0000000000..89c2338595 Binary files /dev/null and b/Resources/Textures/Tiles/eighties.png differ diff --git a/Resources/Textures/Tiles/grassjungle.png b/Resources/Textures/Tiles/grassjungle.png new file mode 100644 index 0000000000..31e75cd674 Binary files /dev/null and b/Resources/Textures/Tiles/grassjungle.png differ diff --git a/Resources/Textures/Tiles/ironsand1.png b/Resources/Textures/Tiles/ironsand1.png new file mode 100644 index 0000000000..a161c64028 Binary files /dev/null and b/Resources/Textures/Tiles/ironsand1.png differ diff --git a/Resources/Textures/Tiles/ironsand2.png b/Resources/Textures/Tiles/ironsand2.png new file mode 100644 index 0000000000..bf0631ed13 Binary files /dev/null and b/Resources/Textures/Tiles/ironsand2.png differ diff --git a/Resources/Textures/Tiles/ironsand3.png b/Resources/Textures/Tiles/ironsand3.png new file mode 100644 index 0000000000..f00107a225 Binary files /dev/null and b/Resources/Textures/Tiles/ironsand3.png differ diff --git a/Resources/Textures/Tiles/ironsand4.png b/Resources/Textures/Tiles/ironsand4.png new file mode 100644 index 0000000000..ec4f169aca Binary files /dev/null and b/Resources/Textures/Tiles/ironsand4.png differ diff --git a/Resources/Textures/Tiles/shuttleblue.png b/Resources/Textures/Tiles/shuttleblue.png new file mode 100644 index 0000000000..da848dec98 Binary files /dev/null and b/Resources/Textures/Tiles/shuttleblue.png differ diff --git a/Resources/Textures/Tiles/shuttleorange.png b/Resources/Textures/Tiles/shuttleorange.png new file mode 100644 index 0000000000..46f562b506 Binary files /dev/null and b/Resources/Textures/Tiles/shuttleorange.png differ diff --git a/Resources/Textures/Tiles/shuttlepurple.png b/Resources/Textures/Tiles/shuttlepurple.png new file mode 100644 index 0000000000..3e05a9676d Binary files /dev/null and b/Resources/Textures/Tiles/shuttlepurple.png differ diff --git a/Resources/Textures/Tiles/shuttlered.png b/Resources/Textures/Tiles/shuttlered.png new file mode 100644 index 0000000000..49b6665dd2 Binary files /dev/null and b/Resources/Textures/Tiles/shuttlered.png differ diff --git a/Resources/Textures/Tiles/shuttlewhite.png b/Resources/Textures/Tiles/shuttlewhite.png new file mode 100644 index 0000000000..1e2dd5d0d5 Binary files /dev/null and b/Resources/Textures/Tiles/shuttlewhite.png differ