diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 89a446e678..6aa2ebc906 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -48,7 +48,8 @@ tiles-mining-tile = mining tile tiles-mining-dark-tile = dark mining tile tiles-mining-light-tile = light mining tile tiles-freezer = freezer -tiles-showroom-floor = showroom floor +tiles-showroom-floor = showroom +tiles-lime-floor = lime floor tiles-hydro-floor = hydro floor tiles-bar-floor = bar floor tiles-clown-floor = clown floor diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 56185874f4..3a13ac239c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -290,6 +290,22 @@ - type: Stack stackType: FloorTileBlue +- type: entity + name: lime tile + parent: FloorTileItemBase + id: FloorTileItemLime + components: + - type: Sprite + state: lime + - type: Item + heldPrefix: steel + - type: FloorTile + outputs: + - Plating + - FloorSteelLime + - type: Stack + stackType: FloorTileLime + - type: entity name: mining tile parent: FloorTileItemBase diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index f66da3f88c..eb423b0aa5 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -96,6 +96,13 @@ maxCount: 30 itemSize: 5 +- type: stack + id: FloorTileLime + name: lime tile + spawn: FloorTileItemLime + maxCount: 30 + itemSize: 5 + - type: stack id: FloorTileDirty name: dirty tile diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index def0bd1108..0e150f5bc3 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -684,6 +684,24 @@ itemDrop: FloorTileItemBlue heatCapacity: 10000 +- type: tile + id: FloorSteelLime + name: tiles-lime-floor + sprite: /Textures/Tiles/lime.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + canCrowbar: true + footstepSounds: + collection: FootstepFloor + itemDrop: FloorTileItemLime + heatCapacity: 10000 + - type: tile id: FloorMining name: tiles-mining-tile diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/lime.png b/Resources/Textures/Objects/Tiles/tile.rsi/lime.png new file mode 100644 index 0000000000..f3ad764ade Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/lime.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 3b5e8d83f4..963c748c6d 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -37,6 +37,9 @@ { "name": "blue" }, + { + "name": "lime" + }, { "name": "mining" }, diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index c36269eb0d..3616d5a7ec 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -51,7 +51,7 @@ copyright: "Created by github user @notquitehadouken." source: "https://github.com/space-wizards/space-station-14/pull/17948" -- files: [ "bar.png", "blue.png", "kitchen.png", "laundry.png", "mime.png", "steel.png", "steel_dirty.png", "steel_diagonal.png", "steel_mini.png", "steel_offset.png", "steel_pavement.png", "white.png", "white_diagonal.png", "white_mini.png", "white_offset.png", "white_pavement.png", "dark.png", "dark_diagonal.png", "dark_mini.png", "dark_offset.png", "dark_pavement.png", "hydro.png", "plastic.png", "dark_plastic.png", "white_plastic.png", "cafeteria.png", "checker_dark.png", "clown.png" ] +- files: [ "bar.png", "lime.png", "blue.png", "kitchen.png", "laundry.png", "mime.png", "steel.png", "steel_dirty.png", "steel_diagonal.png", "steel_mini.png", "steel_offset.png", "steel_pavement.png", "white.png", "white_diagonal.png", "white_mini.png", "white_offset.png", "white_pavement.png", "dark.png", "dark_diagonal.png", "dark_mini.png", "dark_offset.png", "dark_pavement.png", "hydro.png", "plastic.png", "dark_plastic.png", "white_plastic.png", "cafeteria.png", "checker_dark.png", "clown.png" ] license: "CC-BY-SA-3.0" copyright: "Created by github user @Flareguy, original, unedited base tiles modified from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae and github user @moonheart08" source: "https://github.com/space-wizards/space-station-14/" diff --git a/Resources/Textures/Tiles/lime.png b/Resources/Textures/Tiles/lime.png new file mode 100644 index 0000000000..bf528d278b Binary files /dev/null and b/Resources/Textures/Tiles/lime.png differ