Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Astro Asteroid Sand #34463

Merged
merged 11 commits into from
Jan 30, 2025
1 change: 1 addition & 0 deletions Resources/Locale/en-US/tiles/tiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,5 @@ tiles-mowed-astro-grass = mowed astro-grass
tiles-jungle-astro-grass = jungle astro-grass
tiles-astro-ice = astro-ice
tiles-astro-snow = astro-snow
tiles-astro-asteroid-sand = astro-asteroid-sand
southbridge-fur marked this conversation as resolved.
Show resolved Hide resolved
tiles-wood-large = large wood
17 changes: 17 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1548,6 +1548,23 @@
- type: Stack
stackType: FloorTileAstroSnow

- type: entity
id: FloorTileItemAstroAsteroidSand
parent: FloorTileItemBase
name: asteroid astro-sand
description: Fake sand. Luckily, it's not as coarse as the real thing.
components:
- type: Sprite
state: asteroid
- type: Item
heldPrefix: asteroid
- type: FloorTile
outputs:
- Plating
- FloorAstroAsteroidSand
- type: Stack
stackType: FloorTileAstroAsteroidSand

- type: entity
name: large wood floor
parent: FloorTileItemBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@
- FauxTileJungleAstroGrass
- FauxTileAstroIce
- FauxTileAstroSnow
- FauxTileAstroAsteroidSand
- OreBagOfHolding
- DeviceQuantumSpinInverter
- type: EmagLatheRecipes
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@
id: FauxTileAstroSnow
result: FloorTileItemAstroSnow

- type: latheRecipe
parent: BaseFauxTileRecipe
id: FauxTileAstroAsteroidSand
result: FloorTileItemAstroAsteroidSand

- type: latheRecipe
id: FloorGreenCircuit
result: FloorTileItemGCircuit4
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Research/civilianservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
- FauxTileJungleAstroGrass
- FauxTileAstroIce
- FauxTileAstroSnow
- FauxTileAstroAsteroidSand

- type: technology
id: BiochemicalStasis
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Stacks/floor_tile_stacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,12 @@
spawn: FloorTileItemAstroSnow
maxCount: 30

- type: stack
id: FloorTileAstroAsteroidSand
name: asteroid astro-sand floor
spawn: FloorTileItemAstroAsteroidSand
maxCount: 30

- type: stack
id: FloorTileWoodLarge
name: large wood floor
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Tiles/floors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1915,6 +1915,17 @@
deconstructTools: [ Prying ]
itemDrop: FloorTileItemAstroSnow

# Asteroid Sand
- type: tile
id: FloorAstroAsteroidSand
name: tiles-astro-asteroid-sand
parent: FloorAsteroidSand
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
itemDrop: FloorTileItemAstroAsteroidSand
weather: false

- type: tile
id: FloorWoodLarge
name: tiles-wood-large
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Tiles/tile.rsi/astroice.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion Resources/Textures/Objects/Tiles/tile.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional copyrights see tiles folder.",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile modification, Astreroid tile and in-hands created by Southbridge-fur (github)",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -549,6 +549,17 @@
},
{
"name": "wood-large"
},
{
"name": "asteroid"
},
{
"name": "asteroid-inhand-right",
"directions": 4
},
{
"name": "asteroid-inhand-left",
"directions": 4
}
]
}
Loading