Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Reorganizes tiles, you can craft wood and steel ones now (#3484)

Browse Source 
* Tile RSI/YAML cleanup

* Changes tile stack from 8 to 30

* Tiles actually damage when you throw them

* Removed bad tiles and rest actually fucking work now

* If I write one more line of yaml i'll cut my dick off

* fixed was very tired
This commit is contained in:
Swept
2021-03-06 05:41:53 +00:00
committed by GitHub
parent ea1196fd42
commit ade17074ba
49 changed files with 381 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_brown-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/brown-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 222 B

After

Width:  |  Height:  |  Size: 222 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_brown-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/brown-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 227 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/carpet-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 375 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/carpet-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet.png → Resources/Textures/Objects/Tiles/tile.rsi/carpet.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 509 B

After

Width:  |  Height:  |  Size: 509 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_dark-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/dark-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 308 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_dark-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/dark-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 317 B

After

Width:  |  Height:  |  Size: 317 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_dark.png → Resources/Textures/Objects/Tiles/tile.rsi/dark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 198 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_techfloor_grid.png → Resources/Textures/Objects/Tiles/tile.rsi/dark_techfloor_grid.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_dirty.png → Resources/Textures/Objects/Tiles/tile.rsi/dirty.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 316 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/gcircuit-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 285 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/gcircuit-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 288 B

After

Width:  |  Height:  |  Size: 288 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit.png → Resources/Textures/Objects/Tiles/tile.rsi/gcircuit.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_gold-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/gold-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 278 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_gold-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/gold-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 271 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_gold.png → Resources/Textures/Objects/Tiles/tile.rsi/gold.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 408 B

After

Width:  |  Height:  |  Size: 408 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/hydro-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 312 B

After

Width:  |  Height:  |  Size: 312 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/hydro-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 321 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro.png → Resources/Textures/Objects/Tiles/tile.rsi/hydro.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 239 B

After

Width:  |  Height:  |  Size: 239 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 199 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 199 B

589
Resources/Textures/Objects/Tiles/tile.rsi/meta.json
View File

@@ -1,613 +1,166 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "tile_dark",
"delays": [
[
1
]
]
"name": "dark"
},
{
"name": "tile_dirty",
"delays": [
[
1
]
]
"name": "dirty"
},
{
"name": "tile_gcircuit",
"delays": [
[
1
]
]
"name": "gcircuit"
},
{
"name": "tile_hydro",
"delays": [
[
1
]
]
"name": "hydro"
},
{
"name": "tile_plating",
"delays": [
[
1
]
]
"name": "plating"
},
{
"name": "tile_reinforced",
"delays": [
[
1
]
]
"name": "reinforced"
},
{
"name": "tile_rockvault",
"delays": [
[
1
]
]
"name": "rockvault"
},
{
"name": "tile_gold",
"delays": [
[
1
]
]
"name": "gold"
},
{
"name": "tile_showroom",
"delays": [
[
1
]
]
"name": "showroom"
},
{
"name": "tile_snow",
"delays": [
[
1
]
]
"name": "snow"
},
{
"name": "tile_steel",
"delays": [
[
1
]
]
"name": "steel"
},
{
"name": "tile_steel_techfloor_grid",
"delays": [
[
1
]
]
"name": "steel_techfloor_grid"
},
{
"name": "tile_dark_techfloor_grid",
"delays": [
[
1
]
]
"name": "dark_techfloor_grid"
},
{
"name": "tile_white",
"delays": [
[
1
]
]
"name": "white"
},
{
"name": "tile_white_monofloor",
"delays": [
[
1
]
]
"name": "white_monofloor"
},
{
"name": "tile_wood",
"delays": [
[
1
]
]
"name": "wood"
},
{
"name": "tile_carpet",
"delays": [
[
1
]
]
"name": "carpet"
},
{
"name": "tile_brown-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "brown-inhand-left",
"directions": 4
},
{
"name": "tile_brown-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "brown-inhand-right",
"directions": 4
},
{
"name": "tile_carpet-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "carpet-inhand-left",
"directions": 4
},
{
"name": "tile_carpet-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "carpet-inhand-right",
"directions": 4
},
{
"name": "tile_dark-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "dark-inhand-right",
"directions": 4
},
{
"name": "tile_dark-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "dark-inhand-left",
"directions": 4
},
{
"name": "tile_gcircuit-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "gcircuit-inhand-right",
"directions": 4
},
{
"name": "tile_gcircuit-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "gcircuit-inhand-left",
"directions": 4
},
{
"name": "tile_gold-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "gold-inhand-right",
"directions": 4
},
{
"name": "tile_gold-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "gold-inhand-left",
"directions": 4
},
{
"name": "tile_reinforced-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "reinforced-inhand-right",
"directions": 4
},
{
"name": "tile_reinforced-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "reinforced-inhand-left",
"directions": 4
},
{
"name": "tile_showroom-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "showroom-inhand-right",
"directions": 4
},
{
"name": "tile_showroom-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "showroom-inhand-left",
"directions": 4
},
{
"name": "tile_silver-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "silver-inhand-right",
"directions": 4
},
{
"name": "tile_silver-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "silver-inhand-left",
"directions": 4
},
{
"name": "tile_white-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "white-inhand-right",
"directions": 4
},
{
"name": "tile_white-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "white-inhand-left",
"directions": 4
},
{
"name": "tile_wood-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "wood-inhand-right",
"directions": 4
},
{
"name": "tile_wood-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "wood-inhand-left",
"directions": 4
},
{
"name": "tile-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "inhand-right",
"directions": 4
},
{
"name": "tile-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "inhand-left",
"directions": 4
},
{
"name": "tile_steel-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "steel-inhand-right",
"directions": 4
},
{
"name": "tile_steel-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "steel-inhand-left",
"directions": 4
},
{
"name": "tile_hydro-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "hydro-inhand-right",
"directions": 4
},
{
"name": "tile_hydro-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "hydro-inhand-left",
"directions": 4
},
]
}

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_plating.png → Resources/Textures/Objects/Tiles/tile.rsi/plating.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 212 B

