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

Цветы #620

Merged
merged 2 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-RedFlowers = букет красных цветов
.desc = Красиво уложенный букет кроваво-красных цветов. Приятно пахнет.
ent-BlueFlowers = букет голубых цветов
.desc = Красиво уложенный букет голубых, словно небо, цветов. Приятно пахнет.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-bouquet = Букет
.desc = Букет душистых цветов.
ent-Bouquet = букет кровавых цветов
.desc = Букет цветов, окрашенных в кровавые оттенки. Выглядит завораживающе. Вкусно пахнет.
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
BoxCandleSmall: 2
Urn: 5
Bible: 1
RedFlowers: 3 # Sunrise
BlueFlowers: 3 # Sunrise
emaggedInventory:
ClothingOuterArmorCult: 1
ClothingHeadHelmetCult: 1
Expand Down
19 changes: 19 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Objects/Fun/flowers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
parent: BaseItem
id: RedFlowers
name: red flower bouquet
description: A beautifully arranged bouquet of blood-red flowers. Smells good.
components:
- type: Sprite
sprite: _Sunrise/Objects/Fun/red_flowers.rsi
state: item

- type: entity
parent: BaseItem
id: BlueFlowers
name: red flower bouquet
description: A beautifully arranged bouquet of sky-blue flowers. Smells good.
components:
- type: Sprite
sprite: _Sunrise/Objects/Fun/blue_flowers.rsi
state: item
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
- type: entity
parent: BaseItem
id: Bouquet
name: bouquet
name: blood flowers bouquet
description: A bouquet of blood-colored flowers. It looks fascinating and smells delicious.
components:
- type: Sprite
sprite: _Sunrise/Objects/Misc/bouquet.rsi
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by tg @Salko_f",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "item"
}
]
}
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,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by tg @Salko_f",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "item"
}
]
}
Loading