diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs index 9ceb2f69b7..821d0355ee 100644 --- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs @@ -123,6 +123,10 @@ namespace Content.Shared.GameObjects.Components Cable, Ointment, Brutepack, - FloorTileSteel + FloorTileSteel, + FloorTileCarpet, + FloorTileWhite, + FloorTileDark, + FloorTileWood } } diff --git a/Resources/Audio/effects/footsteps/wood1.ogg b/Resources/Audio/effects/footsteps/wood1.ogg new file mode 100644 index 0000000000..c76fc423fc Binary files /dev/null and b/Resources/Audio/effects/footsteps/wood1.ogg differ diff --git a/Resources/Audio/effects/footsteps/wood2.ogg b/Resources/Audio/effects/footsteps/wood2.ogg new file mode 100644 index 0000000000..71dc1aa967 Binary files /dev/null and b/Resources/Audio/effects/footsteps/wood2.ogg differ diff --git a/Resources/Audio/effects/footsteps/wood3.ogg b/Resources/Audio/effects/footsteps/wood3.ogg new file mode 100644 index 0000000000..bf86889006 Binary files /dev/null and b/Resources/Audio/effects/footsteps/wood3.ogg differ diff --git a/Resources/Audio/effects/footsteps/wood4.ogg b/Resources/Audio/effects/footsteps/wood4.ogg new file mode 100644 index 0000000000..44734425ce Binary files /dev/null and b/Resources/Audio/effects/footsteps/wood4.ogg differ diff --git a/Resources/Audio/effects/footsteps/wood5.ogg b/Resources/Audio/effects/footsteps/wood5.ogg new file mode 100644 index 0000000000..5ad4fa81e7 Binary files /dev/null and b/Resources/Audio/effects/footsteps/wood5.ogg differ diff --git a/Resources/Prototypes/Entities/items/tiles.yml b/Resources/Prototypes/Entities/items/tiles.yml index 4df5ac1dab..2116f4ec34 100644 --- a/Resources/Prototypes/Entities/items/tiles.yml +++ b/Resources/Prototypes/Entities/items/tiles.yml @@ -19,6 +19,27 @@ count: 1 max: 8 +- type: entity + name: Wood Floor Tile + parent: BaseItem + id: FloorTileItemWood + description: Those could work as a pretty decent throwing weapon. + components: + - type: Sprite + sprite: Objects/Tiles/tile.rsi + state: tile_wood + - type: Icon + sprite: Objects/Tiles/tile.rsi + state: tile_wood + - type: Item + Size: 25 + - type: FloorTile + output: floor_wood + - type: Stack + stacktype: FloorTileWood + count: 1 + max: 8 + - type: entity name: White Floor Tile parent: BaseItem diff --git a/Resources/Prototypes/SoundCollections/footsteps.yml b/Resources/Prototypes/SoundCollections/footsteps.yml index ba1307a19f..d84481345c 100644 --- a/Resources/Prototypes/SoundCollections/footsteps.yml +++ b/Resources/Prototypes/SoundCollections/footsteps.yml @@ -7,6 +7,15 @@ - /Audio/effects/footsteps/carpet4.ogg - /Audio/effects/footsteps/carpet5.ogg +- type: sound_collection + id: footstep_wood + files: + - /Audio/effects/footsteps/wood1.ogg + - /Audio/effects/footsteps/wood2.ogg + - /Audio/effects/footsteps/wood3.ogg + - /Audio/effects/footsteps/wood4.ogg + - /Audio/effects/footsteps/wood5.ogg + - type: sound_collection id: footstep_catwalk files: @@ -71,4 +80,4 @@ - /Audio/effects/footsteps/asteroid2.ogg - /Audio/effects/footsteps/asteroid3.ogg - /Audio/effects/footsteps/asteroid4.ogg - - /Audio/effects/footsteps/asteroid5.ogg \ No newline at end of file + - /Audio/effects/footsteps/asteroid5.ogg diff --git a/Resources/Prototypes/Tiles/wood.yml b/Resources/Prototypes/Tiles/wood.yml new file mode 100644 index 0000000000..fcf3ca1959 --- /dev/null +++ b/Resources/Prototypes/Tiles/wood.yml @@ -0,0 +1,12 @@ +- type: tile + name: floor_wood + display_name: Wood + texture: "wood" + base_turfs: + - space + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: footstep_wood + friction: 0.35 + item_drop: FloorTileItemCarpet diff --git a/Resources/Textures/Tiles/wood.png b/Resources/Textures/Tiles/wood.png new file mode 100644 index 0000000000..bc87dd9b52 Binary files /dev/null and b/Resources/Textures/Tiles/wood.png differ