Skip to content

Commit

Permalink
New tiles and resprite (SerbiaStrong-220#775)
Browse files Browse the repository at this point in the history
* resprite, sprites and attrib

* new tiles

* fixes

* pr number
  • Loading branch information
Kit0vras authored Feb 24, 2024
1 parent 395ada2 commit c7ef773
Show file tree
Hide file tree
Showing 33 changed files with 322 additions and 6 deletions.
82 changes: 82 additions & 0 deletions Resources/Prototypes/SS220/Entities/Objects/Misc/tiles.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
- type: entity
name: стальная шестиугольная плитка
parent: FloorTileItemBase
id: FloorTileItemSteelReinforced
components:
- type: Sprite
sprite: SS220/Objects/Tiles/tile.rsi
state: steelreinf
- type: Item
sprite: SS220/Objects/Tiles/tile.rsi
heldPrefix: steelreinf
- type: FloorTile
outputs:
- Plating
- FloorSteelReinforced
- type: Stack
stackType: FloorTileSteelReinforced

- type: entity
name: белая шестиугольная плитка
parent: FloorTileItemSteelReinforced
id: FloorTileItemWhiteReinforced
components:
- type: Sprite
state: whitereinf
- type: Item
heldPrefix: whitereinf
- type: FloorTile
outputs:
- Plating
- FloorWhiteReinforced
- type: Stack
stackType: FloorTileWhiteReinforced

- type: entity
name: тёмная шестиугольная плитка
parent: FloorTileItemSteelReinforced
id: FloorTileItemDarkReinforced
components:
- type: Sprite
state: darkreinf
- type: Item
heldPrefix: darkreinf
- type: FloorTile
outputs:
- Plating
- FloorDarkReinforced
- type: Stack
stackType: FloorTileDarkReinforced

- type: entity
name: керамическая плитка
parent: FloorTileItemBase
id: FloorTileItemDutch
components:
- type: Sprite
sprite: SS220/Objects/Tiles/tile.rsi
state: dutch
- type: Item
sprite: SS220/Objects/Tiles/tile.rsi
heldPrefix: dutch
- type: FloorTile
outputs:
- Plating
- FloorDutch
- type: Stack
stackType: FloorTileDutch

- type: entity
name: керамическая мини-плитка
parent: FloorTileItemDutch
id: FloorTileItemDutchMini
components:
- type: Sprite
state: dutchmini
- type: FloorTile
outputs:
- Plating
- FloorDutchMini
- type: Stack
stackType: FloorTileDutchMini
35 changes: 35 additions & 0 deletions Resources/Prototypes/SS220/Stacks/floor_tile_stacks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
- type: stack
id: FloorTileSteelReinforced
name: стальная шестиугольная плитка
spawn: FloorTileItemSteelReinforced
maxCount: 30
itemSize: 5

- type: stack
id: FloorTileWhiteReinforced
name: белая шестиугольная плитка
spawn: FloorTileItemWhiteReinforced
maxCount: 30
itemSize: 5

- type: stack
id: FloorTileDarkReinforced
name: тёмная шестиугольная плитка
spawn: FloorTileItemDarkReinforced
maxCount: 30
itemSize: 5

- type: stack
id: FloorTileDutch
name: керамическая плитка
spawn: FloorTileItemDutch
maxCount: 30
itemSize: 5

- type: stack
id: FloorTileDutchMini
name: керамическая мини-плитка
spawn: FloorTileItemDutchMini
maxCount: 30
itemSize: 5
132 changes: 132 additions & 0 deletions Resources/Prototypes/SS220/Tiles/floors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
- type: tile
id: FloorSteelReinforced
name: стальные шестиугольные плиты
sprite: /Textures/SS220/Tiles/steel_reinforced.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepFloor
itemDrop: FloorTileItemSteelReinforced
heatCapacity: 10000

- type: tile
id: FloorWhiteReinforced
name: белые шестиугольные плиты
sprite: /Textures/SS220/Tiles/white_reinforced.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepFloor
itemDrop: FloorTileItemWhiteReinforced
heatCapacity: 10000

- type: tile
id: FloorDarkReinforced
name: тёмные шестиугольные плиты
sprite: /Textures/SS220/Tiles/dark_reinforced.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepFloor
itemDrop: FloorTileItemDarkReinforced
heatCapacity: 10000

- type: tile
id: FloorTechMaintMono
name: стальной технический моно пол
sprite: /Textures/SS220/Tiles/steel_maint_mono.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepHull
itemDrop: FloorTileItemSteelMaint
heatCapacity: 10000

- type: tile
id: FloorTechMaintDrain
name: технический пол с вертикальной решёткой
sprite: /Textures/SS220/Tiles/tech_maint_drain.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepHull
itemDrop: FloorTileItemTechmaint
heatCapacity: 10000

- type: tile
id: FloorTechMaintDrainHorizontal
name: технический пол с горизонтальной решёткой
sprite: /Textures/SS220/Tiles/tech_maint_drain_horizontal.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepHull
itemDrop: FloorTileItemTechmaint
heatCapacity: 10000

- type: tile
id: FloorTechMaintDrainMiddle
name: технический пол с центральной решёткой
sprite: /Textures/SS220/Tiles/tech_maint_drain_middle.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepHull
itemDrop: FloorTileItemTechmaint
heatCapacity: 10000

- type: tile
id: FloorDutch
name: керамическая плитка
sprite: /Textures/SS220/Tiles/dutch.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepFloor
itemDrop: FloorTileItemDutch
heatCapacity: 10000

- type: tile
id: FloorDutchHorizontal
name: керамическая горизонтальная плитка
sprite: /Textures/SS220/Tiles/dutch_horizontal.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepFloor
itemDrop: FloorTileItemDutch
heatCapacity: 10000

- type: tile
id: FloorDutchMini
name: керамическая мини-плитка
sprite: /Textures/SS220/Tiles/dutch_mini.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepFloor
itemDrop: FloorTileItemDutchMini
heatCapacity: 10000

- type: tile
id: FloorDutchMiniHorizontal
name: керамическая горизонтальная мини-плитка
sprite: /Textures/SS220/Tiles/dutch_horizontal_mini.png
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepFloor
itemDrop: FloorTileItemDutchMini
heatCapacity: 10000
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 58 additions & 0 deletions Resources/Textures/SS220/Objects/Tiles/tile.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by Kit0vras (Github) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "steelreinf"
},
{
"name": "whitereinf"
},
{
"name": "darkreinf"
},
{
"name": "dutch"
},
{
"name": "dutchmini"
},
{
"name": "steelreinf-inhand-right",
"directions": 4
},
{
"name": "steelreinf-inhand-left",
"directions": 4
},
{
"name": "whitereinf-inhand-right",
"directions": 4
},
{
"name": "whitereinf-inhand-left",
"directions": 4
},
{
"name": "darkreinf-inhand-right",
"directions": 4
},
{
"name": "darkreinf-inhand-left",
"directions": 4
},
{
"name": "dutch-inhand-right",
"directions": 4
},
{
"name": "dutch-inhand-left",
"directions": 4
}
]
}
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.
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.
14 changes: 14 additions & 0 deletions Resources/Textures/SS220/Tiles/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- files: [ "tech_maint_drain.png", "tech_maint_drain_horizontal.png", "tech_maint_drain_middle.png", "steel_maint_mono.png"]
license: "Custom"
copyright: "Created by github user @Kit0vras. EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt"
source: "https://github.com/SerbiaStrong-220/space-station-14/pull/775"

