forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Flowers Update * Flower Update X2 * Flowers update X3 * Flowers Update X4 * Flowers Update X5 * Flowers Update X6 * Flowers Update X6 * Flowers Update X7 * Flowers Update X8 * Flowers Update X9 * Flowers Update X10 * Update Resources/Prototypes/SS220/Entities/Clothing/Head/flowers/ClothingWSFlowerhead.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Entities/Clothing/Head/flowers/ClothingSFlowerhead.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Entities/Objects/Fun/flowersbouquet.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Entities/Objects/Fun/flowersbouquet.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/flowers/flowers.ftl Co-authored-by: Kit0vras <[email protected]> * Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/flowers/flowers.ftl Co-authored-by: Kit0vras <[email protected]> * Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/flowers/flowers.ftl Co-authored-by: Kit0vras <[email protected]> * Update Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl Co-authored-by: Kit0vras <[email protected]> * Update Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl Co-authored-by: Kit0vras <[email protected]> * Flowers Update X11 * Flowers Update X12 * Flowers Update X13 * Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/flowers/flowers.ftl Co-authored-by: Kit0vras <[email protected]> * Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/flowers/flowers.ftl Co-authored-by: Kit0vras <[email protected]> * Apply suggestions from code review Co-authored-by: Kit0vras <[email protected]> --------- Co-authored-by: Kit0vras <[email protected]>
- Loading branch information
Showing
189 changed files
with
1,707 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/flowers/flowers.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| ent-wtulip = белый тюльпан | ||
| .suffix = цветок | ||
| .desc = Яркий луч надежды в серой реальности, манящий своей красотой и неповторимостью. | ||
| ent-ytulip = желтый тюльпан | ||
| .suffix = цветок | ||
| .desc = Яркий луч надежды в серой реальности, манящий своей красотой и неповторимостью. | ||
| ent-ptulip = розовый тюльпан | ||
| .suffix = цветок | ||
| .desc = Яркий луч надежды в серой реальности, манящий своей красотой и неповторимостью. | ||
| ent-rclove = красная гвоздика | ||
| .suffix = цветок | ||
| .desc = Лепестки цветка, словно огоньки в темноте, наполняют серое настроение теплом и светом, вдохновляя на новые подвиги. | ||
| ent-wclove = белая гвоздика | ||
| .suffix = цветок | ||
| .desc = Лепестки цветка, словно огоньки в темноте, наполняют серое настроение теплом и светом, вдохновляя на новые подвиги. | ||
| ent-schamomile = космическая ромашка | ||
| .suffix = цветок | ||
| .desc = Прекрасно милый цветок! Его запах наполняет космической свежестью. | ||
| ent-wschamomile = белая космическая ромашка | ||
| .suffix = цветок | ||
| .desc = Солнечный луч в серых буднях, напоминающий о радуге возможностей и пробуждающий в сердце ощущение весны. | ||
| ent-sflower = алоцвет | ||
| .suffix = цветок | ||
| .desc = Яркий и страстный цветок, переливающийся огненными оттенками, наполняющий сердца теплом и рвением к действию. | ||
| ent-lflower = Лампоцвет | ||
| .suffix = цветок | ||
| .desc = Цветок, освещающий путь к невероятным идеям и волнующим открытиям. | ||
| ent-lclove = лампоцвет | ||
| .suffix = цветок | ||
| .desc = Цветок, освещающий путь к невероятным идеям и волнующим открытиям. | ||
| ent-wrose = белая роза | ||
| .suffix = цветок | ||
| .desc = Символ любви и элегантности - роскошный цветок, символизирующий страсть и утончённость. | ||
| ent-rrose = красная роза | ||
| .suffix = цветок | ||
| .desc = Символ любви и элегантности - роскошный цветок, символизирующий страсть и утончённость. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
Resources/Prototypes/Entities/Objects/Fun/flowersbouquet.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| - type: entity | ||
| parent: BaseItem | ||
| id: FlowersBouquet | ||
| name: букет космических цветов | ||
| description: Прекрасный благоухающий цветочный букет. | ||
| components: | ||
| - type: Sprite | ||
| sprite: SS220/Objects/Fun/flowersbouquet.rsi | ||
| state: icon | ||
| - type: Item | ||
| sprite: SS220/Objects/Fun/flowersbouquet.rsi | ||
| - type: Construction | ||
| graph: flowersbouqlet | ||
| node: Flowersbouqlet |
13 changes: 13 additions & 0 deletions
13
Resources/Prototypes/SS220/Entities/Clothing/Head/flowers/ClothingSFlowerhead.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| - type: entity | ||
| parent: ClothingHeadBase | ||
| id: ClothingSFlowerhead | ||
| name: венок из космических ромашек | ||
| description: Лёгкий и нежный цветочный оберег. | ||
| components: | ||
| - type: Sprite | ||
| sprite: SS220/Clothing/Head/Hats/sflowerhead.rsi | ||
| - type: Clothing | ||
| sprite: SS220/Clothing/Head/Hats/sflowerhead.rsi | ||
| - type: Construction | ||
| graph: Clothingsflowerhead | ||
| node: ClothingSFlowerhead |
13 changes: 13 additions & 0 deletions
13
Resources/Prototypes/SS220/Entities/Clothing/Head/flowers/ClothingWSFlowerhead.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| - type: entity | ||
| parent: ClothingHeadBase | ||
| id: ClothingWSFlowerhead | ||
| name: венок из белых космических ромашек | ||
| description: Лёгкий и нежный цветочный оберег. | ||
| components: | ||
| - type: Sprite | ||
| sprite: SS220/Clothing/Head/Hats/wsflowerhead.rsi | ||
| - type: Clothing | ||
| sprite: SS220/Clothing/Head/Hats/wsflowerhead.rsi | ||
| - type: Construction | ||
| graph: Clothingwsflowerhead | ||
| node: ClothingWSFlowerhead |
99 changes: 99 additions & 0 deletions
99
Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/vase.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| - type: entity | ||
| name: Glass Vase | ||
| description: strangely shaped glass vase, what is it for? | ||
| parent: DrinkGlassBase | ||
| id: GlassVase | ||
| components: | ||
| - type: Sprite | ||
| sprite: SS220/Objects/Consumable/Flowers/vase_overlay.rsi | ||
| layers: | ||
| - state: icon | ||
| map: [ "enum.SolutionContainerLayers.Base" ] | ||
| - state: fill1 | ||
| map: [ "enum.SolutionContainerLayers.Fill" ] | ||
| visible: false | ||
| - state: Icon-front | ||
| map: [ "enum.SolutionContainerLayers.Overlay" ] | ||
| - type: Appearance | ||
| - type: SolutionContainerManager | ||
| solutions: | ||
| drink: | ||
| maxVol: 30 | ||
| - type: SolutionContainerVisuals | ||
| maxFillLevels: 9 | ||
| fillBaseName: fill | ||
| metamorphicDefaultSprite: | ||
| sprite: SS220/Objects/Consumable/Flowers/vase_overlay.rsi | ||
| state: icon | ||
| - type: Construction | ||
| graph: craftvase | ||
| node: CraftVase | ||
| - type: Matchbox | ||
| - type: ContainerContainer | ||
| containers: | ||
| item: !type:ContainerSlot | ||
| - type: ItemSlots | ||
| slots: | ||
| item: | ||
| name: vase-flower | ||
| whitelist: | ||
| tags: | ||
| - wtulip | ||
| - ptulip | ||
| - ytulip | ||
| - rclove | ||
| - wclove | ||
| - schamomile | ||
| - wschamomile | ||
| - sflower | ||
| - lflower | ||
| - rrose | ||
| - wrose | ||
|
|
||
| - type: ItemMapper | ||
| mapLayers: | ||
| white_tulip: | ||
| whitelist: | ||
| tags: | ||
| - wtulip | ||
| pink_tulip: | ||
| whitelist: | ||
| tags: | ||
| - ptulip | ||
| yellow_tulip: | ||
| whitelist: | ||
| tags: | ||
| - ytulip | ||
| red_clove: | ||
| whitelist: | ||
| tags: | ||
| - rclove | ||
| white_clove: | ||
| whitelist: | ||
| tags: | ||
| - wclove | ||
| s_chamomile: | ||
| whitelist: | ||
| tags: | ||
| - schamomile | ||
| ws_chamomile: | ||
| whitelist: | ||
| tags: | ||
| - wschamomile | ||
| s_flower: | ||
| whitelist: | ||
| tags: | ||
| - sflower | ||
| l_flower: | ||
| whitelist: | ||
| tags: | ||
| - lflower | ||
| r_rose: | ||
| whitelist: | ||
| tags: | ||
| - rrose | ||
| w_rose: | ||
| whitelist: | ||
| tags: | ||
| - wrose | ||
| sprite: SS220/Objects/Consumable/Flowers/vase_overlay.rsi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.