diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/tiles/tile.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/tiles/tile.ftl index c728657a5be1ef..849d23c3cb9ab7 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/tiles/tile.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/tiles/tile.ftl @@ -14,4 +14,20 @@ ent-FloorTileItemWoodTileLight = светлый деревянный узорч ent-FloorTileItemWoodRed = красный деревянный пол ent-FloorTileItemWoodLargeRed = большой красный деревянный пол ent-FloorTileItemWoodParquetRed = красный деревянный паркет -ent-FloorTileItemWoodTileRed = красный деревянный узорчатый пол \ No newline at end of file +ent-FloorTileItemWoodTileRed = красный деревянный узорчатый пол +ent-FloorTileItemMarbleBlack = чёрная мраморная плитка +ent-FloorTileItemMarbleWhite = белая мраморная плитка +ent-FloorTileItemMarbleBorderWB = горизонтальная мраморная плитка +ent-FloorTileItemMarbleBorderBW = горизонтальная мраморная плитка +ent-FloorTileItemMarbleDiagonalBW = диагональная мраморная плитка +ent-FloorTileItemMarbleDiagonalWB = диагональная мраморная плитка +ent-FloorTileItemMarbleVerticalBW = вертикальная мраморная плитка +ent-FloorTileItemMarbleVerticalWB = вертикальная мраморная плитка +ent-FloorTileItemMarbleCornerNE = угловая мраморная плитка +ent-FloorTileItemMarbleCornerNW = угловая мраморная плитка +ent-FloorTileItemMarbleCornerSE = угловая мраморная плитка +ent-FloorTileItemMarbleCornerSW = угловая мраморная плитка +ent-FloorTileItemMarbleInnerNE = мраморная плитка с внутренним углом +ent-FloorTileItemMarbleInnerNW = мраморная плитка с внутренним углом +ent-FloorTileItemMarbleInnerSE = мраморная плитка с внутренним углом +ent-FloorTileItemMarbleInnerSW = мраморная плитка с внутренним углом diff --git a/Resources/Locale/ru-RU/ss220/tiles/tiles.ftl b/Resources/Locale/ru-RU/ss220/tiles/tiles.ftl index ca4daeeb22c76c..494af438cfa5cc 100644 --- a/Resources/Locale/ru-RU/ss220/tiles/tiles.ftl +++ b/Resources/Locale/ru-RU/ss220/tiles/tiles.ftl @@ -34,3 +34,10 @@ carpet-orange = оранжевый ковёр tiles-mud = грязь tiles-rocks = камень tiles-wasteland = пустошь +black-marble-floor = чёрная мраморная плитка +white-marble-floor = белая мраморная плитка +diagonal-marble-floor = диагональная мраморная плитка +border-marble-floor = горизонтальная мраморная плитка +vertical-marble-floor = вертикальная мраморная плитка +corner-marble-floor = угловая мраморная плитка +inner-marble-floor = мраморная плитка с внутренним углом diff --git a/Resources/Prototypes/SS220/Decals/marble.yml b/Resources/Prototypes/SS220/Decals/marble.yml new file mode 100644 index 00000000000000..ed9a59f3977c1b --- /dev/null +++ b/Resources/Prototypes/SS220/Decals/marble.yml @@ -0,0 +1,223 @@ +- type: decal + id: MarbleBlackCornerNE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_corner_ne + +- type: decal + id: MarbleBlackCornerNW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_corner_nw + +- type: decal + id: MarbleBlackCornerSE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_corner_se + +- type: decal + id: MarbleBlackCornerSW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_corner_sw + +- type: decal + id: MarbleWhiteCornerNE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_corner_ne + +- type: decal + id: MarbleWhiteCornerNW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_corner_nw + +- type: decal + id: MarbleWhiteCornerSE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_corner_se + +- type: decal + id: MarbleWhiteCornerSW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_corner_sw + +- type: decal + id: MarbleBlackInnerNE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_inner_ne + +- type: decal + id: MarbleBlackInnerNW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_inner_nw + +- type: decal + id: MarbleBlackInnerSE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_inner_se + +- type: decal + id: MarbleBlackInnerSW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_inner_sw + +- type: decal + id: MarbleWhiteInnerNE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_inner_ne + +- type: decal + id: MarbleWhiteInnerNW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_inner_nw + +- type: decal + id: MarbleWhiteInnerSE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_inner_se + +- type: decal + id: MarbleWhiteInnerSW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_inner_sw + +- type: decal + id: MarbleBlackLineW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_line_w + +- type: decal + id: MarbleBlackLineS + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_line_s + +- type: decal + id: MarbleBlackLineE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_line_e + +- type: decal + id: MarbleBlackLineN + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: black_line_n + +- type: decal + id: MarbleWhiteLineW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_line_w + +- type: decal + id: MarbleWhiteLineS + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_line_s + +- type: decal + id: MarbleWhiteLineE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_line_e + +- type: decal + id: MarbleWhiteLineN + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: white_line_n + +- type: decal + id: MarbleBWCornerNE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: bw_corner_ne + +- type: decal + id: MarbleBWCornerNW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: bw_corner_nw + +- type: decal + id: MarbleBWCornerSE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: bw_corner_se + +- type: decal + id: MarbleBWCornerSW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: bw_corner_sw + +- type: decal + id: MarbleWBCornerNE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: wb_corner_ne + +- type: decal + id: MarbleWBCornerNW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: wb_corner_nw + +- type: decal + id: MarbleWBCornerSE + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: wb_corner_se + +- type: decal + id: MarbleWBCornerSW + tags: ["station", "markings"] + sprite: + sprite: SS220/Decals/marble.rsi + state: wb_corner_sw diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/tiles.yml index a4153eea91e479..3858c9ae6a8fc8 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/tiles.yml @@ -631,3 +631,293 @@ - FloorTileCarpetOrange - type: Stack stackType: FloorTileStackCarpetOrange + +# Marble + +- type: entity + name: tile black marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleBlack + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: blackmarble + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: marbleblack + - type: FloorTile + outputs: + - Plating + - FloorMarbleBlack + - type: Stack + stackType: FloorTileItemMarbleBlack + +- type: entity + name: tile white marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleWhite + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: whitemarble + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: marblewhite + - type: FloorTile + outputs: + - Plating + - FloorMarbleWhite + - type: Stack + stackType: FloorTileItemMarbleWhite + +- type: entity + name: tile border marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleBorderWB + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: bordermarblewb + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: bordermarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleBorderWB + - type: Stack + stackType: FloorTileItemMarbleBorderWB + +- type: entity + name: tile border marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleBorderBW + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: bordermarblebw + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: bordermarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleBorderBW + - type: Stack + stackType: FloorTileItemMarbleBorderBW + +- type: entity + name: tile diagonal marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleDiagonalBW + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: diagonalmarblebw + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: diagonalmarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleDiagonalBW + - type: Stack + stackType: FloorTileItemMarbleDiagonalBW + +- type: entity + name: tile diagonal marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleDiagonalWB + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: diagonalmarblewb + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: diagonalmarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleDiagonalWB + - type: Stack + stackType: FloorTileItemMarbleDiagonalWB + +- type: entity + name: tile border marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleVerticalBW + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: verticalmarblebw + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: verticalmarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleVerticalBW + - type: Stack + stackType: FloorTileItemMarbleVerticalBW + +- type: entity + name: tile border marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleVerticalWB + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: verticalmarblewb + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: verticalmarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleVerticalWB + - type: Stack + stackType: FloorTileItemMarbleVerticalWB + +- type: entity + name: tile corner marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleCornerNE + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: cornermarblene + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: cornermarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleCornerNE + - type: Stack + stackType: FloorTileItemMarbleCornerNE + +- type: entity + name: tile corner marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleCornerNW + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: cornermarblenw + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: cornermarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleCornerNW + - type: Stack + stackType: FloorTileItemMarbleCornerNW + +- type: entity + name: tile corner marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleCornerSE + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: cornermarblese + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: cornermarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleCornerSE + - type: Stack + stackType: FloorTileItemMarbleCornerSE + +- type: entity + name: tile corner marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleCornerSW + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: cornermarblesw + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: cornermarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleCornerSW + - type: Stack + stackType: FloorTileItemMarbleCornerSW + +- type: entity + name: tile inner marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleInnerNE + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: innermarblene + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: innermarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleInnerNE + - type: Stack + stackType: FloorTileItemMarbleInnerNE + +- type: entity + name: tile inner marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleInnerNW + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: innermarblenw + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: innermarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleInnerNW + - type: Stack + stackType: FloorTileItemMarbleInnerNW + +- type: entity + name: tile inner marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleInnerSE + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: innermarblese + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: innermarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleInnerSE + - type: Stack + stackType: FloorTileItemMarbleInnerSE + +- type: entity + name: tile inner marble floor + parent: FloorTileItemBase + id: FloorTileItemMarbleInnerSW + components: + - type: Sprite + sprite: SS220/Objects/Tiles/marble.rsi + state: innermarblesw + - type: Item + sprite: SS220/Objects/Tiles/marble.rsi + heldPrefix: innermarble + - type: FloorTile + outputs: + - Plating + - FloorMarbleInnerSW + - type: Stack + stackType: FloorTileItemMarbleInnerSW diff --git a/Resources/Prototypes/SS220/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/SS220/Stacks/floor_tile_stacks.yml index 226ff75adda5a8..a77d4744e44fb2 100644 --- a/Resources/Prototypes/SS220/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/SS220/Stacks/floor_tile_stacks.yml @@ -210,3 +210,101 @@ name: red carpet floor spawn: FloorTileItemCarpetRed maxCount: 30 + +# Marble + +- type: stack + id: FloorTileItemMarbleBlack + name: black marble + spawn: FloorTileItemMarbleBlack + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleWhite + name: white marble + spawn: FloorTileItemMarbleWhite + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleBorderWB + name: border marble + spawn: FloorTileItemMarbleBorderWB + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleBorderBW + name: border marble + spawn: FloorTileItemMarbleBorderBW + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleDiagonalBW + name: diagonal marble + spawn: FloorTileItemMarbleDiagonalBW + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleDiagonalWB + name: diagonal marble + spawn: FloorTileItemMarbleDiagonalWB + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleVerticalBW + name: vertical marble + spawn: FloorTileItemMarbleVerticalBW + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleVerticalWB + name: vertical marble + spawn: FloorTileItemMarbleVerticalWB + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleCornerNE + name: vertical marble + spawn: FloorTileItemMarbleCornerNE + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleCornerNW + name: vertical marble + spawn: FloorTileItemMarbleCornerNW + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleCornerSE + name: vertical marble + spawn: FloorTileItemMarbleCornerSE + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleCornerSW + name: vertical marble + spawn: FloorTileItemMarbleCornerSW + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleInnerNE + name: inner marble + spawn: FloorTileItemMarbleInnerNE + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleInnerNW + name: inner marble + spawn: FloorTileItemMarbleInnerNW + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleInnerSE + name: inner marble + spawn: FloorTileItemMarbleInnerSE + maxCount: 30 + +- type: stack + id: FloorTileItemMarbleInnerSW + name: inner marble + spawn: FloorTileItemMarbleInnerSW + maxCount: 30 diff --git a/Resources/Prototypes/SS220/Tiles/floors.yml b/Resources/Prototypes/SS220/Tiles/floors.yml index 59eb0cb1065f11..1faa87e78bd61c 100644 --- a/Resources/Prototypes/SS220/Tiles/floors.yml +++ b/Resources/Prototypes/SS220/Tiles/floors.yml @@ -871,3 +871,195 @@ collection: FootstepTile heatCapacity: 10000 ################### + +- type: tile + id: FloorMarbleBlack + name: black-marble-floor + sprite: /Textures/SS220/Tiles/marble_black.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleBlack + heatCapacity: 10000 + +- type: tile + id: FloorMarbleWhite + name: white-marble-floor + sprite: /Textures/SS220/Tiles/marble_white.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleWhite + heatCapacity: 10000 + +- type: tile + id: FloorMarbleDiagonalBW + name: diagonal-marble-floor + sprite: /Textures/SS220/Tiles/marble_diagonal_bw.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleDiagonalBW + heatCapacity: 10000 + +- type: tile + id: FloorMarbleDiagonalWB + name: diagonal-marble-floor + sprite: /Textures/SS220/Tiles/marble_diagonal_wb.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleDiagonalWB + heatCapacity: 10000 + +- type: tile + id: FloorMarbleBorderWB + name: border-marble-floor + sprite: /Textures/SS220/Tiles/marble_border_wb.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleBorderWB + heatCapacity: 10000 + +- type: tile + id: FloorMarbleBorderBW + name: border-marble-floor + sprite: /Textures/SS220/Tiles/marble_border_bw.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleBorderBW + heatCapacity: 10000 + +- type: tile + id: FloorMarbleVerticalBW + name: vertical-marble-floor + sprite: /Textures/SS220/Tiles/marble_vertical_bw.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleVerticalBW + heatCapacity: 10000 + +- type: tile + id: FloorMarbleVerticalWB + name: vertical-marble-floor + sprite: /Textures/SS220/Tiles/marble_vertical_wb.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleVerticalWB + heatCapacity: 10000 + +- type: tile + id: FloorMarbleCornerNE + name: corner-marble-floor + sprite: /Textures/SS220/Tiles/marble_corner_ne.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleCornerNE + heatCapacity: 10000 + +- type: tile + id: FloorMarbleCornerNW + name: corner-marble-floor + sprite: /Textures/SS220/Tiles/marble_corner_nw.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleCornerNW + heatCapacity: 10000 + +- type: tile + id: FloorMarbleCornerSE + name: corner-marble-floor + sprite: /Textures/SS220/Tiles/marble_corner_se.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleCornerSE + heatCapacity: 10000 + +- type: tile + id: FloorMarbleCornerSW + name: corner-marble-floor + sprite: /Textures/SS220/Tiles/marble_corner_sw.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleCornerSW + heatCapacity: 10000 + +- type: tile + id: FloorMarbleInnerNE + name: inner-marble-floor + sprite: /Textures/SS220/Tiles/marble_inner_ne.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleInnerNE + heatCapacity: 10000 + +- type: tile + id: FloorMarbleInnerNW + name: inner-marble-floor + sprite: /Textures/SS220/Tiles/marble_inner_nw.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleInnerNW + heatCapacity: 10000 + +- type: tile + id: FloorMarbleInnerSE + name: inner-marble-floor + sprite: /Textures/SS220/Tiles/marble_inner_se.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleInnerSE + heatCapacity: 10000 + +- type: tile + id: FloorMarbleInnerSW + name: inner-marble-floor + sprite: /Textures/SS220/Tiles/marble_inner_sw.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemMarbleInnerSW + heatCapacity: 10000 diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_corner_ne.png b/Resources/Textures/SS220/Decals/marble.rsi/black_corner_ne.png new file mode 100644 index 00000000000000..67d4cb1d2c003e Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_corner_ne.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_corner_nw.png b/Resources/Textures/SS220/Decals/marble.rsi/black_corner_nw.png new file mode 100644 index 00000000000000..e453fba568197f Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_corner_nw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_corner_se.png b/Resources/Textures/SS220/Decals/marble.rsi/black_corner_se.png new file mode 100644 index 00000000000000..acc89c7dd634a2 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_corner_se.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_corner_sw.png b/Resources/Textures/SS220/Decals/marble.rsi/black_corner_sw.png new file mode 100644 index 00000000000000..1ca1a90c97d11d Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_corner_sw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_diagonal_left.png b/Resources/Textures/SS220/Decals/marble.rsi/black_diagonal_left.png new file mode 100644 index 00000000000000..4fe89313eb6a11 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_diagonal_left.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_diagonal_right.png b/Resources/Textures/SS220/Decals/marble.rsi/black_diagonal_right.png new file mode 100644 index 00000000000000..fc2bd5cce8fe82 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_diagonal_right.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_inner_ne.png b/Resources/Textures/SS220/Decals/marble.rsi/black_inner_ne.png new file mode 100644 index 00000000000000..c3b966edcc17a4 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_inner_ne.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_inner_nw.png b/Resources/Textures/SS220/Decals/marble.rsi/black_inner_nw.png new file mode 100644 index 00000000000000..4d341d53ef5618 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_inner_nw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_inner_se.png b/Resources/Textures/SS220/Decals/marble.rsi/black_inner_se.png new file mode 100644 index 00000000000000..9dc03ffec0ab5c Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_inner_se.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_inner_sw.png b/Resources/Textures/SS220/Decals/marble.rsi/black_inner_sw.png new file mode 100644 index 00000000000000..61633a8059b8d0 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_inner_sw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_line_e.png b/Resources/Textures/SS220/Decals/marble.rsi/black_line_e.png new file mode 100644 index 00000000000000..6cdf392ab0b27b Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_line_e.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_line_n.png b/Resources/Textures/SS220/Decals/marble.rsi/black_line_n.png new file mode 100644 index 00000000000000..b54475db40ee2b Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_line_n.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_line_s.png b/Resources/Textures/SS220/Decals/marble.rsi/black_line_s.png new file mode 100644 index 00000000000000..6a456b96dfcafc Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_line_s.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/black_line_w.png b/Resources/Textures/SS220/Decals/marble.rsi/black_line_w.png new file mode 100644 index 00000000000000..f51228c5427ae8 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/black_line_w.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_ne.png b/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_ne.png new file mode 100644 index 00000000000000..3a9b9eb23e9cc1 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_ne.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_nw.png b/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_nw.png new file mode 100644 index 00000000000000..ad97171433207f Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_nw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_se.png b/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_se.png new file mode 100644 index 00000000000000..11e48e32120202 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_se.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_sw.png b/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_sw.png new file mode 100644 index 00000000000000..3aa85ab72fba3e Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/bw_corner_sw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/meta.json b/Resources/Textures/SS220/Decals/marble.rsi/meta.json new file mode 100644 index 00000000000000..361cf904582c9e --- /dev/null +++ b/Resources/Textures/SS220/Decals/marble.rsi/meta.json @@ -0,0 +1,119 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by TTTomaTTT for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "black_corner_ne" + }, + { + "name": "black_corner_nw" + }, + { + "name": "black_corner_se" + }, + { + "name": "black_corner_sw" + }, + { + "name": "black_diagonal_left" + }, + { + "name": "black_diagonal_right" + }, + { + "name": "black_inner_ne" + }, + { + "name": "black_inner_nw" + }, + { + "name": "black_inner_se" + }, + { + "name": "black_inner_sw" + }, + { + "name": "black_line_e" + }, + { + "name": "black_line_n" + }, + { + "name": "black_line_s" + }, + { + "name": "black_line_w" + }, + { + "name": "white_corner_ne" + }, + { + "name": "white_corner_nw" + }, + { + "name": "white_corner_se" + }, + { + "name": "white_corner_sw" + }, + { + "name": "white_diagonal_left" + }, + { + "name": "white_diagonal_right" + }, + { + "name": "white_inner_ne" + }, + { + "name": "white_inner_nw" + }, + { + "name": "white_inner_se" + }, + { + "name": "white_inner_sw" + }, + { + "name": "white_line_e" + }, + { + "name": "white_line_n" + }, + { + "name": "white_line_s" + }, + { + "name": "white_line_w" + }, + { + "name": "bw_corner_ne" + }, + { + "name": "bw_corner_nw" + }, + { + "name": "bw_corner_se" + }, + { + "name": "bw_corner_sw" + }, + { + "name": "wb_corner_ne" + }, + { + "name": "wb_corner_nw" + }, + { + "name": "wb_corner_se" + }, + { + "name": "wb_corner_sw" + } + ] +} diff --git a/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_ne.png b/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_ne.png new file mode 100644 index 00000000000000..af5c4b5ae77aba Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_ne.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_nw.png b/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_nw.png new file mode 100644 index 00000000000000..dce83991e4b40a Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_nw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_se.png b/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_se.png new file mode 100644 index 00000000000000..f79b35c31ab207 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_se.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_sw.png b/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_sw.png new file mode 100644 index 00000000000000..e50420a4bfda2b Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/wb_corner_sw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_corner_ne.png b/Resources/Textures/SS220/Decals/marble.rsi/white_corner_ne.png new file mode 100644 index 00000000000000..abbae728ddee23 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_corner_ne.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_corner_nw.png b/Resources/Textures/SS220/Decals/marble.rsi/white_corner_nw.png new file mode 100644 index 00000000000000..c5ed71bdf63d43 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_corner_nw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_corner_se.png b/Resources/Textures/SS220/Decals/marble.rsi/white_corner_se.png new file mode 100644 index 00000000000000..2e4ea990b68986 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_corner_se.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_corner_sw.png b/Resources/Textures/SS220/Decals/marble.rsi/white_corner_sw.png new file mode 100644 index 00000000000000..0dd4535d4f5bcb Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_corner_sw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_diagonal_left.png b/Resources/Textures/SS220/Decals/marble.rsi/white_diagonal_left.png new file mode 100644 index 00000000000000..83d5ae05055bab Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_diagonal_left.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_diagonal_right.png b/Resources/Textures/SS220/Decals/marble.rsi/white_diagonal_right.png new file mode 100644 index 00000000000000..6235f27867dca7 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_diagonal_right.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_inner_ne.png b/Resources/Textures/SS220/Decals/marble.rsi/white_inner_ne.png new file mode 100644 index 00000000000000..f8538e9e4d723b Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_inner_ne.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_inner_nw.png b/Resources/Textures/SS220/Decals/marble.rsi/white_inner_nw.png new file mode 100644 index 00000000000000..98b62463a6e80b Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_inner_nw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_inner_se.png b/Resources/Textures/SS220/Decals/marble.rsi/white_inner_se.png new file mode 100644 index 00000000000000..dfee4cd8ce6c80 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_inner_se.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_inner_sw.png b/Resources/Textures/SS220/Decals/marble.rsi/white_inner_sw.png new file mode 100644 index 00000000000000..fb4e9e17dc436d Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_inner_sw.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_line_e.png b/Resources/Textures/SS220/Decals/marble.rsi/white_line_e.png new file mode 100644 index 00000000000000..fdfcabb571586b Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_line_e.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_line_n.png b/Resources/Textures/SS220/Decals/marble.rsi/white_line_n.png new file mode 100644 index 00000000000000..0c732458817af0 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_line_n.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_line_s.png b/Resources/Textures/SS220/Decals/marble.rsi/white_line_s.png new file mode 100644 index 00000000000000..d79aafdb24de79 Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_line_s.png differ diff --git a/Resources/Textures/SS220/Decals/marble.rsi/white_line_w.png b/Resources/Textures/SS220/Decals/marble.rsi/white_line_w.png new file mode 100644 index 00000000000000..c2c49ca0e4197e Binary files /dev/null and b/Resources/Textures/SS220/Decals/marble.rsi/white_line_w.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/blackmarble.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/blackmarble.png new file mode 100644 index 00000000000000..af90ca89e6c16b Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/blackmarble.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarble-inhand-left.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarble-inhand-left.png new file mode 100644 index 00000000000000..d8426691e9d8f9 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarble-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarble-inhand-right.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarble-inhand-right.png new file mode 100644 index 00000000000000..8c929376bd6f2f Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarble-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarblebw.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarblebw.png new file mode 100644 index 00000000000000..8eb12686c84af4 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarblebw.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarblewb.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarblewb.png new file mode 100644 index 00000000000000..893f2fbb35ee8d Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/bordermarblewb.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarble-inhand-left.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarble-inhand-left.png new file mode 100644 index 00000000000000..a35fcf7976bb1d Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarble-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarble-inhand-right.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarble-inhand-right.png new file mode 100644 index 00000000000000..83618eb71cb1ea Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarble-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblene.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblene.png new file mode 100644 index 00000000000000..c1ab4ffd4abbc9 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblene.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblenw.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblenw.png new file mode 100644 index 00000000000000..40247a5273d70c Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblenw.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblese.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblese.png new file mode 100644 index 00000000000000..4185f8d883ee00 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblese.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblesw.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblesw.png new file mode 100644 index 00000000000000..b2e85e8f53d7ef Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/cornermarblesw.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarble-inhand-left.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarble-inhand-left.png new file mode 100644 index 00000000000000..8203d0f1d65471 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarble-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarble-inhand-right.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarble-inhand-right.png new file mode 100644 index 00000000000000..9ca5f10a72de44 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarble-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarblebw.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarblebw.png new file mode 100644 index 00000000000000..2fefc702b7f5e4 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarblebw.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarblewb.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarblewb.png new file mode 100644 index 00000000000000..382210ccbf0b8a Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/diagonalmarblewb.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarble-inhand-left.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarble-inhand-left.png new file mode 100644 index 00000000000000..edd37127b0e199 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarble-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarble-inhand-right.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarble-inhand-right.png new file mode 100644 index 00000000000000..332a096c9cbb31 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarble-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblene.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblene.png new file mode 100644 index 00000000000000..e08386161bbeac Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblene.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblenw.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblenw.png new file mode 100644 index 00000000000000..655f2ada64c58a Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblenw.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblese.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblese.png new file mode 100644 index 00000000000000..e7dd1eb85404e9 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblese.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblesw.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblesw.png new file mode 100644 index 00000000000000..10c893b8ea40fa Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/innermarblesw.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marbleblack-inhand-left.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marbleblack-inhand-left.png new file mode 100644 index 00000000000000..4096a5bd4946e7 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marbleblack-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marbleblack-inhand-right.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marbleblack-inhand-right.png new file mode 100644 index 00000000000000..d21901786e0e7a Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marbleblack-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marblewhite-inhand-left.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marblewhite-inhand-left.png new file mode 100644 index 00000000000000..a07619556964af Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marblewhite-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marblewhite-inhand-right.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marblewhite-inhand-right.png new file mode 100644 index 00000000000000..3884cfd879d376 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/marblewhite-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/meta.json b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/meta.json new file mode 100644 index 00000000000000..f67070b688a005 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/meta.json @@ -0,0 +1,115 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by Kit0vras (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "blackmarble" + }, + { + "name": "bordermarblebw" + }, + { + "name": "bordermarblewb" + }, + { + "name": "diagonalmarblebw" + }, + { + "name": "diagonalmarblewb" + }, + { + "name": "verticalmarblebw" + }, + { + "name": "verticalmarblewb" + }, + { + "name": "whitemarble" + }, + { + "name": "cornermarblene" + }, + { + "name": "cornermarblenw" + }, + { + "name": "cornermarblese" + }, + { + "name": "cornermarblesw" + }, + { + "name": "innermarblene" + }, + { + "name": "innermarblenw" + }, + { + "name": "innermarblese" + }, + { + "name": "innermarblesw" + }, + { + "name": "bordermarble-inhand-left", + "directions": 4 + }, + { + "name": "bordermarble-inhand-right", + "directions": 4 + }, + { + "name": "diagonalmarble-inhand-left", + "directions": 4 + }, + { + "name": "diagonalmarble-inhand-right", + "directions": 4 + }, + { + "name": "marbleblack-inhand-left", + "directions": 4 + }, + { + "name": "marbleblack-inhand-right", + "directions": 4 + }, + { + "name": "marblewhite-inhand-left", + "directions": 4 + }, + { + "name": "marblewhite-inhand-right", + "directions": 4 + }, + { + "name": "verticalmarble-inhand-right", + "directions": 4 + }, + { + "name": "verticalmarble-inhand-left", + "directions": 4 + }, + { + "name": "cornermarble-inhand-left", + "directions": 4 + }, + { + "name": "cornermarble-inhand-right", + "directions": 4 + }, + { + "name": "innermarble-inhand-left", + "directions": 4 + }, + { + "name": "innermarble-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarble-inhand-left.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarble-inhand-left.png new file mode 100644 index 00000000000000..bc1126a5ebc26e Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarble-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarble-inhand-right.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarble-inhand-right.png new file mode 100644 index 00000000000000..1d7d6199ea2552 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarble-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarblebw.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarblebw.png new file mode 100644 index 00000000000000..6deb1ac466ba10 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarblebw.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarblewb.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarblewb.png new file mode 100644 index 00000000000000..267bbb7414de23 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/verticalmarblewb.png differ diff --git a/Resources/Textures/SS220/Objects/Tiles/marble.rsi/whitemarble.png b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/whitemarble.png new file mode 100644 index 00000000000000..4e4a354b6895d3 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Tiles/marble.rsi/whitemarble.png differ diff --git a/Resources/Textures/SS220/Tiles/attributions.yml b/Resources/Textures/SS220/Tiles/attributions.yml index c0f69f749b9fc2..0d88092876c8d2 100644 --- a/Resources/Textures/SS220/Tiles/attributions.yml +++ b/Resources/Textures/SS220/Tiles/attributions.yml @@ -47,3 +47,8 @@ license: "Custom" copyright: "Created by github user @Kit0vras. EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt" source: "https://github.com/SerbiaStrong-220/space-station-14/pull/1052" + +- files: ["marble_white.png", "marble_black.png", "marble_border_bw.png", "marble_border_wb.png", "marble_another_border_bw.png", "marble_another_border_wb.png", "marble_diagonal_bw.png", "marble_diagonal_wb.png","marble_corner_ne.png", "marble_corner_nw.png", "marble_corner_se.png", "marble_corner_sw.png", "marble_inner_ne.png", "marble_inner_nw.png", "marble_inner_se.png", "marble_inner_sw.png"] + license: "CC-BY-SA-3.0" + copyright: "goonstation commit 2b0d74d8baad01feb28da91837316728bdf99e36." + source: "https://github.com/goonstation/goonstation/pull/5567" diff --git a/Resources/Textures/SS220/Tiles/marble_black.png b/Resources/Textures/SS220/Tiles/marble_black.png new file mode 100644 index 00000000000000..e34020605d6bf7 Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_black.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_border_bw.png b/Resources/Textures/SS220/Tiles/marble_border_bw.png new file mode 100644 index 00000000000000..b29b971389a2c5 Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_border_bw.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_border_wb.png b/Resources/Textures/SS220/Tiles/marble_border_wb.png new file mode 100644 index 00000000000000..d4dbf0a5d7e99f Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_border_wb.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_corner_ne.png b/Resources/Textures/SS220/Tiles/marble_corner_ne.png new file mode 100644 index 00000000000000..01ade87c2c5350 Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_corner_ne.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_corner_nw.png b/Resources/Textures/SS220/Tiles/marble_corner_nw.png new file mode 100644 index 00000000000000..7c52a94437711d Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_corner_nw.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_corner_se.png b/Resources/Textures/SS220/Tiles/marble_corner_se.png new file mode 100644 index 00000000000000..e173d73981f943 Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_corner_se.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_corner_sw.png b/Resources/Textures/SS220/Tiles/marble_corner_sw.png new file mode 100644 index 00000000000000..434b14f8d04079 Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_corner_sw.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_diagonal_bw.png b/Resources/Textures/SS220/Tiles/marble_diagonal_bw.png new file mode 100644 index 00000000000000..e4ed468e0b8912 Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_diagonal_bw.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_diagonal_wb.png b/Resources/Textures/SS220/Tiles/marble_diagonal_wb.png new file mode 100644 index 00000000000000..8e55bcec30ec40 Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_diagonal_wb.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_inner_ne.png b/Resources/Textures/SS220/Tiles/marble_inner_ne.png new file mode 100644 index 00000000000000..68260efea4194e Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_inner_ne.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_inner_nw.png b/Resources/Textures/SS220/Tiles/marble_inner_nw.png new file mode 100644 index 00000000000000..4bb128d369f72e Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_inner_nw.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_inner_se.png b/Resources/Textures/SS220/Tiles/marble_inner_se.png new file mode 100644 index 00000000000000..0bb908770dd97a Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_inner_se.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_inner_sw.png b/Resources/Textures/SS220/Tiles/marble_inner_sw.png new file mode 100644 index 00000000000000..29b1ab6581fbba Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_inner_sw.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_vertical_bw.png b/Resources/Textures/SS220/Tiles/marble_vertical_bw.png new file mode 100644 index 00000000000000..aeb8933c77f6d4 Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_vertical_bw.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_vertical_wb.png b/Resources/Textures/SS220/Tiles/marble_vertical_wb.png new file mode 100644 index 00000000000000..4b26b8d3cc6195 Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_vertical_wb.png differ diff --git a/Resources/Textures/SS220/Tiles/marble_white.png b/Resources/Textures/SS220/Tiles/marble_white.png new file mode 100644 index 00000000000000..fb6caf46b96b48 Binary files /dev/null and b/Resources/Textures/SS220/Tiles/marble_white.png differ