Skip to content

Commit

Permalink
Merge pull request space-wizards#4 from crystallpunk-14/flora-pack
Browse files Browse the repository at this point in the history
Немного визуала
  • Loading branch information
TheShuEd authored Mar 29, 2024
2 parents 93e39f8 + 57b82a2 commit 0646bf1
Show file tree
Hide file tree
Showing 26 changed files with 193 additions and 38 deletions.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/tiles/tiles.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tiles-cp-grass-floor = трава
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
- type: entity
abstract: true
parent: BaseWall
id: CPBaseWall
name: стена
description: достаточно прочная, чтобы прикрыть вас от угроз или холодного ветра.
placement:
mode: SnapgridCenter
snap:
- Wall

- type: entity
id: StoneRuinWall
name: каменная стена руин
parent: BaseWall
description: Эти стены повидали многое, и осталось им недолго.
components:
- type: Sprite
sprite: CrystallPunk/Structures/Walls/ruin_stone.rsi
- type: Icon
sprite: CrystallPunk/Structures/Walls/ruin_stone.rsi
- type: IconSmooth
key: CPwalls
base: brick

- type: entity
id: StoneRuinFragment
parent: BaseRock
name: обломки каменных руин
description: Это все, что осталось от былого величия.
placement:
mode: SnapgridCenter
snap:
- Wall
components:
- type: Sprite
sprite: CrystallPunk/Structures/Walls/ruin_stone.rsi
snapCardinals: true
layers:
- state: fragment1
map: ["random"]
- type: RandomSprite
available:
- random:
fragment1: ""
fragment2: ""
fragment3: ""
fragment4: ""
31 changes: 31 additions & 0 deletions Resources/Prototypes/CrystallPunk/Tiles/natural.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
- type: tile
id: FloorPlanetGrassCP
name: tiles-cp-grass-floor
sprite: /Textures/CrystallPunk/Tiles/Grass/grass.png
variants: 8
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
edgeSpritePriority: 1
edgeSprites:
SouthEast: /Textures/CrystallPunk/Tiles/Grass/single_edge.png
NorthEast: /Textures/CrystallPunk/Tiles/Grass/single_edge.png
NorthWest: /Textures/CrystallPunk/Tiles/Grass/single_edge.png
SouthWest: /Textures/CrystallPunk/Tiles/Grass/single_edge.png
South: /Textures/CrystallPunk/Tiles/Grass/double_edge.png
East: /Textures/CrystallPunk/Tiles/Grass/double_edge.png
North: /Textures/CrystallPunk/Tiles/Grass/double_edge.png
West: /Textures/CrystallPunk/Tiles/Grass/double_edge.png
baseTurf: FloorPlanetGrass
isSubfloor: true
footstepSounds:
collection: FootstepGrass
heatCapacity: 10000
weather: true
indestructible: true
80 changes: 42 additions & 38 deletions Resources/Prototypes/lobbyscreens.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,43 @@
- type: lobbyBackground
id: Robotics
background: /Textures/LobbyScreens/robotics.webp

- type: lobbyBackground
id: Supermatter
background: /Textures/LobbyScreens/supermatter.webp

- type: lobbyBackground
id: Warden
background: /Textures/LobbyScreens/warden.webp

- type: lobbyBackground
id: Pharmacy
background: /Textures/LobbyScreens/pharmacy.webp

- type: lobbyBackground
id: SSXIV
background: /Textures/LobbyScreens/ssxiv.webp

- type: lobbyBackground
id: Susstation
background: /Textures/LobbyScreens/susstation.webp

- type: lobbyBackground
id: SkellyVsTheRev
background: /Textures/LobbyScreens/skellyvstherev.webp

- type: lobbyBackground
id: Doomed
background: /Textures/LobbyScreens/doomed.webp

- type: lobbyBackground
id: Blueprint
background: /Textures/LobbyScreens/blueprint.webp

- type: lobbyBackground
id: Behonker
background: /Textures/LobbyScreens/behonker.webp
id: CPBeginning
background: /Textures/CrystallPunk/LobbyScreens/beginning.webp

#- type: lobbyBackground
# id: Robotics
# background: /Textures/LobbyScreens/robotics.webp
#
#- type: lobbyBackground
# id: Supermatter
# background: /Textures/LobbyScreens/supermatter.webp
#
#- type: lobbyBackground
# id: Warden
# background: /Textures/LobbyScreens/warden.webp
#
#- type: lobbyBackground
# id: Pharmacy
# background: /Textures/LobbyScreens/pharmacy.webp
#
#- type: lobbyBackground
# id: SSXIV
# background: /Textures/LobbyScreens/ssxiv.webp
#
#- type: lobbyBackground
# id: Susstation
# background: /Textures/LobbyScreens/susstation.webp
#
#- type: lobbyBackground
# id: SkellyVsTheRev
# background: /Textures/LobbyScreens/skellyvstherev.webp
#
#- type: lobbyBackground
# id: Doomed
# background: /Textures/LobbyScreens/doomed.webp
#
#- type: lobbyBackground
# id: Blueprint
# background: /Textures/LobbyScreens/blueprint.webp
#
#- type: lobbyBackground
# id: Behonker
# background: /Textures/LobbyScreens/behonker.webp
4 changes: 4 additions & 0 deletions Resources/Textures/CrystallPunk/LobbyScreens/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["beginning.webp"]
license: "CC-BY-NC-SA-3.0"
copyright: "alisw_a on discord"
source: "https://github.com/crystallpunk-14/crystall-punk-14"
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
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.
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd for CrystallPunk14",
"states": [
{
"name": "brick0",
"directions": 4
},
{
"name": "brick1",
"directions": 4
},
{
"name": "brick2",
"directions": 4
},
{
"name": "brick3",
"directions": 4
},
{
"name": "brick4",
"directions": 4
},
{
"name": "brick5",
"directions": 4
},
{
"name": "brick6",
"directions": 4
},
{
"name": "brick7",
"directions": 4
},
{
"name": "full"
},
{
"name": "fragment1"
},
{
"name": "fragment2"
},
{
"name": "fragment3"
},
{
"name": "fragment4"
}
]
}
7 changes: 7 additions & 0 deletions Resources/Textures/CrystallPunk/Tiles/Grass/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- files:
- grass.png
- double_edge.png
- single_edge.png
license: "CC-BY-SA-3.0"
copyright: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82, recolored by TheShuEd for CrystallPunk14"
source: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82"
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.

0 comments on commit 0646bf1

Please sign in to comment.