diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl index f36bbe1ae7..0c96aa6edb 100644 --- a/Resources/Locale/en-US/lathe/lathe-categories.ftl +++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl @@ -30,6 +30,7 @@ lathe-category-maints = Maints lathe-category-steel = Steel lathe-category-white = White lathe-category-wood = Wood +lathe-category-marble = Marble # Science lathe-category-mechs = Mechs diff --git a/Resources/Locale/en-US/stack/stacks.ftl b/Resources/Locale/en-US/stack/stacks.ftl index f1380800ce..d83825b614 100644 --- a/Resources/Locale/en-US/stack/stacks.ftl +++ b/Resources/Locale/en-US/stack/stacks.ftl @@ -236,3 +236,7 @@ stack-xeno-steel = xeno steel tile stack-xeno-steel-corner = xeno steel corner tile stack-xeno-maint = xeno techmaint stack-dark-squiggly = dark steel squiggly tile +stack-white-marble-floor = white marble floor +stack-dark-marble-floor = dark marble floor +stack-plasma-marble-floor = plasmarble floor +stack-uranium-marble-floor = uranium marble floor diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 02df11cbe0..448e8dbc5f 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -140,3 +140,7 @@ tiles-xeno-steel = xeno steel tile tiles-xeno-steel-corner = xeno steel corner tile tiles-xeno-maint = xeno techmaint tiles-dark-squiggly = dark steel squiggly tile +tiles-white-marble = white marble tile +tiles-dark-marble = dark marble tile +tiles-plasma-marble = plasmarble tile +tiles-uranium-marble = uranium marble tile diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 11784db3ce..fcd25b80bf 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1620,6 +1620,90 @@ graph: TileWoodLarge node: woodtilelarge +# Marble + +- type: entity + name: white marble tile + description: A chiseled, polished square of the finest Space Marble. Best not to lose it. + parent: FloorTileItemBase + id: FloorTileItemWhiteMarble + components: + - type: Sprite + state: white-marble + - type: Item + heldPrefix: white-marble + - type: FloorTile + outputs: + - Plating + - FloorWhiteMarble + - type: Stack + stackType: FloorTileWhiteMarble + +- type: entity + name: dark marble tile + description: A chiseled, polished square of the finest Space Marble. Best not to lose it. + parent: FloorTileItemWhiteMarble + id: FloorTileItemDarkMarble + components: + - type: Sprite + state: dark-marble + - type: Item + heldPrefix: dark-marble + - type: FloorTile + outputs: + - Plating + - FloorDarkMarble + - type: Stack + stackType: FloorTileDarkMarble + +- type: entity + name: plasmarble tile + description: A chiseled, polished square of the finest Space Marble. Plasma-infused for extra... something. + parent: FloorTileItemWhiteMarble + id: FloorTileItemPlasmaMarble + components: + - type: Sprite + state: plasmarble + - type: Item + heldPrefix: plasmarble + - type: FloorTile + outputs: + - Plating + - FloorPlasmaMarble + - type: Stack + stackType: FloorTilePlasmaMarble + - type: DamageOtherOnHit + damage: + types: + Blunt: 6 + +- type: entity + name: uranium marble tile + description: A chiseled, polished square of the finest Space Marble. Uranium-infused to make it extra rad! Pun intended! + parent: FloorTileItemWhiteMarble + id: FloorTileItemUraniumMarble + components: + - type: Sprite + state: uranium-marble + - type: Item + heldPrefix: uranium-marble + - type: FloorTile + outputs: + - Plating + - FloorUraniumMarble + - type: Stack + stackType: FloorTileUraniumMarble + - type: DamageOtherOnHit + damage: + types: + Blunt: 5 + Radiation: 1 + - type: PointLight + radius: 1.2 + energy: 0.8 + castShadows: false + color: "#9be792" + - type: entity id: FloorTileItemXeno parent: FloorTileItemBase diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml index 1ca30cf730..94ffd376e0 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml @@ -49,3 +49,5 @@ - FloorTileItemOldConcrete - FloorTileItemOldConcreteMono - FloorTileItemOldConcreteSmooth + - FloorTileItemWhiteMarble + - FloorTileItemDarkMarble diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml index 44ab5dbe1b..7c9bfb93a4 100644 --- a/Resources/Prototypes/Recipes/Lathes/categories.yml +++ b/Resources/Prototypes/Recipes/Lathes/categories.yml @@ -102,6 +102,10 @@ id: Wood name: lathe-category-wood +- type: latheCategory + id: Marble + name: lathe-category-marble + # Science - type: latheCategory id: Mech diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml index 832464069f..b0e6d63f68 100644 --- a/Resources/Prototypes/Recipes/Lathes/tiles.yml +++ b/Resources/Prototypes/Recipes/Lathes/tiles.yml @@ -57,6 +57,16 @@ Steel: 25 Plastic: 25 +- type: latheRecipe + abstract: true + parent: BaseTileRecipe + id: BaseMarbleTileRecipe + categories: + - Marble + materials: + Steel: 25 + Glass: 25 + ## Recipes # Steel tiles @@ -294,3 +304,14 @@ parent: BaseConcreteTileRecipe id: FloorTileItemOldConcreteSmooth result: FloorTileItemOldConcreteSmooth + +# Marble +- type: latheRecipe + parent: BaseMarbleTileRecipe + id: FloorTileItemWhiteMarble + result: FloorTileItemWhiteMarble + +- type: latheRecipe + parent: BaseMarbleTileRecipe + id: FloorTileItemDarkMarble + result: FloorTileItemDarkMarble diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index dcfbd99a23..dab0faded2 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -670,3 +670,27 @@ name: stack-dark-squiggly spawn: FloorTileItemDarkSquiggly maxCount: 30 + +- type: stack + id: FloorTileWhiteMarble + name: stack-white-marble-floor + spawn: FloorTileItemWhiteMarble + maxCount: 30 + +- type: stack + id: FloorTileDarkMarble + name: stack-dark-marble-floor + spawn: FloorTileItemDarkMarble + maxCount: 30 + +- type: stack + id: FloorTilePlasmaMarble + name: stack-plasma-marble-floor + spawn: FloorTileItemPlasmaMarble + maxCount: 30 + +- type: stack + id: FloorTileUraniumMarble + name: stack-uranium-marble-floor + spawn: FloorTileItemUraniumMarble + maxCount: 30 diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 87e71da0c9..6e3a588ab4 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -2131,3 +2131,95 @@ collection: FootstepHull itemDrop: FloorTileItemXenoMaint heatCapacity: 10000 + +- type: tile + id: FloorWhiteMarble + name: tiles-white-marble + sprite: /Textures/Tiles/white_marble.png + variants: 8 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + friction: 0.8 + itemDrop: FloorTileItemWhiteMarble + heatCapacity: 10000 + +- type: tile + id: FloorDarkMarble + name: tiles-dark-marble + sprite: /Textures/Tiles/dark_marble.png + variants: 8 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + friction: 0.8 + itemDrop: FloorTileItemDarkMarble + heatCapacity: 10000 + +- type: tile + id: FloorPlasmaMarble + name: tiles-plasma-marble + sprite: /Textures/Tiles/plasmarble.png + variants: 8 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + friction: 0.8 + itemDrop: FloorTileItemPlasmaMarble + heatCapacity: 10000 + +- type: tile + id: FloorUraniumMarble + name: tiles-uranium-marble + sprite: /Textures/Tiles/uranium_marble.png + variants: 8 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + friction: 0.8 + itemDrop: FloorTileItemUraniumMarble + heatCapacity: 10000 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-left.png new file mode 100644 index 0000000000..2f8e257064 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-right.png new file mode 100644 index 0000000000..4a4ad2baba Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble.png new file mode 100644 index 0000000000..bde15f9859 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 3902610d15..749093b344 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -581,6 +581,50 @@ }, { "name": "dark-squiggly" + }, + { + "name": "white-marble" + }, + { + "name": "white-marble-inhand-left", + "directions": 4 + }, + { + "name": "white-marble-inhand-right", + "directions": 4 + }, + { + "name": "dark-marble" + }, + { + "name": "dark-marble-inhand-left", + "directions": 4 + }, + { + "name": "dark-marble-inhand-right", + "directions": 4 + }, + { + "name": "plasmarble" + }, + { + "name": "plasmarble-inhand-left", + "directions": 4 + }, + { + "name": "plasmarble-inhand-right", + "directions": 4 + }, + { + "name": "uranium-marble" + }, + { + "name": "uranium-marble-inhand-left", + "directions": 4 + }, + { + "name": "uranium-marble-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-left.png new file mode 100644 index 0000000000..4300d7f162 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-right.png new file mode 100644 index 0000000000..7004a2f817 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble.png b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble.png new file mode 100644 index 0000000000..07cf925c79 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-left.png new file mode 100644 index 0000000000..7b01e4de4b Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-right.png new file mode 100644 index 0000000000..73e08b50b1 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble.png b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble.png new file mode 100644 index 0000000000..fdf5d3c9bf Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-left.png new file mode 100644 index 0000000000..1d40414305 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-right.png new file mode 100644 index 0000000000..08b6a5530f Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-marble.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble.png new file mode 100644 index 0000000000..ac32ff3d9b Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble.png differ diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 65b977ac1c..4999508701 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -150,3 +150,8 @@ license: "CC-BY-SA-3.0" copyright: "Created by obscenelytinyshark for space-station-14." source: "https://github.com/space-wizards/space-station-14/" + +- files: ["dark_marble.png", "white_marble.png", "plasmarble.png", "uranium_marble.png"] + license: "CC0-1.0" + copyright: "Created by SeaWyrm" + source: "https://github.com/space-wizards/space-station-14/pull/38007" diff --git a/Resources/Textures/Tiles/dark_marble.png b/Resources/Textures/Tiles/dark_marble.png new file mode 100644 index 0000000000..c603c02a17 Binary files /dev/null and b/Resources/Textures/Tiles/dark_marble.png differ diff --git a/Resources/Textures/Tiles/plasmarble.png b/Resources/Textures/Tiles/plasmarble.png new file mode 100644 index 0000000000..5f35112b3a Binary files /dev/null and b/Resources/Textures/Tiles/plasmarble.png differ diff --git a/Resources/Textures/Tiles/uranium_marble.png b/Resources/Textures/Tiles/uranium_marble.png new file mode 100644 index 0000000000..bd988ac465 Binary files /dev/null and b/Resources/Textures/Tiles/uranium_marble.png differ diff --git a/Resources/Textures/Tiles/white_marble.png b/Resources/Textures/Tiles/white_marble.png new file mode 100644 index 0000000000..d67c549b3b Binary files /dev/null and b/Resources/Textures/Tiles/white_marble.png differ