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
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -49,3 +49,5 @@
|
||||
- FloorTileItemOldConcrete
|
||||
- FloorTileItemOldConcreteMono
|
||||
- FloorTileItemOldConcreteSmooth
|
||||
- FloorTileItemWhiteMarble
|
||||
- FloorTileItemDarkMarble
|
||||
|
||||
@@ -102,6 +102,10 @@
|
||||
id: Wood
|
||||
name: lathe-category-wood
|
||||
|
||||
- type: latheCategory
|
||||
id: Marble
|
||||
name: lathe-category-marble
|
||||
|
||||
# Science
|
||||
- type: latheCategory
|
||||
id: Mech
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
After Width: | Height: | Size: 381 B |
|
After Width: | Height: | Size: 376 B |
BIN
Resources/Textures/Objects/Tiles/tile.rsi/dark-marble.png
Normal file
|
After Width: | Height: | Size: 467 B |
@@ -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
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
After Width: | Height: | Size: 396 B |
|
After Width: | Height: | Size: 414 B |
BIN
Resources/Textures/Objects/Tiles/tile.rsi/plasmarble.png
Normal file
|
After Width: | Height: | Size: 618 B |
|
After Width: | Height: | Size: 413 B |
|
After Width: | Height: | Size: 402 B |
BIN
Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble.png
Normal file
|
After Width: | Height: | Size: 512 B |
|
After Width: | Height: | Size: 416 B |
|
After Width: | Height: | Size: 401 B |
BIN
Resources/Textures/Objects/Tiles/tile.rsi/white-marble.png
Normal file
|
After Width: | Height: | Size: 631 B |
@@ -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"
|
||||
|
||||
BIN
Resources/Textures/Tiles/dark_marble.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
Resources/Textures/Tiles/plasmarble.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
Resources/Textures/Tiles/uranium_marble.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
Resources/Textures/Tiles/white_marble.png
Normal file
|
After Width: | Height: | Size: 14 KiB |