Marble tiles (#38007)

* Create marble tile textures

* Flatten tiles to better match art style

* Add prototypes and translations for tiles

* Change marble footstep sound to one that makes sense

* Add marble tile object and in-hand sprites

* Add prototypes and translations for marble tile objects

* Add marble tile cutter recipes

* Double number of marble tile variants

* Increase plasma and uranium costs of plasmarble and uranium marble

* Add attributions for marble tile sprites

* Fix whitespace problem hopefully

* Fix trailing whitespace take 2

* Rename just "marble" marble to "white marble"

* Remove cutter recipes for uranium marble and plasmarble

diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl
index f36bbe1ae7f565fbe33259db15ab3bc37be4e85e..0c96aa6edb9f42ce665570c927b8228843e82baa 100644 (file)
--- 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 f1380800ce610ebb932f157fd2f9ebdfb3774b32..d83825b614164d981e431cf8052834e7f43d4278 100644 (file)
--- 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 02df11cbe0af14e9def1a4fcaa1c68466bb33b2f..448e8dbc5fcce485ab8cf0fc73a08ba666a883ec 100644 (file)
--- 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 11784db3ce5dc89dae77f8cfa5f56e57590f9b7f..fcd25b80bf7fa32285ff7f206b60ff1c259c902e 100644 (file)
--- 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 1ca30cf730e7fef48225e4a29314ada79d36d3df..94ffd376e04fdc326d7206670947527a288d199b 100644 (file)
--- 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 44ab5dbe1bc1cd9baaf03b809b8b8ab9eb38cf1d..7c9bfb93a40e5e8c84d39f95b3eaf18b2cc3b519 100644 (file)
--- 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 832464069fc576ea502635a97c96733f439d7d49..b0e6d63f68b12556248cf7acf2c5a1ae8654d1e3 100644 (file)
--- 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 dcfbd99a2307d3396430caf7243b37ec3bbad365..dab0faded2047a2228a7716f7d6235e5845a095c 100644 (file)
--- 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 87e71da0c9d9740df5b02344938b37885458bae5..6e3a588ab49d9e1db0028d0e928704910e3775f6 100644 (file)
--- 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 (file)
index 0000000..2f8e257
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 (file)
index 0000000..4a4ad2b
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 (file)
index 0000000..bde15f9
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 3902610d1568408da578b386aafea725871e067a..749093b344f0ed266dc7487e775ffcb72244ea05 100644 (file)
--- 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 (file)
index 0000000..4300d7f
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 (file)
index 0000000..7004a2f
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 (file)
index 0000000..07cf925
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 (file)
index 0000000..7b01e4d
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 (file)
index 0000000..73e08b5
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 (file)
index 0000000..fdf5d3c
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 (file)
index 0000000..1d40414
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 (file)
index 0000000..08b6a55
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 (file)
index 0000000..ac32ff3
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 65b977ac1c1ecd5f82be136e1f0cbc32cc1d709f..4999508701ca1b4f495e813b35bdb7f98bda7e4d 100644 (file)
--- 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 (file)
index 0000000..c603c02
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 (file)
index 0000000..5f35112
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 (file)
index 0000000..bd988ac
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 (file)
index 0000000..d67c549
Binary files /dev/null and b/Resources/Textures/Tiles/white_marble.png differ