- files: ["steel_reinforced.png, dark_reinforced.png, white_reinforced.png"]
license: "CC-BY-SA-3.0"
copyright: "Modified from reinforced.png by github user @Kit0vras"
source: "https://github.com/SerbiaStrong-220/space-station-14/pull/775"

- files: [ "dutch.png", "dutch_horizontal.png", "dutch_mini.png", "dutch_horizontal_mini.png"]
license: "Custom"
copyright: "Created by github user @Kit0vras. EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt"
source: "https://github.com/SerbiaStrong-220/space-station-14/pull/775"
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/SS220/Tiles/dutch.png
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 added Resources/Textures/SS220/Tiles/dutch_mini.png
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 added Resources/Textures/SS220/Tiles/tech_maint_drain.png
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.
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.
7 changes: 1 addition & 6 deletions Resources/Textures/Tiles/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
copyright: "Modified from plating.png by github user @Kit0vras" #SS220-Tile-Resprite
source: "https://github.com/SerbiaStrong-220/space-station-14/pull/660"

- files: ["blue.png", "blue_circuit.png", "cropped_parallax.png", "eighties.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "snow.png", "wood.png", "wood_tile.png", "wood_broken.png"]
- files: ["blue.png", "blue_circuit.png", "cropped_parallax.png", "eighties.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "snow.png", "wood.png", "wood_tile.png", "wood_broken.png", "wood_large.png"]
license: "CC-BY-SA-3.0"
copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax. Wood tiles are new tg tiles, repaletted by TheArturZh using colors of old wood tiles."
source: "https://github.com/tgstation/tgstation/"
Expand Down Expand Up @@ -115,8 +115,3 @@
license: "CC0-1.0"
copyright: "Created by TheShuEd (github) for space-station-14."
source: "https://github.com/space-wizards/space-station-14/pull/ED_INSERT_PR_CODE_HERE!"

- files: ["wood_large.png"]
license: "CC0-1.0"
copyright: "Created by ps3moira (github) for space-station-14."
source: "https://github.com/space-wizards/space-station-14/"
Binary file modified Resources/Textures/Tiles/tech_maint.png
Binary file modified Resources/Textures/Tiles/wood_large.png

0 comments on commit c7ef773

Please sign in to comment.