After

Width:  |  Height:  |  Size: 212 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/reinforced-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 253 B

After

Width:  |  Height:  |  Size: 253 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/reinforced-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 270 B

After

Width:  |  Height:  |  Size: 270 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced.png → Resources/Textures/Objects/Tiles/tile.rsi/reinforced.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_rockvault.png → Resources/Textures/Objects/Tiles/tile.rsi/rockvault.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 193 B

After

Width:  |  Height:  |  Size: 193 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/showroom-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 245 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/showroom-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 249 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom.png → Resources/Textures/Objects/Tiles/tile.rsi/showroom.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 198 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_silver-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/silver-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 272 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_silver-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/silver-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 276 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_snow.png → Resources/Textures/Objects/Tiles/tile.rsi/snow.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 465 B

After

Width:  |  Height:  |  Size: 465 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_steel-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/steel-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 309 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_steel-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/steel-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 314 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_steel.png → Resources/Textures/Objects/Tiles/tile.rsi/steel.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 204 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_techfloor_grid.png → Resources/Textures/Objects/Tiles/tile.rsi/steel_techfloor_grid.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_white-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/white-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 216 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_white-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/white-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 220 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_white.png → Resources/Textures/Objects/Tiles/tile.rsi/white.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 203 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_white_monofloor.png → Resources/Textures/Objects/Tiles/tile.rsi/white_monofloor.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 226 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_wood-inhand-left.png → Resources/Textures/Objects/Tiles/tile.rsi/wood-inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 254 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_wood-inhand-right.png → Resources/Textures/Objects/Tiles/tile.rsi/wood-inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 261 B

0
Resources/Textures/Objects/Tiles/tile.rsi/tile_wood.png → Resources/Textures/Objects/Tiles/tile.rsi/wood.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 314 B