From 6575da25ed573b1de73e4bcfb2aa078255a2220f Mon Sep 17 00:00:00 2001 From: Neko Dar Date: Mon, 20 Nov 2023 00:46:28 +0000 Subject: [PATCH 01/33] =?UTF-8?q?[add/tweak]=20=D0=98=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D1=85=20=D0=BA=D1=80=D0=B8=D1=81=D1=82=D0=B0=D0=BB=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20(#291)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Респрайт новых кристаллов и добавление кулоннов. Основная работа сделана Malanisa - [x] Этот запрос был полностью завершён и мне **не** нужна помощь чтобы его закончить. - [x] Я запускал локальный сервер со своими изменениями и внимательно всё протестировал. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. ![image](/attachments/2d60a3bc-e775-4c98-b38a-dcecb73d820d) ![image](/attachments/26b15d70-ba8f-4d56-adc9-e5001695051b) ![image](/attachments/7b29c983-539d-4cc4-99d0-9c1309a4bc8f) ![image](/attachments/dabf755f-cbb7-4d56-ae28-c9283e6ee022) ![image](/attachments/098b6958-f8fa-4525-9403-4d279c7c8b95) :cl: Main work by Malanisa and fix's by NekoDar - add: Добавлены средние кристаллы - add: Добавлены маленькие кристаллы - add: Добавлены осколки кристаллов - add: Добавлены кулоны из кристаллов - add: Добавлены сталагмиты - tweak: Изменен спрайт обычных кристаллов Reviewed-on: https://codeberg.org/Sirena/SS14-Sirena/pulls/291 --- .../Locale/ru-RU/sirena/entities/crystals.ftl | 120 +++++++ .../ru-RU/sirena/entities/stalagmites.ftl | 17 + .../structures/decoration/crystals.ftl | 4 +- .../Markers/Spawners/Random/crystal.yml | 11 +- .../Structures/Decoration/crystals.yml | 304 +++++++----------- .../Prototypes/Procedural/biome_templates.yml | 25 +- .../Graphs/utilities/lighting.yml | 181 ++++++----- .../Entities/Structures/Crystals/base.yml | 41 +++ .../Entities/Structures/Crystals/blue.yml | 62 ++++ .../Entities/Structures/Crystals/cyan.yml | 62 ++++ .../Entities/Structures/Crystals/green.yml | 62 ++++ .../Entities/Structures/Crystals/grey.yml | 62 ++++ .../Entities/Structures/Crystals/orange.yml | 62 ++++ .../Entities/Structures/Crystals/pink.yml | 62 ++++ .../Entities/Structures/Crystals/red.yml | 62 ++++ .../Entities/Structures/stalagmities.yml | 71 ++++ .../Prototypes/Sirena/Entities/pendants.yml | 125 +++++++ .../Sirena/Recipes/Craft/Graphs/pendants.yml | 141 ++++++++ .../Sirena/Recipes/Craft/pendants.yml | 91 ++++++ Resources/Prototypes/Sirena/tags.yml | 20 ++ .../blue.rsi/equipped-NECK-hamster.png | Bin 0 -> 268 bytes .../Neck/Pendants/blue.rsi/equipped-NECK.png | Bin 0 -> 179 bytes .../Clothing/Neck/Pendants/blue.rsi/icon.png | Bin 0 -> 860 bytes .../Neck/Pendants/blue.rsi/inhand-left.png | Bin 0 -> 188 bytes .../Neck/Pendants/blue.rsi/inhand-right.png | Bin 0 -> 186 bytes .../Clothing/Neck/Pendants/blue.rsi/meta.json | 31 ++ .../cyan.rsi/equipped-NECK-hamster.png | Bin 0 -> 266 bytes .../Neck/Pendants/cyan.rsi/equipped-NECK.png | Bin 0 -> 181 bytes .../Clothing/Neck/Pendants/cyan.rsi/icon.png | Bin 0 -> 865 bytes .../Neck/Pendants/cyan.rsi/inhand-left.png | Bin 0 -> 189 bytes .../Neck/Pendants/cyan.rsi/inhand-right.png | Bin 0 -> 188 bytes .../Clothing/Neck/Pendants/cyan.rsi/meta.json | 31 ++ .../green.rsi/equipped-NECK-hamster.png | Bin 0 -> 264 bytes .../Neck/Pendants/green.rsi/equipped-NECK.png | Bin 0 -> 207 bytes .../Clothing/Neck/Pendants/green.rsi/icon.png | Bin 0 -> 856 bytes .../Neck/Pendants/green.rsi/inhand-left.png | Bin 0 -> 188 bytes .../Neck/Pendants/green.rsi/inhand-right.png | Bin 0 -> 187 bytes .../Neck/Pendants/green.rsi/meta.json | 31 ++ .../grey.rsi/equipped-NECK-hamster.png | Bin 0 -> 257 bytes .../Neck/Pendants/grey.rsi/equipped-NECK.png | Bin 0 -> 199 bytes .../Clothing/Neck/Pendants/grey.rsi/icon.png | Bin 0 -> 850 bytes .../Neck/Pendants/grey.rsi/inhand-left.png | Bin 0 -> 189 bytes .../Neck/Pendants/grey.rsi/inhand-right.png | Bin 0 -> 194 bytes .../Clothing/Neck/Pendants/grey.rsi/meta.json | 31 ++ .../orange.rsi/equipped-NECK-hamster.png | Bin 0 -> 265 bytes .../Pendants/orange.rsi/equipped-NECK.png | Bin 0 -> 179 bytes .../Neck/Pendants/orange.rsi/icon.png | Bin 0 -> 865 bytes .../Neck/Pendants/orange.rsi/inhand-left.png | Bin 0 -> 188 bytes .../Neck/Pendants/orange.rsi/inhand-right.png | Bin 0 -> 186 bytes .../Neck/Pendants/orange.rsi/meta.json | 31 ++ .../pink.rsi/equipped-NECK-hamster.png | Bin 0 -> 243 bytes .../Neck/Pendants/pink.rsi/equipped-NECK.png | Bin 0 -> 175 bytes .../Clothing/Neck/Pendants/pink.rsi/icon.png | Bin 0 -> 838 bytes .../Neck/Pendants/pink.rsi/inhand-left.png | Bin 0 -> 183 bytes .../Neck/Pendants/pink.rsi/inhand-right.png | Bin 0 -> 181 bytes .../Clothing/Neck/Pendants/pink.rsi/meta.json | 31 ++ .../red.rsi/equipped-NECK-hamster.png | Bin 0 -> 238 bytes .../Neck/Pendants/red.rsi/equipped-NECK.png | Bin 0 -> 165 bytes .../Clothing/Neck/Pendants/red.rsi/icon.png | Bin 0 -> 711 bytes .../Neck/Pendants/red.rsi/inhand-left.png | Bin 0 -> 177 bytes .../Neck/Pendants/red.rsi/inhand-right.png | Bin 0 -> 182 bytes .../Clothing/Neck/Pendants/red.rsi/meta.json | 31 ++ .../Decoration/crystal.rsi/crystal_blue.png | Bin 0 -> 1127 bytes .../crystal.rsi/crystal_blue_medium.png | Bin 0 -> 945 bytes .../crystal.rsi/crystal_blue_small.png | Bin 0 -> 610 bytes .../Decoration/crystal.rsi/crystal_cyan.png | Bin 0 -> 1127 bytes .../crystal.rsi/crystal_cyan_medium.png | Bin 0 -> 983 bytes .../crystal.rsi/crystal_cyan_small.png | Bin 0 -> 624 bytes .../Decoration/crystal.rsi/crystal_green.png | Bin 0 -> 1128 bytes .../crystal.rsi/crystal_green_medium.png | Bin 0 -> 962 bytes .../crystal.rsi/crystal_green_small.png | Bin 0 -> 610 bytes .../Decoration/crystal.rsi/crystal_grey.png | Bin 0 -> 1040 bytes .../crystal.rsi/crystal_grey_medium.png | Bin 0 -> 921 bytes .../crystal.rsi/crystal_grey_small.png | Bin 0 -> 596 bytes .../Decoration/crystal.rsi/crystal_orange.png | Bin 0 -> 1136 bytes .../crystal.rsi/crystal_orange_medium.png | Bin 0 -> 975 bytes .../crystal.rsi/crystal_orange_small.png | Bin 0 -> 627 bytes .../Decoration/crystal.rsi/crystal_pink.png | Bin 0 -> 1100 bytes .../crystal.rsi/crystal_pink_medium.png | Bin 0 -> 918 bytes .../crystal.rsi/crystal_pink_small.png | Bin 0 -> 586 bytes .../Decoration/crystal.rsi/crystal_red.png | Bin 0 -> 753 bytes .../crystal.rsi/crystal_red_medium.png | Bin 0 -> 640 bytes .../crystal.rsi/crystal_red_small.png | Bin 0 -> 437 bytes .../crystal.rsi/crystalshard_blue.png | Bin 0 -> 538 bytes .../crystal.rsi/crystalshard_cyan.png | Bin 0 -> 547 bytes .../crystal.rsi/crystalshard_green.png | Bin 0 -> 542 bytes .../crystal.rsi/crystalshard_grey.png | Bin 0 -> 502 bytes .../crystal.rsi/crystalshard_orange.png | Bin 0 -> 544 bytes .../crystal.rsi/crystalshard_pink.png | Bin 0 -> 520 bytes .../crystal.rsi/crystalshard_red.png | Bin 0 -> 361 bytes .../Decoration/crystal.rsi/meta.json | 96 ++++++ .../Decoration/stalagmite.rsi/meta.json | 27 ++ .../Decoration/stalagmite.rsi/stalagmite1.png | Bin 0 -> 1070 bytes .../Decoration/stalagmite.rsi/stalagmite2.png | Bin 0 -> 1074 bytes .../Decoration/stalagmite.rsi/stalagmite3.png | Bin 0 -> 1084 bytes .../Decoration/stalagmite.rsi/stalagmite4.png | Bin 0 -> 887 bytes .../Decoration/stalagmite.rsi/stalagmite5.png | Bin 0 -> 964 bytes 97 files changed, 1635 insertions(+), 290 deletions(-) create mode 100644 Resources/Locale/ru-RU/sirena/entities/crystals.ftl create mode 100644 Resources/Locale/ru-RU/sirena/entities/stalagmites.ftl create mode 100644 Resources/Prototypes/Sirena/Entities/Structures/Crystals/base.yml create mode 100644 Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml create mode 100644 Resources/Prototypes/Sirena/Entities/Structures/Crystals/cyan.yml create mode 100644 Resources/Prototypes/Sirena/Entities/Structures/Crystals/green.yml create mode 100644 Resources/Prototypes/Sirena/Entities/Structures/Crystals/grey.yml create mode 100644 Resources/Prototypes/Sirena/Entities/Structures/Crystals/orange.yml create mode 100644 Resources/Prototypes/Sirena/Entities/Structures/Crystals/pink.yml create mode 100644 Resources/Prototypes/Sirena/Entities/Structures/Crystals/red.yml create mode 100644 Resources/Prototypes/Sirena/Entities/Structures/stalagmities.yml create mode 100644 Resources/Prototypes/Sirena/Entities/pendants.yml create mode 100644 Resources/Prototypes/Sirena/Recipes/Craft/Graphs/pendants.yml create mode 100644 Resources/Prototypes/Sirena/Recipes/Craft/pendants.yml create mode 100644 Resources/Prototypes/Sirena/tags.yml create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/equipped-NECK-hamster.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/icon.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/inhand-left.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/inhand-right.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/meta.json create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/equipped-NECK-hamster.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/icon.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/inhand-left.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/inhand-right.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/meta.json create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/equipped-NECK-hamster.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/icon.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/inhand-left.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/inhand-right.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/meta.json create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/equipped-NECK-hamster.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/icon.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/inhand-left.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/inhand-right.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/meta.json create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/equipped-NECK-hamster.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/icon.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/inhand-left.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/inhand-right.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/meta.json create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/equipped-NECK-hamster.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/icon.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/inhand-left.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/inhand-right.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/meta.json create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/equipped-NECK-hamster.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/icon.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/inhand-left.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/inhand-right.png create mode 100644 Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/meta.json create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue_medium.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue_small.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan_medium.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan_small.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green_medium.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green_small.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey_medium.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey_small.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange_medium.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange_small.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink_medium.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink_small.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red_medium.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red_small.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_blue.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_cyan.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_green.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_grey.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_orange.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_pink.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_red.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/meta.json create mode 100644 Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json create mode 100644 Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite1.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite2.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite3.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite4.png create mode 100644 Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite5.png diff --git a/Resources/Locale/ru-RU/sirena/entities/crystals.ftl b/Resources/Locale/ru-RU/sirena/entities/crystals.ftl new file mode 100644 index 00000000000..ecbf14344a1 --- /dev/null +++ b/Resources/Locale/ru-RU/sirena/entities/crystals.ftl @@ -0,0 +1,120 @@ +ent-BaseCrystal = базовый кристалл + .desc = Сияющее плотное скопление минерала. Вы можете увидеть своё отражение в нем. + +ent-BaseCrystalShard = базовый осколок кристалл + .desc = Небольшой осколок сиящего кристалла лишь слабо осветит ваш путь. + +ent-ClothingCheapPendantBase = кулон из базового кристалла + .desc = Кулончик из сияющего кристалла и тонкого провода. + +# Blue +ent-CrystalBlue = синий кристалл + .desc = { ent-BaseCrystal.desc } + +ent-CrystalBlueMedium = { ent-CrystalBlue } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalBlueSmall = { ent-CrystalBlue } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalShardBlue = осколок синего кристалла + .desc = { ent-BaseCrystalShard.desc } + +ent-ClothingCheapPendantBlue = кулон из синего кристалла + .desc = { ent-ClothingCheapPendantBase.desc } + +# Cyan +ent-CrystalCyan = голубой кристалл + .desc = { ent-BaseCrystal.desc } + +ent-CrystalCyanMedium = { ent-CrystalCyan } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalCyanSmall = { ent-CrystalCyan } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalShardCyan = осколок голубого кристалла + .desc = { ent-BaseCrystalShard.desc } + +ent-ClothingCheapPendantCyan = кулон из голубого кристалла + .desc = { ent-ClothingCheapPendantBase.desc } + +# Green +ent-CrystalGreen = зелёный кристалл + .desc = { ent-BaseCrystal.desc } + +ent-CrystalGreenMedium = { ent-CrystalGreen } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalGreenSmall = { ent-CrystalGreen } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalShardGreen = осколок зелёного кристалла + .desc = { ent-BaseCrystalShard.desc } + +ent-ClothingCheapPendantGreen = кулон из зелёного кристалла + .desc = { ent-ClothingCheapPendantBase.desc } + +# Grey +ent-CrystalGrey = серый кристалл + .desc = { ent-BaseCrystal.desc } + +ent-CrystalGreyMedium = { ent-CrystalGrey } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalGreySmall = { ent-CrystalGrey } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalShardGrey = осколок серого кристалла + .desc = { ent-BaseCrystalShard.desc } + +ent-ClothingCheapPendantGrey = кулон из серого кристалла + .desc = { ent-ClothingCheapPendantBase.desc } + +# Orange +ent-CrystalOrange = оранжевый кристалл + .desc = { ent-BaseCrystal.desc } + +ent-CrystalOrangeMedium = { ent-CrystalOrange } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalOrangeSmall = { ent-CrystalOrange } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalShardOrange = осколок оранжевого кристалла + .desc = { ent-BaseCrystalShard.desc } + +ent-ClothingCheapPendantOrange = кулон из оранжевого кристалла + .desc = { ent-ClothingCheapPendantBase.desc } + +# Pink +ent-CrystalPink = розовый кристалл + .desc = { ent-BaseCrystal.desc } + +ent-CrystalPinkMedium = { ent-CrystalPink } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalPinkSmall = { ent-CrystalPink } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalShardPink = осколок розового кристалла + .desc = { ent-BaseCrystalShard.desc } + +ent-ClothingCheapPendantPink = кулон из розового кристалла + .desc = { ent-ClothingCheapPendantBase.desc } + +# Red +ent-CrystalRed = красный кристалл + .desc = { ent-BaseCrystal.desc } + +ent-CrystalRedMedium = { ent-CrystalRed } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalRedSmall = { ent-CrystalRed } + .desc = { ent-BaseCrystal.desc } + +ent-CrystalShardRed = осколок красного кристалла + .desc = { ent-BaseCrystalShard.desc } + +ent-ClothingCheapPendantRed = кулон из красного кристалла + .desc = { ent-ClothingCheapPendantBase.desc } diff --git a/Resources/Locale/ru-RU/sirena/entities/stalagmites.ftl b/Resources/Locale/ru-RU/sirena/entities/stalagmites.ftl new file mode 100644 index 00000000000..bc7173f98b7 --- /dev/null +++ b/Resources/Locale/ru-RU/sirena/entities/stalagmites.ftl @@ -0,0 +1,17 @@ +ent-StalagmiteBase = cталагмит + .desc = Естественное образование в пещере. Это вам не блестящий кристалл. + +ent-Stalagmite1 = { ent-StalagmiteBase } + .desc = { ent-StalagmiteBase.desc } + +ent-Stalagmite2 = { ent-StalagmiteBase } + .desc = { ent-StalagmiteBase.desc } + +ent-Stalagmite3 = { ent-StalagmiteBase } + .desc = { ent-StalagmiteBase.desc } + +ent-Stalagmite4 = { ent-StalagmiteBase } + .desc = { ent-StalagmiteBase.desc } + +ent-Stalagmite5 = { ent-StalagmiteBase } + .desc = { ent-StalagmiteBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/crystals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/crystals.ftl index e261debaaab..ebb208450e4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/crystals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/crystals.ftl @@ -2,8 +2,8 @@ ent-CrystalGreen = зелёный кристалл .desc = Блестящий зеленый кристалл. ent-CrystalPink = розовый кристалл .desc = Блестящий розовый кристалл. -ent-CrystalGrey = красный кристалл - .desc = Блестящий красный кристалл. +ent-CrystalGrey = серый кристалл + .desc = Блестящий серый кристалл. ent-CrystalOrange = оранжевый кристалл .desc = Блестящий оранжевый кристалл. ent-CrystalBlue = синий кристалл diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml index 84adf28e2d9..35bdbc8259a 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml @@ -12,9 +12,18 @@ - type: RandomSpawner prototypes: - CrystalGreen + - CrystalGreenSmall + - CrystalGreenMedium - CrystalPink + - CrystalPinkSmall + - CrystalPinkMedium - CrystalOrange + - CrystalOrangeSmall + - CrystalOrangeMedium - CrystalBlue + - CrystalBlueSmall + - CrystalBlueMedium - CrystalCyan - - CrystalGrey + - CrystalCyanSmall + - CrystalCyanMedium chance: 0.7 diff --git a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml index c1a01c423b1..6a930310ed1 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml @@ -1,197 +1,117 @@ -- type: entity - id: CrystalGreen - parent: BaseStructure - suffix: green - name: crystal - description: A crystaline solid. - components: - - type: Sprite - sprite: Structures/Decoration/crystal.rsi - state: crystal_grey - color: "#52ff39" - noRot: true - - type: Reflect - reflectProb: 0.5 - reflects: - - Energy - spread: 75 - - type: Anchorable - delay: 2 - - type: Physics - bodyType: Static - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.45 - density: 60 - mask: - - MachineMask - layer: - - MidImpassable - - LowImpassable - - BulletImpassable - - Opaque - - type: PointLight - radius: 3 - energy: 3 - color: "#52ff39" - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Glass - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - ShardCrystalGreen: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] +# - type: entity + # id: CrystalGreen + # parent: BaseStructure + # name: green crystal + # description: It's a shiny green crystal. + # components: + # - type: Sprite + # sprite: Structures/Decoration/crystal.rsi + # state: crystal_green + # noRot: true + # - type: Reflect + # reflectProb: 0.5 + # reflects: + # - Energy + # - type: Fixtures + # fixtures: + # fix1: + # shape: + # !type:PhysShapeCircle + # radius: 0.45 + # density: 60 + # mask: + # - MachineMask + # layer: + # - MidImpassable + # - LowImpassable + # - BulletImpassable + # - Opaque + # - type: PointLight + # radius: 3 + # energy: 3 + # color: "#06DF24" + # - type: Damageable + # damageContainer: Inorganic + # damageModifierSet: Metallic + # - type: Destructible + # thresholds: + # - trigger: + # !type:DamageTrigger + # damage: 50 + # behaviors: + # - !type:DoActsBehavior + # acts: [ "Destruction" ] + # - !type:PlaySoundBehavior + # sound: + # collection: GlassBreak -- type: entity - id: CrystalPink - parent: CrystalGreen - suffix: pink - components: - - type: Sprite - color: "#ff66cc" - - type: PointLight - radius: 3 - energy: 3 - color: "#ff66cc" - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - ShardCrystalPink: - min: 1 - max: 1 +# - type: entity + # id: CrystalPink + # parent: CrystalGreen + # name: pink crystal + # description: It's a shiny pink crystal. + # components: + # - type: Sprite + # sprite: Structures/Decoration/crystal.rsi + # state: crystal_pink + # - type: PointLight + # radius: 3 + # energy: 3 + # color: "#DF06DC" -- type: entity - id: CrystalGrey - parent: CrystalGreen - suffix: red - components: - - type: Sprite - state: crystal_grey - color: "#fb4747" - - type: PointLight - color: "#fb4747" - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - ShardCrystalRed: - min: 1 - max: 2 +# - type: entity + # id: CrystalGrey + # parent: CrystalGreen + # name: grey crystal + # description: It's a shiny grey crystal. + # components: + # - type: Sprite + # sprite: Structures/Decoration/crystal.rsi + # state: crystal_grey + # - type: PointLight + # radius: 3 + # energy: 3 + # color: "#C1B0C1" -- type: entity - id: CrystalOrange - parent: CrystalGreen - suffix: orange - components: - - type: Sprite - color: "#ff8227" - - type: PointLight - radius: 3 - energy: 3 - color: "#ff8227" - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - ShardCrystalOrange: - min: 1 - max: 2 +# - type: entity + # id: CrystalOrange + # parent: CrystalGreen + # name: orange crystal + # description: It's a shiny orange crystal. + # components: + # - type: Sprite + # sprite: Structures/Decoration/crystal.rsi + # state: crystal_orange + # - type: PointLight + # radius: 3 + # energy: 3 + # color: "#E8820F" -- type: entity - id: CrystalBlue - parent: CrystalGreen - suffix: blue - components: - - type: Sprite - color: "#39a1ff" - - type: PointLight - radius: 3 - energy: 3 - color: "#39a1ff" - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - ShardCrystalBlue: - min: 1 - max: 2 +# - type: entity + # id: CrystalBlue + # parent: CrystalGreen + # name: blue crystal + # description: It's a shiny blue crystal. + # components: + # - type: Sprite + # sprite: Structures/Decoration/crystal.rsi + # state: crystal_blue + # - type: PointLight + # radius: 3 + # energy: 3 + # color: "#1843D4" + +# - type: entity + # id: CrystalCyan + # parent: CrystalGreen + # name: cyan crystal + # description: It's a shiny cyan crystal. + # components: + # - type: Sprite + # sprite: Structures/Decoration/crystal.rsi + # state: crystal_cyan + # - type: PointLight + # radius: 3 + # energy: 3 + # color: "#18C9D4" -- type: entity - id: CrystalCyan - parent: CrystalGreen - suffix: cyan - components: - - type: Sprite - color: "#47f8ff" - - type: PointLight - radius: 3 - energy: 3 - color: "#47f8ff" - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - ShardCrystalCyan: - min: 1 - max: 2 - - !type:DoActsBehavior - acts: [ "Destruction" ] diff --git a/Resources/Prototypes/Procedural/biome_templates.yml b/Resources/Prototypes/Procedural/biome_templates.yml index aa0c2546c9b..285e67d397c 100644 --- a/Resources/Prototypes/Procedural/biome_templates.yml +++ b/Resources/Prototypes/Procedural/biome_templates.yml @@ -525,7 +525,9 @@ allowedTiles: - FloorChromite entities: - - CrystalPink + - CrystalPink + - CrystalPinkSmall + - CrystalPinkMedium - !type:BiomeEntityLayer threshold: 0.97 noise: @@ -577,7 +579,7 @@ threshold: -1 tile: FloorChromite -# Caves +# Caves (new Crystal by malanisa) - type: biomeTemplate id: Caves layers: @@ -590,11 +592,26 @@ allowedTiles: - FloorAsteroidSand entities: - - CrystalGreen - - CrystalPink + - CrystalGreen + - CrystalGreenSmall + - CrystalGreenMedium + - CrystalPink + - CrystalPinkSmall + - CrystalPinkMedium - CrystalOrange + - CrystalOrangeSmall + - CrystalOrangeMedium - CrystalBlue + - CrystalBlueSmall + - CrystalBlueMedium - CrystalCyan + - CrystalCyanSmall + - CrystalCyanMedium + - Stalagmite1 + - Stalagmite2 + - Stalagmite3 + - Stalagmite4 + - Stalagmite5 - !type:BiomeEntityLayer threshold: 0.95 noise: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml index 378feb1cf80..2c6ff33d24e 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml @@ -2,119 +2,118 @@ id: CyanLight start: start graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 1 - doAfter: 1 - - tag: CrystalCyan - name: cyan crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - color: #52ff39 - doAfter: 1 - - node: icon - entity: LightTubeCrystalCyan + - node: start + edges: + - to: icon + steps: + - tag: CrystalShardCyan + name: A shard of cyan crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_cyan + doAfter: 1 + - material: Glass + amount: 1 + doAfter: 1 + - node: icon + entity: LightTubeCrystalCyan - type: constructionGraph id: BlueLight start: start graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 2 - doAfter: 1 - - tag: CrystalBlue - name: blue crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - doAfter: 1 - - node: icon - entity: LightTubeCrystalBlue + - node: start + edges: + - to: icon + steps: + - tag: CrystalShardBlue + name: A shard of blue crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_blue + doAfter: 1 + - material: Glass + amount: 2 + doAfter: 1 + - node: icon + entity: LightTubeCrystalBlue - type: constructionGraph id: PinkLight start: start graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 2 - doAfter: 1 - - tag: CrystalPink - name: pink crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - doAfter: 1 - - node: icon - entity: LightTubeCrystalPink + - node: start + edges: + - to: icon + steps: + - tag: CrystalShardPink + name: A shard of pink crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_pink + doAfter: 1 + - material: Glass + amount: 2 + doAfter: 1 + - node: icon + entity: LightTubeCrystalPink - type: constructionGraph id: OrangeLight start: start graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 2 - doAfter: 1 - - tag: CrystalOrange - name: orange crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - doAfter: 1 - - node: icon - entity: LightTubeCrystalOrange + - node: start + edges: + - to: icon + steps: + - tag: CrystalShardOrange + name: A shard of orange crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_orange + doAfter: 1 + - material: Glass + amount: 2 + doAfter: 1 + - node: icon + entity: LightTubeCrystalOrange - type: constructionGraph id: RedLight start: start graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 2 - doAfter: 1 - - tag: CrystalRed - name: red crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - doAfter: 1 - - node: icon - entity: LightTubeCrystalRed + - node: start + edges: + - to: icon + steps: + - tag: CrystalShardRed + name: A shard of red crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_red + doAfter: 1 + - material: Glass + amount: 2 + doAfter: 1 + - node: icon + entity: LightTubeCrystalRed - type: constructionGraph id: GreenLight start: start graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 2 - doAfter: 1 - - tag: CrystalGreen - name: green crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - doAfter: 1 - - node: icon - entity: LightTubeCrystalGreen + - node: start + edges: + - to: icon + steps: + - tag: CrystalShardGreen + name: A shard of green crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_green + doAfter: 1 + - material: Glass + amount: 2 + doAfter: 1 + - node: icon + entity: LightTubeCrystalGreen diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/base.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/base.yml new file mode 100644 index 00000000000..7deb17634c2 --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/base.yml @@ -0,0 +1,41 @@ +- type: entity + id: BaseCrystal + parent: BaseStructure + abstract: true + description: A glowing, dense cluster of mineral. You can see your reflection in it. + components: + - type: Sprite + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystal_green + noRot: true + - type: Reflect + reflectProb: 0.5 + reflects: + - Energy + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.45 + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + - BulletImpassable + - Opaque + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + +- type: entity + parent: BaseItem + id: BaseCrystalShard + abstract: true + components: + - type: Sprite + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystal_green + noRot: true diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml new file mode 100644 index 00000000000..9db58ebe5e0 --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml @@ -0,0 +1,62 @@ +- type: entity + id: CrystalBlue + parent: BaseCrystal + components: + - type: Sprite + state: crystal_blue + - type: PointLight + radius: 3 + energy: 3 + color: "#1843D4" + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CrystalShardBlue: + min: 0 + max: 2 + +- type: entity + id: CrystalBlueMedium + parent: CrystalBlue + components: + - type: Sprite + state: crystal_blue_medium + - type: PointLight + radius: 3 + energy: 2 + color: "#3d5cb3" + +- type: entity + id: CrystalBlueSmall + parent: CrystalBlue + components: + - type: Sprite + state: crystal_blue_small + - type: PointLight + radius: 3 + energy: 2 + color: "#3d5cb3" + +- type: entity + id: CrystalShardBlue + parent: BaseCrystalShard + components: + - type: Sprite + state: crystalshard_blue + - type: PointLight + radius: 1.5 + energy: 3 + color: "#3d5cb3" + - type: Tag + tags: + - CrystalShardBlue diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/cyan.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/cyan.yml new file mode 100644 index 00000000000..389fc788dca --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/cyan.yml @@ -0,0 +1,62 @@ +- type: entity + id: CrystalCyan + parent: BaseCrystal + components: + - type: Sprite + state: crystal_cyan + - type: PointLight + radius: 3 + energy: 3 + color: "#47a8a5" + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CrystalShardCyan: + min: 0 + max: 2 + +- type: entity + id: CrystalCyanMedium + parent: CrystalCyan + components: + - type: Sprite + state: crystal_cyan_medium + - type: PointLight + radius: 3 + energy: 2 + color: "#47a8a5" + +- type: entity + id: CrystalCyanSmall + parent: CrystalCyan + components: + - type: Sprite + state: crystal_cyan_small + - type: PointLight + radius: 3 + energy: 2 + color: "#47a8a5" + +- type: entity + id: CrystalShardCyan + parent: BaseCrystalShard + components: + - type: Sprite + state: crystalshard_cyan + - type: PointLight + radius: 1.5 + energy: 3 + color: "#47a8a5" + - type: Tag + tags: + - CrystalShardCyan diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/green.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/green.yml new file mode 100644 index 00000000000..ebd50936a08 --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/green.yml @@ -0,0 +1,62 @@ +- type: entity + id: CrystalGreen + parent: BaseCrystal + components: + - type: Sprite + state: crystal_green + - type: PointLight + radius: 3 + energy: 3 + color: "#5ea34e" + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CrystalShardGreen: + min: 0 + max: 2 + +- type: entity + id: CrystalGreenMedium + parent: CrystalGreen + components: + - type: Sprite + state: crystal_green_medium + - type: PointLight + radius: 3 + energy: 2 + color: "#5ea34e" + +- type: entity + id: CrystalGreenSmall + parent: CrystalGreen + components: + - type: Sprite + state: crystal_green_small + - type: PointLight + radius: 3 + energy: 2 + color: "#5ea34e" + +- type: entity + id: CrystalShardGreen + parent: BaseCrystalShard + components: + - type: Sprite + state: crystalshard_green + - type: PointLight + radius: 1.5 + energy: 3 + color: "#5ea34e" + - type: Tag + tags: + - CrystalShardGreen diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/grey.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/grey.yml new file mode 100644 index 00000000000..a4977f8668d --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/grey.yml @@ -0,0 +1,62 @@ +- type: entity + id: CrystalGrey + parent: BaseCrystal + components: + - type: Sprite + state: crystal_grey + - type: PointLight + radius: 3 + energy: 3 + color: "#969696" + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CrystalShardGrey: + min: 0 + max: 2 + +- type: entity + id: CrystalGreyMedium + parent: CrystalGrey + components: + - type: Sprite + state: crystal_grey_medium + - type: PointLight + radius: 3 + energy: 2 + color: "#969696" + +- type: entity + id: CrystalGreySmall + parent: CrystalGrey + components: + - type: Sprite + state: crystal_grey_small + - type: PointLight + radius: 3 + energy: 2 + color: "#969696" + +- type: entity + id: CrystalShardGrey + parent: BaseCrystalShard + components: + - type: Sprite + state: crystalshard_grey + - type: PointLight + radius: 1.5 + energy: 3 + color: "#969696" + - type: Tag + tags: + - CrystalShardGrey diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/orange.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/orange.yml new file mode 100644 index 00000000000..0213b204b8e --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/orange.yml @@ -0,0 +1,62 @@ +- type: entity + id: CrystalOrange + parent: BaseCrystal + components: + - type: Sprite + state: crystal_orange + - type: PointLight + radius: 3 + energy: 3 + color: "#96863b" + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CrystalShardOrange: + min: 0 + max: 2 + +- type: entity + id: CrystalOrangeMedium + parent: CrystalOrange + components: + - type: Sprite + state: crystal_orange_medium + - type: PointLight + radius: 3 + energy: 2 + color: "#96863b" + +- type: entity + id: CrystalOrangeSmall + parent: CrystalOrange + components: + - type: Sprite + state: crystal_orange_small + - type: PointLight + radius: 3 + energy: 2 + color: "#96863b" + +- type: entity + id: CrystalShardOrange + parent: BaseCrystalShard + components: + - type: Sprite + state: crystalshard_orange + - type: PointLight + radius: 1.5 + energy: 3 + color: "#96863b" + - type: Tag + tags: + - CrystalShardOrange diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/pink.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/pink.yml new file mode 100644 index 00000000000..f3ca2a8367c --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/pink.yml @@ -0,0 +1,62 @@ +- type: entity + id: CrystalPink + parent: BaseCrystal + components: + - type: Sprite + state: crystal_pink + - type: PointLight + radius: 3 + energy: 3 + color: "#a84dab" + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CrystalShardPink: + min: 0 + max: 2 + +- type: entity + id: CrystalPinkMedium + parent: CrystalPink + components: + - type: Sprite + state: crystal_pink_medium + - type: PointLight + radius: 3 + energy: 2 + color: "#a84dab" + +- type: entity + id: CrystalPinkSmall + parent: CrystalPink + components: + - type: Sprite + state: crystal_pink_small + - type: PointLight + radius: 3 + energy: 2 + color: "#a84dab" + +- type: entity + id: CrystalShardPink + parent: BaseCrystalShard + components: + - type: Sprite + state: crystalshard_pink + - type: PointLight + radius: 1.5 + energy: 3 + color: "#a84dab" + - type: Tag + tags: + - CrystalShardPink diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/red.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/red.yml new file mode 100644 index 00000000000..d48f0cc22b8 --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/red.yml @@ -0,0 +1,62 @@ +- type: entity + id: CrystalRed + parent: BaseCrystal + components: + - type: Sprite + state: crystal_red + - type: PointLight + radius: 3 + energy: 3 + color: "#FF4020" + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CrystalShardRed: + min: 0 + max: 2 + +- type: entity + id: CrystalRedMedium + parent: CrystalRed + components: + - type: Sprite + state: crystal_red_medium + - type: PointLight + radius: 3 + energy: 2 + color: "#FF4020" + +- type: entity + id: CrystalRedSmall + parent: CrystalRed + components: + - type: Sprite + state: crystal_red_small + - type: PointLight + radius: 3 + energy: 2 + color: "#FF4020" + +- type: entity + id: CrystalShardRed + parent: BaseCrystalShard + components: + - type: Sprite + state: crystalshard_red + - type: PointLight + radius: 1.5 + energy: 3 + color: "#FF4020" + - type: Tag + tags: + - CrystalShardRed diff --git a/Resources/Prototypes/Sirena/Entities/Structures/stalagmities.yml b/Resources/Prototypes/Sirena/Entities/Structures/stalagmities.yml new file mode 100644 index 00000000000..26128914714 --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Structures/stalagmities.yml @@ -0,0 +1,71 @@ +- type: entity + id: StalagmiteBase + parent: BaseStructure + components: + - type: Sprite + sprite: Sirena/Structures/Decoration/stalagmite.rsi + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.45 + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + - BulletImpassable + - Opaque + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SoundOnGather + - type: Gatherable + whitelist: + tags: + - Pickaxe + +- type: entity + id: Stalagmite1 + parent: StalagmiteBase + components: + - type: Sprite + state: stalagmite1 + +- type: entity + id: Stalagmite2 + parent: StalagmiteBase + components: + - type: Sprite + state: stalagmite2 + +- type: entity + id: Stalagmite3 + parent: StalagmiteBase + components: + - type: Sprite + state: stalagmite3 + +- type: entity + id: Stalagmite4 + parent: StalagmiteBase + components: + - type: Sprite + state: stalagmite4 + +- type: entity + id: Stalagmite5 + parent: StalagmiteBase + components: + - type: Sprite + state: stalagmite5 diff --git a/Resources/Prototypes/Sirena/Entities/pendants.yml b/Resources/Prototypes/Sirena/Entities/pendants.yml new file mode 100644 index 00000000000..7fc58dfb88c --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/pendants.yml @@ -0,0 +1,125 @@ +- type: entity + parent: ClothingNeckTieRed + id: ClothingCheapPendantBase + abstract: true + components: + - type: Sprite + sprite: Sirena/Clothing/Neck/Pendants/green.rsi + - type: Clothing + sprite: Sirena/Clothing/Neck/Pendants/green.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon + +- type: entity + parent: ClothingCheapPendantBase + id: ClothingCheapPendantGreen + components: + - type: Sprite + sprite: Sirena/Clothing/Neck/Pendants/green.rsi + - type: Clothing + sprite: Sirena/Clothing/Neck/Pendants/green.rsi + - type: Construction + graph: CheapPendantGreen + node: pendantgreen + - type: PointLight + radius: 1.5 + energy: 3 + color: "#5ea34e" + +- type: entity + parent: ClothingCheapPendantBase + id: ClothingCheapPendantOrange + components: + - type: Sprite + sprite: Sirena/Clothing/Neck/Pendants/orange.rsi + - type: Clothing + sprite: Sirena/Clothing/Neck/Pendants/orange.rsi + - type: Construction + graph: CheapPendantOrange + node: pendantorange + - type: PointLight + radius: 1.5 + energy: 3 + color: "#96863b" + +- type: entity + parent: ClothingCheapPendantBase + id: ClothingCheapPendantPink + components: + - type: Sprite + sprite: Sirena/Clothing/Neck/Pendants/pink.rsi + - type: Clothing + sprite: Sirena/Clothing/Neck/Pendants/pink.rsi + - type: Construction + graph: CheapPendantPink + node: pendantpink + - type: PointLight + radius: 1.5 + energy: 3 + color: "#a84dab" + +- type: entity + parent: ClothingCheapPendantBase + id: ClothingCheapPendantCyan + components: + - type: Sprite + sprite: Sirena/Clothing/Neck/Pendants/cyan.rsi + - type: Clothing + sprite: Sirena/Clothing/Neck/Pendants/cyan.rsi + - type: Construction + graph: CheapPendantCyan + node: pendantcyan + - type: PointLight + radius: 1.5 + energy: 3 + color: "#47a8a5" + +- type: entity + parent: ClothingCheapPendantBase + id: ClothingCheapPendantBlue + components: + - type: Sprite + sprite: Sirena/Clothing/Neck/Pendants/blue.rsi + - type: Clothing + sprite: Sirena/Clothing/Neck/Pendants/blue.rsi + - type: Construction + graph: CheapPendantBlue + node: pendantblue + - type: PointLight + radius: 1.5 + energy: 3 + color: "#3d5cb3" + +- type: entity + parent: ClothingCheapPendantBase + id: ClothingCheapPendantGrey + components: + - type: Sprite + sprite: Sirena/Clothing/Neck/Pendants/grey.rsi + - type: Clothing + sprite: Sirena/Clothing/Neck/Pendants/grey.rsi + - type: Construction + graph: CheapPendantGrey + node: pendantgrey + - type: PointLight + radius: 1.5 + energy: 3 + color: "#969696" + +- type: entity + parent: ClothingCheapPendantBase + id: ClothingCheapPendantRed + components: + - type: Sprite + sprite: Sirena/Clothing/Neck/Pendants/red.rsi + - type: Clothing + sprite: Sirena/Clothing/Neck/Pendants/red.rsi + - type: Construction + graph: CheapPendantRed + node: pendantred + - type: PointLight + radius: 1.5 + energy: 3 + color: "#FF4020" diff --git a/Resources/Prototypes/Sirena/Recipes/Craft/Graphs/pendants.yml b/Resources/Prototypes/Sirena/Recipes/Craft/Graphs/pendants.yml new file mode 100644 index 00000000000..ce6d05d7317 --- /dev/null +++ b/Resources/Prototypes/Sirena/Recipes/Craft/Graphs/pendants.yml @@ -0,0 +1,141 @@ +# by Malanisa :р +- type: constructionGraph + id: CheapPendantGreen + start: start + graph: + - node: start + edges: + - to: pendantgreen + steps: + - tag: CrystalShardGreen + name: A shard of green crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_green + doAfter: 1 + - material: Cable + amount: 10 + doAfter: 1 + - node: pendantgreen + entity: ClothingCheapPendantGreen + +- type: constructionGraph + id: CheapPendantOrange + start: start + graph: + - node: start + edges: + - to: pendantorange + steps: + - tag: CrystalShardOrange + name: A shard of orange crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_orange + doAfter: 1 + - material: Cable + amount: 10 + doAfter: 1 + - node: pendantorange + entity: ClothingCheapPendantOrange + +- type: constructionGraph + id: CheapPendantPink + start: start + graph: + - node: start + edges: + - to: pendantpink + steps: + - tag: CrystalShardPink + name: A shard of pink crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_pink + doAfter: 1 + - material: Cable + amount: 10 + doAfter: 1 + - node: pendantpink + entity: ClothingCheapPendantPink + +- type: constructionGraph + id: CheapPendantCyan + start: start + graph: + - node: start + edges: + - to: pendantcyan + steps: + - tag: CrystalShardCyan + name: A shard of cyan crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_cyan + doAfter: 1 + - material: Cable + amount: 10 + doAfter: 1 + - node: pendantcyan + entity: ClothingCheapPendantCyan + +- type: constructionGraph + id: CheapPendantBlue + start: start + graph: + - node: start + edges: + - to: pendantblue + steps: + - tag: CrystalShardBlue + name: A shard of blue crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_blue + doAfter: 1 + - material: Cable + amount: 10 + doAfter: 1 + - node: pendantblue + entity: ClothingCheapPendantBlue + +- type: constructionGraph + id: CheapPendantGrey + start: start + graph: + - node: start + edges: + - to: pendantgrey + steps: + - tag: CrystalShardGrey + name: A shard of grey crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_grey + doAfter: 1 + - material: Cable + amount: 10 + doAfter: 1 + - node: pendantgrey + entity: ClothingCheapPendantGrey + +- type: constructionGraph + id: CheapPendantRed + start: start + graph: + - node: start + edges: + - to: pendantred + steps: + - tag: CrystalShardRed + name: A shard of red crystal + icon: + sprite: Sirena/Structures/Decoration/crystal.rsi + state: crystalshard_red + doAfter: 1 + - material: Cable + amount: 10 + doAfter: 1 + - node: pendantred + entity: ClothingCheapPendantRed + diff --git a/Resources/Prototypes/Sirena/Recipes/Craft/pendants.yml b/Resources/Prototypes/Sirena/Recipes/Craft/pendants.yml new file mode 100644 index 00000000000..d99b02a9908 --- /dev/null +++ b/Resources/Prototypes/Sirena/Recipes/Craft/pendants.yml @@ -0,0 +1,91 @@ +# by Malanisa :р +- type: construction + name: Green crystal pendant + id: CheapPendantGreen + graph: CheapPendantGreen + startNode: start + targetNode: pendantgreen + category: construction-category-misc + objectType: Item + description: Pendant made of shining crystal and thin wire. + icon: + sprite: Sirena/Clothing/Neck/Pendants/green.rsi + state: icon + +- type: construction + name: Orange crystal pendant + id: CheapPendantOrange + graph: CheapPendantOrange + startNode: start + targetNode: pendantorange + category: construction-category-misc + objectType: Item + description: Pendant made of shining crystal and thin wire. + icon: + sprite: Sirena/Clothing/Neck/Pendants/orange.rsi + state: icon + +- type: construction + name: Pink crystal pendant + id: CheapPendantPink + graph: CheapPendantPink + startNode: start + targetNode: pendantpink + category: construction-category-misc + objectType: Item + description: Pendant made of shining crystal and thin wire. + icon: + sprite: Sirena/Clothing/Neck/Pendants/pink.rsi + state: icon + +- type: construction + name: Cyan crystal pendant + id: CheapPendantCyan + graph: CheapPendantCyan + startNode: start + targetNode: pendantcyan + category: construction-category-misc + objectType: Item + description: Pendant made of shining crystal and thin wire. + icon: + sprite: Sirena/Clothing/Neck/Pendants/cyan.rsi + state: icon + +- type: construction + name: Blue crystal pendant + id: CheapPendantBlue + graph: CheapPendantBlue + startNode: start + targetNode: pendantblue + category: construction-category-misc + objectType: Item + description: Pendant made of shining crystal and thin wire. + icon: + sprite: Sirena/Clothing/Neck/Pendants/blue.rsi + state: icon + +- type: construction + name: Grey crystal pendant + id: CheapPendantGrey + graph: CheapPendantGrey + startNode: start + targetNode: pendantgrey + category: construction-category-misc + objectType: Item + description: Pendant made of shining crystal and thin wire. + icon: + sprite: Sirena/Clothing/Neck/Pendants/grey.rsi + state: icon + +- type: construction + name: Red crystal pendant + id: CheapPendantRed + graph: CheapPendantRed + startNode: start + targetNode: pendantred + category: construction-category-misc + objectType: Item + description: Pendant made of shining crystal and thin wire. + icon: + sprite: Sirena/Clothing/Neck/Pendants/red.rsi + state: icon diff --git a/Resources/Prototypes/Sirena/tags.yml b/Resources/Prototypes/Sirena/tags.yml new file mode 100644 index 00000000000..bbf87eff28f --- /dev/null +++ b/Resources/Prototypes/Sirena/tags.yml @@ -0,0 +1,20 @@ +- type: Tag + id: CrystalShardBlue + +- type: Tag + id: CrystalShardCyan + +- type: Tag + id: CrystalShardGreen + +- type: Tag + id: CrystalShardGrey + +- type: Tag + id: CrystalShardOrange + +- type: Tag + id: CrystalShardPink + +- type: Tag + id: CrystalShardRed diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/equipped-NECK-hamster.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/equipped-NECK-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..45eea796c0c98b2e5e8d4e269752a3b3c4ced149 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;j58 zi(^Q|oVPbO@*Xk}XniQo!oB1qL!<(4@CHWb4Gyn#4(L=cemlW1v+gi zN%H&K2WPTpu|L0Fb!}_iw4~U1U%l*(?wT{z2BgpB1KZ+{cCF&8UVaC0Jzf1=);T3K F0RWV_X7d05 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/equipped-NECK.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..eb89b91a706575225ff654428ca86f767e57e9e3 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5hd`K7RKu$QD46Q$ z;uumf=j|l%Mw(Pv^{c+eVB6nky+ zvPs$RV|U&BX7&D~px|-SpUgmWKw!pMVV^&?=`S=EyBZjlOu48uLm(9-9)I_ao7}cH Re#VDEJWp3Ymvv4FO#lT4I*$MV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/icon.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a8ba294a9ebea16637517ad60186db71808deb24 GIT binary patch literal 860 zcmV-i1Ec(jP)4&XtvUEvIU8NH&G6V%L)Pl%B z6hYRBmU&@e7s_mvDTq2hQ3hk85WTY(wl~9xD1r<&@M0H(-iVl%x*D4_r=Ou}Yh9a< z^X|e`C{3DUYj&g0<>5Wg^PK5Wb!S{beqCyiSm z)L}4cbW-K1#b$TV8~z=P)>*~Z-kW&b$>fxsBA17ztq^KA7>fSMr-9X!m3!&!`U5dq z=4{=f4Q$@?Kpyvb7#dBoq{7d(jlzX%5u#6i;}hQ(6gf+I)Oiz$AI!S)i+T^#{7^3> z!9VbjR2sH!&QafeFZ z1`^MONch&g;)^z5j-*k288Yi^+?-g=SnM_#-A5uZ1{3#T;QPEMykG-WjXvpbd!n>( z8ZDYZ{5qyB03tAc4~EZKiZ}0&_rwa(G#&l5LMAh0CQ~H;Niz29;G28BXJq+~UyyQz zdMWhX{t^;bEO#sGp!Z0v;83VyjiHl&=O>#nVVXp*_q{R=m}j^(~N;X_+K= zwq8&IDIg=DL+pIFrRau#e5!mGSIWTg9yQBADlu(M{M0Imoes|t^S9KAvT4LGZ}o6npK><^L@&}&b`41j zA_BHI8l!DFwxMdb-*O47zx}K*g{|7{7k5+cC~8jBOYr3T+m@VVaW@475tL2CQR&3y mu!9NFpSueBEB_H69{vSJ>?k#h9@<6#0000k!tTZ_mI` Z^N}g0T;=CJxjT&@rJk;SF6*2UngA}gJwpHh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/inhand-right.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..aa6786838103e0d9662371ea7763b0fae84ae753 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP%y{S z#WAE}&f8mtf(-@&t_L#~I5Mzh7&K44!Ne@V&8A^|=kA$xP4lxqM==9cGyK@_E!QQV zWAmHxmB;<>SI=2|g>l*Yz4M~jS8Njp$ulr`ynCOf5V~04D$kNk(M7WwP1ZVHk>9hw co*`kHxN@$_&vikYIzj3@UHx3vIVCg!0OLYD{{R30 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/meta.json new file mode 100644 index 00000000000..d906818425a --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "copyright": [ + "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" + ], + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-NECK-hamster", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/equipped-NECK-hamster.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/equipped-NECK-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..06b3df099d4d8605e8916ab159956ecb54ff4dc8 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;if@ zi(^Q|oVPdE@*Z-KV0)nLIB|hw1M7z~jY%RxES~O;iIPkwnPeA42;~H-%uu@Z`l9!I z_xPgs<@T?585tNF%2prV)wwgTgD3Xeyz>6Zaj{`X*DJo>q{YT-aD+EydG3jr_V-^> z><;fU`@Lbud}j{MdG{r9XGc%lE_ZforO$7m3xJ^ErG&Hm4fDe~VH09}|1nhkes12e zv3!cx@7;R!@BEstJvn`Pqhzk?{6%{5r64l=Br^kp%LlgWB@Xi*{V7)lnc?Z`=d#Wz Gp$Pz}P-GSW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/equipped-NECK.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..72f30b50fabbb006f022bafc4d40b77fd7b9645c GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5hd`K7RKu$QD46c) z;uumf=j|_U)bN@apSYhZ$_XL2=qMTQ`D z?vRpra>BfV2v`@rA_M>ajVI^_;DbDvX&2Bqa9N(KG_O2@m)CR>BQzN1>FwW{VfrZX zdJ89D?cim3Y$td%(@Ux0VGULMG8pE?-5$yV)fgTRy=}KM&S=vH?>ZyBi5M|M;Wi8! zF$qP(Jng(kxn)vPUdF>4?XdlDhViFGz}l{}(rcuM7b%MUGihQLp=g+)n_*@xs%M7j zqxb49q~*}Kt(&rd6>Uf5o?l~VBu<%SvP%4X7x|68OE;-nyny0TFLzH~M7ABwy7E(c z57g~#5JtfI_6SLYmAXkN($34%ZB#7(h_Y%wf1bad_2y$SwGJc&`{N>_-+#h#-N(U5 z2eEU%Qn73a!;&C!`bu6nOtAyC&GSVqD#l)*qqip+@Giv;R6?l%ojvgNi3#gZx&xJs zH8RlJqqMFRT3;Hm^ijA7T&OnBs}ho8?n?rhdXbH^OPtxz6~p*??0Tx?8)ZPRzG`+tpfTypiNb7bg1WYXU7 zueU^WLAfm%iB3W#2; zqlz>nC5Q;PMj6jqb8JK92FtMttG9eu7{gX>u*BDtdlYrM8zi`A`nDyfS$s_aK?LQ} ra90?(+(lqR-;ehT`YZoF-o1DOK>{IAHG0~n00000NkvXXu0mjf00Nje literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/inhand-left.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3545a4a483b737f7d60395b12b78459c3b1f77a6 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP%z)q z#WAE}&f8m#f(-^dEC-|>^fII<^h)x4?dI5$u&82z=F8;p1HNkacZ1AiV6a+q{Mx2` zkL_2Czi?ixJpA@8pRI*e{*KkQ3)$VDGlG>cl>DxiH@GUNxcd0~H2VoxANy~XKk@40 dTXu#9{W#xXja1S3w^czZJzf1=);T3K0RYK_J~jXV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/inhand-right.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5eaaea6924306e09be0e5ed60703ed7bf866d08b GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP%zKa z#WAE}&f8m#ybT5dt_P(a^f06-^s+ebRbtYep}}Th_9oA0@q_a9wQCuH${A`R`g2|K zIW~XUeC6@-_jixSzGAriJ?^n)X+u^uSOG)BlYe<^L8e@RXB}pRDXx^;Fssq7sc*A|LIz@<@V{B@<0=Sz(7{>OQW;#87J10SD)}FY^bkm7N}-l zxn=+BPro0EZB>h(cP)3*)ISoXm6t%|PA@qI289OkvJZ9>6`M9q0vX}y>gTe~DWM4f Dd5L6} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/equipped-NECK.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..45d46c4417ea68556ec403e06f4c63aa1b3ed184 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5hd`K7RKu$QDA?%f z;uumf=k2YHyoVfkSTA(Dv`+bTN@P0&Z*&3gdyn4xlDc`9ie`tu|CxPVBKf^^S!uufZGNE9Ah5u6=d>5gA3iUv wwCA0eZJDOC-!<{kg{3{ZT*6+GK=}jP?cU6je_(p|Z#qc1r>mdKI;Vst0Dk~V5&!@I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/icon.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..15bf250047ce9a8d86dfa6679fa3723248f791a5 GIT binary patch literal 856 zcmV-e1E>6nP)3CR}_Z7JL7kp7!tb<8OMR307`_|vOtOeb0)dT@d$} z^YxWbYOiH6@I`iyq{p*(!d?JY;48Uy*$uR(_sXyu;koAp6?p07Z(^A^1AkyMy>bD{*<;B<^&V$3R=xE=f#0L@E_-mxp#f zCYFse*x5@>qaT~YPU6>YIQV2%7_?=ByHbqV$8iSSMEIOo_6B{wr&+bppfczq@mn`? zV0cavmuz6$oi_O=kf1NuPnF^06WPY4WCuOJJm7;(t8jW<+`aV|vVSfdmiQiMIMpKL zz_{2%o=HB^w-QT!$H?t|s#}9p)%tk&)BU15pVrbkkQdC&cCuFzwCbC=p8THC9|x%3 z5@bk*N!~8r_BXYp4%A22iQ4GI+@PcXnI~P*iy2bj)u1y6=SLT;zvvFswAV>GeqU)_ zlW08!#L%bU0{r~a5*#daAb4V}Xqt}xLLp-X3S)V4FLMn4&^z_)S)Z)V)*(KH8WkRS zGVska%bhK{FnFX#TwR(GKG$4U1Jeo~TRX#<^(~ORX}L)FT#KLt z@<2gAht!4tERC-J>H}4GdA&S7eoxIZkRO_`20z^_sWV-3V8($aQ8tatwS|K?nJvQd ze-*Mc0^`WKdDjJ_^UN9W@2)Q~f`YXO$b?B?XIKVr7Eg75{E_lULZUl$lwCt61rY(; z6k{-6;xyFkFf50#cJG?<1h!^}A^u3|Q8b)rk?_goJ1r%{;*W#`5tL2CQSHL!u!9Lb iU;kUyU-|cX_w)*_&msgrK-cyF0000+#|Bc!Yo;|<48)PH{gVmbS{F~-W zqSxtu;k;ORSoSTCt%X(oj@`Bk+1;Nrf|W3o{H~TaxGJZ(`uO}b`w3Sc`)`&%@#^DS cc7_K1xQPiWy7}#%cR(sVUHx3vIVCg!07un5Hvj+t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/inhand-right.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f31f18f8142ffde5627cc50e073b3929cfee9f72 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP%zii z#WAE}&f8mtf(-@&t_LL+EL-BhtXCl7xn)ZRH=Bm>ox5k&HOl*Yy~l%JF{ZjKh^*M literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/meta.json new file mode 100644 index 00000000000..d906818425a --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "copyright": [ + "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" + ], + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-NECK-hamster", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/equipped-NECK-hamster.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/equipped-NECK-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..87092aad4f9f309d1fa7f464c337bb96831b48f5 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;j%S zi(^Q|oVPc3^Byt~VGUs4$jls|l(p@I)0K%v{@WI8(=c{e#vv-?tI;Hz^K{OwN$)=| z-=zrDxZzES{dvvnPfu(}d;j>C#qHU{EpD;dDEw zi*|*e(K9u@neXM{J@4=N-skx~IIsVEsZI``ot>45i3#fUddv5*v9ae|Pp9DX^YfzA z@#pJ^fOI-7)oK;fGy(AY{Vz^HI-Qn!y-uUiz;PVP;Me|LA80pPrtUYPE`pU>FAD2) z&qqF=XJuujB^cUS!E3b|wr$hh-AyW$VsUYiVzEdx8pSkCR##V9US2+s%2Qv%si`Re zsMTsjA`z0wB$-Txjg1Y4hllCu>0xPU=}`Eo1q|ID5%%H3zISmPhtbhd78VvL6bi)S zae8}u$>nlw;c!|DY@zvvm+$`mfkYxfCX-=(eVte=#@^l@*=+VmIGl0=m#!s5ja{I5 zSx3*>4E+2GhGF3KdfDFICYQ?{JO9KR=zFtYexLhQX@v$_*+IfOhG8HgY;A41f`f~9 zAapY(nx>=wrI5!C&SRVX`aXaDbYB4ke|d==^$6)vlp^FxCgtyo|H;+^%@;q3%7bryJ8?FGZ-qs4L3L?}roi`Xln&Kz zD@V`mzaE#9f?bLGU`T==N7^$6?_BAqfPX9WY3wEZ z%DRVNZL0peugU$-imF9`U47yX{`nQDd{H<63x5@nhYG(r5cQq`5$@W$Z-5im@TW5D$+J+@CIUtCjJQ`iSK0IAsXhQjG_s{Hk cotK;X2c2Ck=Cs5=l}o! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/inhand-left.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0f4d08f1ba629f24b8122a161f92c8afd170a893 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP%z)q z#WAE}&f8lX1sfCuSR9V4=^W70Xlm1$++<=pt$u#O_J-!h4|%tNN*Nf`WUg0+-(MK> z-u8>&qR;of^<21i>r&;*V-gGP#pbeul`t5*eP4SZsJi8hoc-%N7it|s`}d!zTd?Z* ec6kPdeH9EjZnCj&FIv}v6nnb*xvXwD2zV;r5dHkl0kgWt{&oY{&gvFQ8(e;m>PrFG?Po z6145tpXqzt&o7?y`M(Kc+w-+s^R_bXe##0~#2{wA+jv8WyW%QigQ~o6`vt12j5qj% iE52fT|Baua=M&Sjx3aNo6pyU~srGdBb6Mw<&;$UKazC2@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/meta.json new file mode 100644 index 00000000000..d906818425a --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "copyright": [ + "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" + ], + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-NECK-hamster", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/equipped-NECK-hamster.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/equipped-NECK-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..a903e428bf288a8915fad2ee4ad63d4994e304bf GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;j@W zi(^Q|oVPc3^Byt~VGUrvcq!lj!Eya9m?Fxsp#|JPtcXH-#YoWv%b~M{>}(A0th}&bdt9)Ijj^mA?EBq2DabN%{w-h zPx1P_ThBfwe(|*@R|~JIMW6H!oUR@VB3C~F>Qky|Fd+;MdcYkz@$JbNFqPBX@x=~_r)(PAfBhI KpUXO@geCy~5jWrf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/icon.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..55d53789923f7c76638bc355060fa8f689612cd2 GIT binary patch literal 865 zcmV-n1D^beP)LGVr- zld>XGwu=?K8Jlk4V9d@>6hRb)xVwdc7mC^oWgyNCD^*adH=VV9#Ay0qKa5>ljoPF+ zuNP_|G-;1*vm1Rc!<+Z_ocDd6!-0?Wp_j_#@b-o}ng3ZGBnHx2Wh_3hcVZMtFVAeHy^O&RJ!q}ML=t)S{yIJ5(<$rrvS}_lw zdnW%}53~8Cj7i;;1vDO5Bi_U<5<@*0-dRZLIwI%ya{hXhWsBxg=*;KTg%-Zg0Ea2Q z2TFgf5)u$z?gBH3UbdFV#UKsW23WnMh+@wy&R%(#@yXxS)HaY5%$0d8Y8yf~RugIb zjWag}Syfqtyo}LsDKah`rkDb=Zv^#7C$+-Hg1^u4T}wZHmr4KA7|l`GeQx3nPkICH zniA;<-BViY2wF6S7&?BJi2#4zvIYkW9`J1|7fsXAUnnG=A{9@Pc$uL8bhiT7xeocG zAo*gpQ;k{>H%vS3T%zAY8+ma^=Oz^=-i3V2t(pUX!%X)%fmQL5Z|A8vmw^$zka#y7ZNXCY(!M9gR`;OKzFk^FtD4Ry- zp^1$+(v^Yb`O0tU1jg1+#_jXfjdN$f^UeG$CrDYdfDD^>zYfTgW0_su8+xQXwSLj_ zbyS{)j0hqEwl|C?p)6@|Z!|2Muz1sg+!)rq(GX8<_EVH@tCB$d^ra=MSv<9VK?G&f ruopS7+4I1J=)v1L{gnS$A6~r%NJS>bC;WzH00000NkvXXu0mjfb-|np literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/inhand-left.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ccbba091724a0d43058e32d393bca428ba17af19 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP%zKa z#WAE}&f8m#f(-^dEC-|>^fH(zaPfM)5_h!Fl*_pFWux{3waM>eHGzs57-YZw&bVp5 zWc78iUo9{8JdCn+=I=Wvy>74n8|J3ZU=<7uyUyNY*V*cR;?>9LH~CY({y6=HeN$D< eZ$^d({ro5D)MGmqJpwv`fx*+&&t;ucLK6UzKR`nO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/inhand-right.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e54daacfc1b795620f5a5a9ed7372b27c406b41c GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP%y{S z#WAE}&f8mtf(-@&t_LL+xG_ixw6duz?Nyk=!aPOtU0z!F!Sh=y*D?ZCGt}I8pX`>; zae4jPE03qYpZiy*wBc#>bK@-81vlbA@(c_LJNM6S4C!?WF`lq2v?Gh{(iX13`Vas9 bF*bz8Ess%;t&zGJ4pQgo>gTe~DWM4f+7dlh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/meta.json new file mode 100644 index 00000000000..d906818425a --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "copyright": [ + "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" + ], + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-NECK-hamster", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/equipped-NECK-hamster.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/equipped-NECK-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..d406153170b0ff895057df617dab4a4f956370e7 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;jZI zi(^Q|oVPbO@-`a?um%XHwiz%ary)8 z$^Na^cW1it;c1)a-+nwNUvAm6`x8DJm_{-`sc5_%DZQ!dp?L0n*W2ZW`;J9i3s2wW zvS;zRgW?}o{$T>@W?*QjniA0Y_Us1>trM}K^^Ch?fAV_$XwqDIf0xboNZ0UB=~tdY fNUchsV&)pg&XX<&v%cbP0l+XkK$(3Bw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/equipped-NECK.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..060d15fb1905aa2bbb06b80261b9505e0a0a7968 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5hd`K7RKu$QD46K! z;uumf=j|>Z-E{INe@i%=WFgP7tV4e@fV9d0X$*metcU zKb@)V@9#K~{h1vo0RkIltIzmReeP1=v5thKmm0|~28yRZ;`??nih3&Ru1}cr4#f3z L^>bP0l+XkK4?Z=M literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/icon.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..62a46343a0b6d028895f1cf51d5e290e63ba690d GIT binary patch literal 838 zcmV-M1G)T(P)={S=%4Uvv&1tz^F5T#EiImbSVK&#L5oG77GcaY zU@OF~#pwCagWu`LVL0dtcTIa|)-n)m2+CM^3}eK=up7__@wPbKiEeyOAI`Z>9``<` zmDXv&pA`eahM*W>gObq_+;iN}Gzot?^pyI=^?2rccocp_i?q!C)^%;{l0R6y&JtM4d1W;U~`_4fR_dwzwy zJ^E5jGmuV> zh7p+gML@i8QAP4U_t-I7e&3w|JT2#Z%73zsh#r1 Q5&!@I07*qoM6N<$g8R^o)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/inhand-left.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3ad439beba50ad52a85c53ec2d8b02afd99c9e97 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP%zWe z#WAE}&f8m#f(-^dEC*IGFiveW$@#c?$AiXYOZsCO&1crUk75R@WSCKK&vsS5hI!w_ zUoCI;Jbl!4rFrw`Y2E5S8BbP%^*V(a2P_Lck;Qgu3s+?QhkySV8)D-W WjkVrBm9yGUA`kL^`JvI7cDd!W!j2B6>+9XVcc}T> zp8fnr8mJuz=D73LKDfs-eT~9etG{e-zMW5>u(8Z*>EGDt_LKhYd?xmB)wW6cfz!id iPflNPI`k7z2j{((dnRukyS~l<>GyQ?b6Mw<&;$U2Yh&pE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/equipped-NECK.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..b51b54c9e894bbdc13676593cf0277957020f2b5 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|;yqm)Ln`LH zz2(h&KtaUy;A)K{9fbF#K7>uDRZm5r~cY+H+TCKtNoUn zuX6nzKhOXWNHF&|`1pO!(#1W32aj9|Jl2umG=&i;UQ^1Px%fk{L`R9J=WmR(B}VHC%I&&;}QLP@&Iifg;JqM>WugwPl08$^iIMS(X3y&(~4 zFBbH2k#(0GR}~*w-8Xr+@*F43Gm1AO$=D zhHXKWZVKoJnFcf)w9|&CfdEz~UN3q^UoH3*yX|7bciHd}APD$u`13`^*H#NY1!RFu zKs)dlNCHu;*1rOt<=MKj*YK2eXr_P$thPS_J^(F174WnGylerHvoT=~j$Dgl0ByiS zAPzJE)xb~@IFvhrtYGf0;MT=9nz2rv02+Z`z{?WwvIUsmbEr`Rqus;F3o+heIsFHg z^ItgV@QMZ0?5&eegYT6V&!MFZB&1V`Wr$H=$l-WPCIx#MMbmWj-wK&AFlMsMW#;(# z;F|(y2bt(TYsb#$J+Kdps&* zH$JX-I|BPcBD$cw8loxi*`;)tyqPXux9&uftQ71>+~J4>jx`i!g!@`u74SELryJ)v z3qD4YH60fT_r(My*8A5G&>?*(;b?T@S4ULcGSa=u+Y&a zQ67!Y{iThV`;v#{-(T-&1flNcqItnXMdl3n4{j|m0>haFWY#2bAS@I2^1FI`a8&s_ z>qXz7qbf8cCx{4mEXKrOfo-Vi2st)kZPzw;3|rF?5`SmmQAB!T67F5SZ7FCLe`mcQ tg7Rp1t9^L96<|W@`a4&D<=12F#UG?U)Ig(11110f002ovPDHLkV1iWPK=1$n literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/inhand-left.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0282354a4d1bd0bc7e3305b0cb02c3d74ed3e151 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|vOQfKLn`LH zy|q!W!GMR^LEhVd!IpU=*Xm8&Tdo{ArumOOpvY6x6{wPdfhXep+jsk%ciSp`72Nds z-n6a@$)ENVg@5W#ea;A0z`*mnTHfHQ+`>)A*ISvF%3rwp*nhM9i&r1tvNJU3%Lxbw Ut=u(Nz8|F4)78&qol`;+0JFC}SO5S3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/inhand-right.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2a694aa22d5d31cf25014cecdaa7d75b5f8def7a GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|3OrpLLn`LH zy>*bY!GMSL!UG|`2X`A|j)vZK6@RhN%TRMqx!x1;qSO6AwG0dy5$E5YJ2xS%f5xlN z`JeP``}^KU2JxJ)_T9#~`6(+{2}9TK-Npf{7Eib;DPg;Pwfu!iS0yzrho0DVaQ9zk ahQ&7W>xEX9ao?y1DfV>rb6Mw<&;$T@JVR&z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/meta.json new file mode 100644 index 00000000000..d906818425a --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "copyright": [ + "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" + ], + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-NECK-hamster", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..0625609060058b8ea400d0322c49c6819bc9f93a GIT binary patch literal 1127 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan.png new file mode 100644 index 0000000000000000000000000000000000000000..798c531fd4892a60445269c82c3e8d9b57fd21ff GIT binary patch literal 1127 zcmV-t1ep7YP)a}CLy+3173=y zP(mSy_0c?PO9c~x4+>sV5k(Yl(NL?lrVwrDf?8Hh18y2gvm|IzH*LHu+fa-Xv(oJD z?93b=W_Poby<`&wU;2j+X6Cz`-#KT_`QVzaX_FciRsM@}9GltX9y=-kFUrM#4Y4Tz z6s6#_UzUmn+c1E8?5L=hegfb=+|aJ#YDjdAjrBK-E~d4>za5b5}-R0AUHN*2b`Z-&t`sr$;*rQSj-8L3avUngL-lp zz-By`o{mhe3*gFp3572Z3WL$IligI|mnGSuRHl=z&dl4e#5!|u3R5~xx7plL0nEJ zQ(hl@a7b>f*@8O1x@Kv4nOHndNl6Ksp0Mpt8J>;&u`WPX8G33O7<%;xPKN`-G{6)P z$tpkH&`Ibznx+wr#xOOP5B$Z*{=GOWV0jp!)kDGSf>^S~%&hpF|ffPhq0*U0G zt}gtVG;fVoDpuDu*K=jSi__`k*~gw>7nOVxp60pZ{oJ#6cg_gpEW;GU{_r^&nm7V; zVWhbc0Qa_9*j7sz>&H9y`y8W*WbIGP;p*7QpU1xBg_(=#v)cAPOgy16`RQ=s2(-(% zWR9Vc&#g27krO^E0`oJVC@8=&zYm8)p}e{(ea4ouGMj(P3qt&J{I2jtqK{>1^^H+Oan0s14N@y;+jT6PuTlF();cAwla0%G#q-b zU^B`Fcz zrmhZt#~ZJ`o_>FGAzqY*EG`Um5oFD{3D?bOo-v9z2yfA)X&Ui#m7;9%-iT z)&@#zZ$dY8>;5QGdHVo8{i`1Iby+9YEs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan_medium.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan_medium.png new file mode 100644 index 0000000000000000000000000000000000000000..5455b2164d0ab86336c274a7cfdfb6ce499b7dcf GIT binary patch literal 983 zcmV;|11S87P)T7@<+Kxzl_0bv37OxzHD5y`os2PYn!$jX^jL2O7L z5C}R6;};R(mK;)Qd};M&^CPjVtMN5t*@0eF0Wcs;lO+yhPZjdcG60Umu5wcu%rC%? zeZQ~?JDaduAmp7cv`_%8ql?Bom}dl#JsyrVf58Ldcqs;8&%N&j2((ZD27>^^<8eeD zz62TH0@>rCrMVe^`k0E+(FI7RoY+hZUDrt@1Y!*&762_2Fd*tk3PH{L=neja(Rn}YZZHk*yjMb4#!N9H?TDQ8jFx&3o?a|^(Qk}ApPJxK7zU3w;i z^i19YFhSI{pXA%!UXJeG2Y^TjY*MD9B$hR|0Hh%HZF4aeoCIKThZA)qV9IeHK1d~7 z0MO$)36U_ZzSvdD?VjJ4HO~lOhL|!|ldcc{?&HDitP#uGp8>$JYdhiIL8x2aJS)KC z5P!5?GRCxyE>q4Eg+<2wt+q=PJSP+R^-nl_E+_N<1V}+JHwWX>u=%O1c|V+J1K{Cb zA!ztIXLCsZ!(`K;n#_NjA}35tfuj(feiG{1R%HIa(7%U9cC;%#wCex>002ovPDHLk FV1hPB#EJj_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan_small.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan_small.png new file mode 100644 index 0000000000000000000000000000000000000000..d9e924d7dc2ddf1b9cc082ea6451345f4c6b88e0 GIT binary patch literal 624 zcmV-$0+0QPP)OA5mrYw^&~73MDRehc zbW?vo2V^+i89Il6irofVnuU!HXH%KbHK^O;w%9&YRx4QA}Vqv zYexc-cbH%@!V@it{rfPUbgB|lOYgY-?JeBs7O!Vg^pmEabfsLCUF8ZEa~qG75!O2F z^kBmNB_z^wO8{j30nW)e0NM{8romtUV0Hc@gU2oa;28CAqU&@;0qw8AW<~N2VKKK7 zPR1E0Lwqb)($Z*ZMphIyx3(yX?HA-2^>BIlSykcX1yqS)Eao=6y?sQl-Xdr}ua@)q zJhGxt*eswZ%5TTzf;qs!-arY>aLL+1xA6$~?%V~S z^Xw^_cJCoIG6~ln7%B;9-T}#MH@KJMLV7V?vfmY-B>Q0wfHnVfH5B0f=T`v8ip-lw z!K%W`3T#UxgoFgs3z|IxiI-&k0XSphPLxo?lWIk?iyWC*2{&|XkVo@+J zJ*_Dmpt|Ofn}X>DFttE_9loyr*f+I6W(At}LQ^ALe^^uaKf!lzxAWKG!WKUO0000< KMNUMnLSTX`t`Um> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green.png new file mode 100644 index 0000000000000000000000000000000000000000..2b70777f4d0f89e32fad18e7d8a5423987186b63 GIT binary patch literal 1128 zcmV-u1eg1XP)HmDIXF8+%+MH`vqA8Ql<2gOJK z8e&5LNV#8+im8IZ)(zkvYZS^KVF310v!)A$Lag6`jOsHXlFL)58~}&JagmEWz51lu zBZnD^oOK;vhzs8I8-cJVHcF4VuC%|Z5`ecOhmnBGV=_A$f+@gI80zz-P08WFlg+qf(#z%!BgbHFbyyP zLDuop4V}0iN7FQ-(P&oSLXx`z08mrRrT53I-@>|tnOX^dTackgKf~wsVHgH6HRhUp zY|B@9dS(W|V8sWH2|o`_*$}#}J0@Oan&H-O5JI47n&X`Sb|#i#R7{EVDEd-?XK@0p#t0>D$$(nKANz0I!2)760_ge?Ja-2zeO zt|ro3R~@@j<7$eT|0IOR{nWDMUPATz_MpWzCcn4<2NoPT9etol?00OE z!QPWrpotifzB&ADWhkLA{_T}Wz~`fV?7VLWrR7^-aUOs>N=jH_*^W`y+(0xIW%|qU ztmKff1jENp=Q6~W(l7Jz$O&{^N0@@5L_hYo1z9?A)vo@Lryobv)HRc50r2XAG<@td zt4lYyv2;BrL~;2hR82)Ubj-9?oT*&N!L1bwFigYIc-$0?Mo~4DxUM_zN?G$g@Y<0zTd=4B0Wh?-W!j=}-{cl`r4I^mDeE9Sfa0000v zoX6<`=E~*Xkr8Im1^?tG_k8D^@Bce*nANOiHLGbzcH2a|xGB<+%QTbDC&l+OhWKCr z*=-Yw*OxYk4+4Ebhi&;gthKM0rTN;#n&D|W2NZrijVGA0KEf@ZGc5?#V3 zt&w9bZ+t8EEyi0jLm~%7P4Jy9K#$830FvwLEb5rWc^4&B;8nm`Bz) z#NR4}T(}Iy>qBYkr7{iXh5)kNLQVY%h8dxpuK?KmYL@^|ygs-U0w5NPA<}RY7@h*z zZlR(63;>6Nr*Sv6>)Hfg2Z=_b#Nz@n0}>rT;*867%b58u?Qr+4rcLG9>AO9t%h=sytJ{vN@+uyBG_`??Px$U)jSBv`btV3%e!MsC z8v>Xo7F-Lvt8+^7=*3GB%lW!s8$b0lLVgAeM#);Wh^+b9jAp(8CC=pxH-WgHt1tc_ zFfz>OKQA=1W?8?2NF;*K`2Y?)mvrt-S^`J;J{r!Sq3z$lXr_f`T2Pl_TveO)Bj9l)i6I>}MKk4N|YIEOlM4s`-(ASxP< zab@Fqsy6NiK*R+m$vFR1<~o1`#I_|{c>E{;KxC<;+XuEoWt6Z6fM_gAJaG|?k3PTX z6Z)M~n;QZcK^W=VC$$WZ469}NvpE3dE?>l8Yd=&>ZJrchB1G4Pn`%sH(mp;P&CgZ; zA71DobMagPozLLVP)g?S1xP?J8i4@;*~yz;KX(Oyw|Cyak<`s0aj2)#!5rh)CT|Y- k!;ou+k4-60`~OP+0rQ@2Ni<0_0000007*qoM6N<$f+s4rzW@LL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green_small.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green_small.png new file mode 100644 index 0000000000000000000000000000000000000000..4c0cd16cee24d6019987e5afbb6938db0a989423 GIT binary patch literal 610 zcmV-o0-gPdP)9pM%cySF>AUG*{Ky0l#q1T zsZ*zwMUW>?*5PSLP#1|H8jVfIimCC6Ak zVsMU=w0u1)-@jV~ARC_Lj0gbGbkIYMwswv$=_Ps(Ujx7w^3&RWtgL|bSJ3Prq7PE< z_7F?H<|$Doo{VqWvcpw}Fa`OQ6$-MT;=Yidz(R0K%}WdXBB6KPB7QN-NXtEyHVgw{ z3Uc`zrfC+vE^;P`2eGmOnpLo4;i`jXPH_p%)R%s~Hu$_GQ& zIeNMkVG3p*Cn30GS^sCOFQL0n>u3uU#oH$?;S2czikjc~cpspm=1^h+8>mUFPr-S< zk!)t}$GWqTYR%%m;<^A^-pY07*qoM6N<$f{@)2@c;k- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..91bbe51fb384947aa6479d1208f8f7318643ea13 GIT binary patch literal 1040 zcmV+r1n>KaP)vOMSXyXd zCH?~&E9-z=z(PgEKVWbPYREzm6bVLH5(EvJ7+En0+PK%uDZK{#E$?R4oAoKTCLVI*tY@V@i=*U zdIA9W{r7AN23wpcm&?pq#eq;L)Dk?IOxo7*^Yas$rlDT1v(gEI z0CNcffk0OPx81{PwTfb~2$#!+bUKZ-wKWn91}(uqK0cr*3i|r`plOhI%|(c zqgY;EhTH9iVHhm{H2M7eeCH#x8DMU1&N3jA$uNlKMfd*xj`j6*5JI4;YD-{RhFYyg z%vVPMs?pI=a2$tfwaNe#MFG&5eLkND0EnW9jg5^KIKSVITrLMe5Qr#>5Jj;!2Y`kP zp-_lHyu7>s02D<*I2^XDg~7o=h@yza#YOgPcz75W7Z)fL3IG6~&j-KXkIl_Z+wE!V z0EM6;gs_z^Ns^_n$KzqYIgUdrm4eIV!s_ZOd_EuY`8>9_w-JlQY#p%Oh7^M5d6GyZ zAW0G;kqCfBZ3BS-WLbv8;lSP99kaMpDq(7B3TJ0$czAeVv0||pR8>VXne6OS`GAo3VMwI1v9J*%QW;|<8XIioJ7QvtV&?`(1O*HPWZ&XsH}Zn#pje#3JK1Ds=9%Zd zW@hJE_|>m|^{a14Q53CMENVZItFM>IS65d(Lwp%PQ4~#8RR9D*AQFl61o0&RMNzc- z`}?;3ULe{4B9VwzDwVoUC`l5MB%vtEw;%>Ob;e>bN~Mx!u~-DXuhZ%!Ng@~we#h5P z+YVe_UbaAd95b8Eh@yzqY6Tz|43bPHe-_~4;sTS&gvn$g7K`!v`f5N}tyWZ3C6!A3 zhKz|PK&2B4}cxm*r__xE=+t@l#U@fL`ph}Y`{AP@*}c6Qbl z^YZdSqtT$*Z1x1w2B6<@Q4|RT0)#>#o}ZsvVm3E7Sy@@3TCGwn7I}PpY)kC-`?XT3 z)bex%;BvW8RTWiL2?m1{3I$^2$jL9dNtdg3ILsV0?W1(}~4mkxVAT-rkCb81OcDV$HBotcK|ws z!{KOwNTpKP?RN6{JhCjKk7qI&*4EaHx&8h9MsWhz+S+1iY3b92v=pLnIIQVkKEU?& zHi<-{<3w4OIXXIOJO5}jN;DcZz~|=XczSvw9*=j-)BmxN&*#@|HXEv{VzpXXTwLVj zg?9VD zjzE@Wd_Eu7*Vn}3apLi~vDLaf9uH$c_jjTNb#SLPi7Ize>O{{B9dO2ugFKd8ycNp5a#x-$P1;3LGxGMq}K zT4GEllkpx7hp|{J+}+&~3Wd5d|5pGVqS0tjE|(b^8u~Qu@bD0TY&OgJ`FYpo09^$; voz9MRd}L&Vx3@Qjhld#)9Q@MC|2O&r!(Nc&_A9!J00000NkvXXu0mjfeT=I_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey_small.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey_small.png new file mode 100644 index 0000000000000000000000000000000000000000..47ed9451b541b9682aadc67c9661f8f91ae5fe35 GIT binary patch literal 596 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange_small.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange_small.png new file mode 100644 index 0000000000000000000000000000000000000000..a5b084dd03a187a335d4d6e58a2aa63ceb564e24 GIT binary patch literal 627 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 Y0r0r(*Z8S9=Kufz07*qoM6N<$g0tfPod5s; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red.png new file mode 100644 index 0000000000000000000000000000000000000000..d8dd7e4bce740d9b2bd6dc42f12fb69d00bb6098 GIT binary patch literal 753 zcmVPx%t4TybR9J=WmcMIMK@i73r_svB{2;N&iC3tgg&<-f$Q6#oSu#EN|Z4Zr-~ig+;#bxZStAGoPKE zop-RUZ4Ia&V79`}jzJbx#QE|TKnw&>$QW<-0oFG_1=F#90L#)J6`<>c zuV*j<4#LThWcqh+?yzc?fXCR|b6K1(0XKoEkRu}3&_T?DnGvUl<^8xkEo?O2lZ3bq zoCKZ%AC;{sY@WY#rz-BV}yiDoOt|cIPqY;6>mT6bzViWPeA8u}7neRn?ng1T^Nn2f#@ijp+~e zW~`I018(;xaySnH+=fCM%t!`63wQ@ylKvr*Z^cpI8F07XN~l#-?NVTT5xAlHuhrbe zoX#O~1haOr=>WU2SssFTh)u|2*lW5Eo0$D5S_fv;4lbxa8!@@>Ma^3~FhB&x=!APK jzaN0F*ksJ@`G3(r5aGqd7(bc-00000NkvXXu0mjfJ{(Hi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red_medium.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red_medium.png new file mode 100644 index 0000000000000000000000000000000000000000..de7db6812fa0c2977f6e4e58e477be9120a35967 GIT binary patch literal 640 zcmV-`0)PF9P)Px%I!Q!9R9J=W)w@qrK@`XF&kBl>(3of>RuV8aY9JOClvXBm`w!62Y+++B7RE#? z8w(pTDwQ!-K4OEd$SZ1MjE_zNB#NR&B62P6+%W9DyY9jk7W|UQo-=pmobSBOvZEdC zXh&O6g=Cqe6|r`0XY%tFKr{_dA(;<$36tA|XbPZ0@~)tNI}ka5Ns^T&0``Sg*&;-H zQRfs^NV?KpM)B(VFus+nk#almtO_Fj)`?zp2Y(#1tp<3Cj?kv?ErRIAJmy-Iybz!l zqgcg2=(`>u=CK(1{%B1hD0~IIxE$;|cw8{%E7q{SO^_Tw_Qrcd@<;ewHRck|;TM+i zu^{kRcujF@2w*5c%uCPtOZ06KC((}&xKR-BJjobI3HR|Tv|7pm3{x5k_Q5(6mjlGj zsBe&DHS&*2-|YC!fwTbqz@cETOE2IIzGG5)R~AB?EctQ# z4&xq1RW;V8BPdJH>t!IGwz1WjMsPs7#qA-${^)y_{8&gnTPJxAV3<-FZz2Fy5ErF2 zVkG#9+R^`&JO_|LoWlFycgo*`vp5p$H5(5+TYXQ1$qNCBAc}NLdM`3%e^7_4@wJbm1)?HJH3EKnAfUz3F@EjJq3t7x1KsPx$Z%IT!R9J=W)W1qxK@`XF&jt&NK*UyTOp%n@St>{n@fjpf;0pvSB;|r#+V}#g zBw`^(&_F=c2!e5rAn15RjO3! zIjT;$BJ{%7i^m-91wVSL9phOk07PHW%rH`%WZOG zvKR5L1VCX1M#L-(;|I?1HMeIFP2BlE&x=?q8N4k(9^wN&;(cblfm<;X&4Tkye0eCq zbPhr$_(JM$#3CHW8!V;yDfD9npJ{zGZBAVOG^kw@6aTtrmfLv<$g}mcJj_>m)>Xm z!F%8D@BQ9;KX7qzarxhot|H0k%S|!*_%_v_f1eLLkS@$GH!A+(wJB6@?b7iL8F(~i zh^_59zQ7#-!oh!NV0e5>?ER29sQd5-K+8gEPN%G|5Dc}Ws{ZRUF!W3p+or|ANrZr3 zVK52PX`TIYhEODdqWZ{xS-c(tLr-%eUpz*5f~bCl;a*6k4Jw94YqSH|dxL!L6By5J zHMqyIxUNvEdudjqJn4hfoWV|UnOli2f}wWu>z@(Exb5k(ZQ$X^qR4JU*{PgxGaRSC zM=&{4p!n@0ZLxbaD*-avJVGCHG}^YGAp5n--OdQ%aD={YiPUU?s=h!=EQ!>lvZl?0 zgPWgYy8`8s0YLJ86Eo=o-;EEn#JVx}1%=##qq6^r<0gFb_B|eJ7fViHntO1lLFv_{ zH>&->__P43SAu{sim5dx8V4K<>=NFaOU-b_+Yks4+BB9ED!}U!CxRjfd zjqf{XJq7^n4ahYdV0dFzO3Dw)nxL~w5{E?AqOkOVRx?US*Z*CBq3o<|)~l2wIxVWk zATdU>7T;3qgu9QSY8v+Zk}Iu%XY;k^Vpkm;RpF?rGK@(gXHiI|3CB%B;Wj=lEW`DC zt{%9j07Gk&VyiVOM-+lagv)f1$XVnUExP(n(P~DqU%o@Gjk}&M*8$GYKa{i)Air0k zEpBo_3~p!M^7+LgvHsHpTXa$rGsx93PowQRKzcim5$WJW?@0y~lSF2j($m+ppXo&j z1zDY#1`jv)9H5Zf1QgC4iZYg2!I^qP$JqgjQYG_j&Qsfe$Kwu z1<7@|^`zmA>b`LFiU0(5_o&A^K?D|7;r?_}>)d?@zB&NZjWF!j;Jw|nId~bvn~#5) lr9Q#k$piVwe0+R-ege1?ob0ve5X}Gp002ovPDHLkV1oP6_l^Jn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_green.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_green.png new file mode 100644 index 0000000000000000000000000000000000000000..7564b4058e7f06b3e91d3df56420308e86e75149 GIT binary patch literal 542 zcmV+(0^$9MP)R3}?h9NB)|oZK`R6dk#9psdr5~d7tea zyx;fxzVG*b2Ob_C9{)RHKZ>N*?#a~gBrP`o`F>Sg*tPyZzvA~BkEFKk`@533JyTx> zZdkWuv16g12mlZ!p$=lAj=2Rr3|%q7QyHcnqNOS1MyNymhBpC zqeDRTbB&A4lrpU6>V!rOR9(Yd&L50{_@|rF-1&+O3N%$G!DZ4`hI+Qlk&{OmI6R2? zDi3$p9W{gET3lUYd$5BqqLJh}Y3n(aw?#(AVg#ch%-4D3WYcjcIyNw|9G9yRlS;SB zP%Ok1Il<$?6yIKc;noK_chL)Cs4NmupX~fpfSMn9?v=Mv* zA3$OrK*dHuQBWibY9Znuf>;F9I9u()R%`UP+ibpan7QZ9<;)rI@$vEb-wAw0kw&8- zOQjNyu0`K4BqXufVnmnCOsHzHpqA35afm*F59mnDEc;LD& zo6QE(G_foTRaFr}{JjRM)vCN)E(C)?gb?Vuj%k`~w_D=zIEtb$9*-~TCGSV5`@EH#^W))UhgGi1igyew$1&1ClZNJC=_V7+bk9fG)+TQ zRYs!`-EQ|~SH8TlTrNuh+qOxiQs}ylVHhlzOS0K4(P)%Tr{hT+JWOD{UK5MO&@>HQ z*J-s{Os7+l$t0mr=q+*ZV8Z==4?rf9!7vQw^Ev5sn(Ot7Wm)w5{kOuv^DC&=>)dWP zgbdW@N=lmGw#07*qoM6N<$f{3o>c>n+a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_orange.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..0bc81434a2a99a8255b603778674167b9aba61ab GIT binary patch literal 544 zcmV+*0^j|KP)#-28up~Tuyb!m~#g@WK}5kiH6 zqq}zMUW88VQix&~>83Pwa45yLVnQ;A(Ix&tFdnEmlr%|WoA@WfeGU$`Q|}V#;{BEn zK6u~f;o*J14;&mE9IiXAt7x)2GbHXl9)fD=@8+SW|LosTuXz6JOHnc9n(ON_U`#&~ zC#5~w{mR9Kr}_UG*qa&3YT#9TW!s14bfWL`G#ab#g8OTnBg<09BMJgl7 zJ_z-bO^lJ&f6^9EQDlkOa>i0Gw_Wk|$*?#rWRS!mlGg(r0~pB&sm&b0Ru$DJ6JOcp zMbz4W+cK~|85Yt}hMQ&uP4z<8AVwlWa`k}jt~&($P0TN482KnHZScgf%f5E5_@4wtkcOLBv`Bjt=Sf<;BV$3ZCQ(z_(>;{C=Kp8x-O zpXdKTOiWD7b4MG6$jQoy%&yEr|B3iV?XUWYVa>Z=yCRkhTt7aHx%b(V>-IHs`rO0A z)PHQCz1$Y9r=ef!kOFLQi!Mk05t+#hsbuQkHQ?r52|5ABrGa{-;1jqdm)dy^D{Y}G zol3J3N-J^(>iN3dG;dHB3iU$4GI&J~+qcQ4v!s)0s;w%ktcD7Bqz3Bwx~QgN;`apR zOB234m>>Q+WN~JZ%w&dx<^csMjO4l=QF&hxf5DfA*^s+;cM_}x(t6#Jo$(!MylF`1 zZAZ4)ihK^CGtmFp$Cx)TrVO+X8cxxn+%J=x&XLrT?EToIK=hx7UV-O(0F33vaK1b2 zU+l9qy@YgyvQr*-?2)fv_uDRKi8HLgqSx(VW3$1=z&j6JSfV5VSBWdKK^8%%Qe~U% zp#m3r0;ik;U!1M95+F{@Eylg-heT1-sLv*aH3i=e06MX=8R0000< KMNUMnLSTY&3G?6p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_red.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_red.png new file mode 100644 index 0000000000000000000000000000000000000000..8c5d0907b0b0bb7c346f96823501780a84cd8bb9 GIT binary patch literal 361 zcmV-v0ha!WP)Px$BS}O-R9J=W)z2ygVHn5pkArfQq{zlXl(KL(vbA$dZo!U?atAIzxBz5B5k*2_ zA^Fou7N>BG#k@*Z^PV|uyuZyf)6DaIo?pNB8IqEclK#6o+EHYMYz~bd&!-C1?M4uwbpuSolJ) zJqz&Z0KddAdIEf>V8AP}@H*bmhZ$_(3}bTZ53n6^x(dHIpAW5$QMv8wxWFX(u@wm? z!htIc$|tR14aXQkcZ+Z$LU_Iwo|cxVHhh!F05gFWG>O+T`vq@<)z*sVbDrx5u$00000NkvXX Hu0mjfX4;uY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/meta.json b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/meta.json new file mode 100644 index 00000000000..eef039d036f --- /dev/null +++ b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/meta.json @@ -0,0 +1,96 @@ +{ + "version": 1, + "copyright": [ + "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" + ], + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "crystal_green" + }, + { + "name": "crystal_pink" + }, + { + "name": "crystal_orange" + }, + { + "name": "crystal_blue" + }, + { + "name": "crystal_cyan" + }, + { + "name": "crystal_grey" + }, + { + "name": "crystal_red" + }, + { + "name": "crystal_green_medium" + }, + { + "name": "crystal_pink_medium" + }, + { + "name": "crystal_orange_medium" + }, + { + "name": "crystal_blue_medium" + }, + { + "name": "crystal_cyan_medium" + }, + { + "name": "crystal_grey_medium" + }, + { + "name": "crystal_red_medium" + }, + { + "name": "crystal_green_small" + }, + { + "name": "crystal_pink_small" + }, + { + "name": "crystal_orange_small" + }, + { + "name": "crystal_blue_small" + }, + { + "name": "crystal_cyan_small" + }, + { + "name": "crystal_grey_small" + }, + { + "name": "crystal_red_small" + }, + { + "name": "crystalshard_green" + }, + { + "name": "crystalshard_pink" + }, + { + "name": "crystalshard_orange" + }, + { + "name": "crystalshard_blue" + }, + { + "name": "crystalshard_cyan" + }, + { + "name": "crystalshard_grey" + }, + { + "name": "crystalshard_red" + } + ] +} diff --git a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json new file mode 100644 index 00000000000..6eaa618c499 --- /dev/null +++ b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "copyright": [ + "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" + ], + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stalagmite1" + }, + { + "name": "stalagmite2" + }, + { + "name": "stalagmite3" + }, + { + "name": "stalagmite4" + }, + { + "name": "stalagmite5" + } + ] +} diff --git a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite1.png b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite1.png new file mode 100644 index 0000000000000000000000000000000000000000..c804cc9c33542ae987636dcf3557cb75fa1b9e7b GIT binary patch literal 1070 zcmV+}1kwA6P)iPcS}}@*Q)~f7*~p43E=))*Ca8T2Oli2!b$+8Z&nFk9Y93LE58ze zT`5>=in>87_1^%b&aAA$(kZz2`c+Asp_e8I%R6yt0Hq*CAxNaE1E0S6>QWS^0(^0b zz3L`X)D4G4g|o}o^3susGYs;Qaow=J)**A2k8i(xW)+qKxVw8rY9FYZNE6!%$ehKR zv%6uT3qE`M+QQqU&alvvi2ricJa5he1+VU7rNonuta&V|#)_5uYIMk_YD>4`Kbz!}Z+{SGgk-(<6!(s34z zqTfkyM$b%zJJ&BtQJoP$wU@&g%?s!H0DQE2dAfJi1S%hoq&?X`@JUdl!%Vei%@ zIlft0H;l^q-vPAp3*)+_KC)ITdHVSgU&O3|I^9j%)CgPh@b7GkCm ziGbFMqVhZ$mD5=trM*<;16g8eLPREYGO9dTVo`uKdZr(2bW@aq-w%s_Rsh;fFKqYm zA+VOY37CLDUe#?6m;m)VDN%$`=?SrQh%=fyH+H6Jutu}J*5SqH*7^LMlP!K$fr$#% zXwGl+XhNJS0}!H6`39{u-PBQsNH=jDjw_-FhvOQf)Ul}`JRXkeXKj%>bMnq7OndM4 zRT-6@Zfd!()kjY}z5jH?u&hxEv{Hm97_CXIp_{q(VG<*y4^z+AO+af!h>^rvtX7=g z?2%2<^X0=I)JzKMCV&VU#n=Z*AE=tZ#PUE}3)ZN~fequzPY!C^@>=HTPtv9)zel}k zkXMZU_I{iKeE8aBQ78oPAtDG-geC|gGEKoz8k7P-7}uV|qC!N_sy#FaeDmWYbp#Pb z=w%6|Z+JW$b8yTJa|ig{-78{^rk6UjR($>4&nLdyyR|cSuqXu&zkhV%+xKqlh*oN< opf#Fv{SIG!`_uAo`DeNQ0(*uYIxv$p- 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 N002ovPDHLkV1g>Fm}39{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite5.png b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite5.png new file mode 100644 index 0000000000000000000000000000000000000000..87a593a9f0ba18fc156d77d550f4dc82efc5a37b GIT binary patch literal 964 zcmV;#13UbQP)5{Lz0{9p^<#z)3{GD5p7|s0;w^yMPKD>WDgrf4D0BomZt(n#h zTB-jAAa$m*3R{=p-kUciafW`HAZ*`>TLUNsF$zH3?bo)VxDepW3)-u0BGbCz zY+B*$_FmpPGjWDdQ8KF=4hB6kXZhsrD;uk@6~M=LUY6Pi>L${})&ZHbShIOItnGp? z-o3Tc!OV6V~6C%Hj3LcFn_$H7#%T6!l*OT!k|GpStkR^=EntEOefcIX1Q3Rn0kto8n z^89=}=5$)|=VV3{!RXD5xDw!l+t(!u^i#*^2^Ex5Tp8x<7Mwhd85o|BdUHD#Nk@a}})7T;1){gt$-! zAVi_^4O(mR)KP~>o;c2C6;Xt&1$q( zXw^a(tx2sR&s=*kiILKW#q_M3fY$K!_YW^*u>ePhtz2~zKm?6q<^x76l;T`#J-0XD zq-ecSdRgp)x@pJqAaf|-coJ6pZaFlxlv-&*j2NTvAtDG-geC|g!Z$xWR3Q9vGUnNx zoPO$v(w1XddbDb1hXO)tmw!C{QVAX_VYR^;O+R&LttiTxufF?9{r$bnS!Q)ZY7NF{ mQfDwq@!;DZx4) Date: Wed, 22 May 2024 18:06:30 +0300 Subject: [PATCH 02/33] fix_wintercoats --- .../Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml | 2 -- Resources/Prototypes/NES/Entities/Objects/Clotches/clotches.yml | 0 .../Prototypes/NES/Entities/Objects/Clotches/hardsuits.yml | 0 .../NES/Entities/Objects/Weapons/Pukalki/salvages.yml | 0 4 files changed, 2 deletions(-) delete mode 100644 Resources/Prototypes/NES/Entities/Objects/Clotches/clotches.yml delete mode 100644 Resources/Prototypes/NES/Entities/Objects/Clotches/hardsuits.yml delete mode 100644 Resources/Prototypes/NES/Entities/Objects/Weapons/Pukalki/salvages.yml diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 62404f06274..44d8b03862b 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -33,8 +33,6 @@ - WhitelistChameleon - type: StaticPrice price: 70 - - type: ToggleableClothing - clothingPrototype: ClothingHeadHatHoodWinterDefault - type: entity parent: ClothingOuterWinterCoat diff --git a/Resources/Prototypes/NES/Entities/Objects/Clotches/clotches.yml b/Resources/Prototypes/NES/Entities/Objects/Clotches/clotches.yml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Prototypes/NES/Entities/Objects/Clotches/hardsuits.yml b/Resources/Prototypes/NES/Entities/Objects/Clotches/hardsuits.yml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Prototypes/NES/Entities/Objects/Weapons/Pukalki/salvages.yml b/Resources/Prototypes/NES/Entities/Objects/Weapons/Pukalki/salvages.yml deleted file mode 100644 index e69de29bb2d..00000000000 From 5be72943831e5bd81a98702b90cd4783ca5e93f5 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:45:41 +0300 Subject: [PATCH 03/33] Update meta.json --- .../Sirena/Structures/Decoration/stalagmite.rsi/meta.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json index 6eaa618c499..8e816e4f8ec 100644 --- a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json +++ b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json @@ -1,8 +1,7 @@ { "version": 1, - "copyright": [ - "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" - ], + "license": "CC-BY-SA-3.0" + "copyright": ["Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)"], "size": { "x": 32, "y": 32 From 5201a7f794dc833827977477fb847916b4b7925d Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:46:59 +0300 Subject: [PATCH 04/33] Update meta.json --- .../Sirena/Structures/Decoration/stalagmite.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json index 8e816e4f8ec..ac177970de4 100644 --- a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json +++ b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0" - "copyright": ["Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)"], + "copyright": "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)", "size": { "x": 32, "y": 32 From 3abcaa1edcfd2ccdf33953d73f8c18d21b6f3b8a Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:50:12 +0300 Subject: [PATCH 05/33] Update meta.json --- .../Sirena/Structures/Decoration/stalagmite.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json index ac177970de4..0eee1190cea 100644 --- a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json +++ b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0" + "license": "CC-BY-SA-3.0", "copyright": "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)", "size": { "x": 32, From f35008f5264ced155fe2e5867a773001c7bc5aff Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:51:07 +0300 Subject: [PATCH 06/33] Update meta.json --- .../Sirena/Structures/Decoration/crystal.rsi/meta.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/meta.json b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/meta.json index eef039d036f..7e6b97e1d20 100644 --- a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/meta.json +++ b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/meta.json @@ -1,8 +1,7 @@ { "version": 1, - "copyright": [ - "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" - ], + "license": "CC-BY-SA-3.0", + "copyright": "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)", "size": { "x": 32, "y": 32 From a6e6d64a8debbd031f7215893c37bf607a302926 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Wed, 22 May 2024 19:51:09 +0300 Subject: [PATCH 07/33] fix_map --- Resources/Maps/ADTMaps/adt_avrite.yml | 2 +- Resources/Maps/ADTMaps/adt_delta.yml | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Maps/ADTMaps/adt_avrite.yml b/Resources/Maps/ADTMaps/adt_avrite.yml index 6c9229cbb61..28b707bc12c 100644 --- a/Resources/Maps/ADTMaps/adt_avrite.yml +++ b/Resources/Maps/ADTMaps/adt_avrite.yml @@ -22365,7 +22365,7 @@ entities: pos: -42.5,4.5 parent: 2 - type: Door - secondsUntilStateChange: -1389.5288 + secondsUntilStateChange: -1392.6122 state: Opening - type: DeviceLinkSink links: diff --git a/Resources/Maps/ADTMaps/adt_delta.yml b/Resources/Maps/ADTMaps/adt_delta.yml index f42831b24a8..12129608ab4 100644 --- a/Resources/Maps/ADTMaps/adt_delta.yml +++ b/Resources/Maps/ADTMaps/adt_delta.yml @@ -18227,7 +18227,7 @@ entities: pos: 51.5,11.5 parent: 13307 - type: Door - secondsUntilStateChange: -14708.683 + secondsUntilStateChange: -14728.001 state: Opening - uid: 2175 components: @@ -18236,7 +18236,7 @@ entities: pos: 49.5,4.5 parent: 13307 - type: Door - secondsUntilStateChange: -63484.715 + secondsUntilStateChange: -63504.03 state: Opening - proto: AirlockAtmosphericsGlass entities: @@ -18427,7 +18427,7 @@ entities: pos: 45.5,3.5 parent: 13307 - type: Door - secondsUntilStateChange: -63768.87 + secondsUntilStateChange: -63788.188 state: Opening - uid: 3108 components: @@ -18799,7 +18799,7 @@ entities: pos: -3.5,-9.5 parent: 13307 - type: Door - secondsUntilStateChange: -89.89924 + secondsUntilStateChange: -109.21745 state: Opening - uid: 17204 components: @@ -19679,7 +19679,7 @@ entities: pos: 74.5,33.5 parent: 13307 - type: Door - secondsUntilStateChange: -23319.588 + secondsUntilStateChange: -23338.906 state: Opening - uid: 11503 components: @@ -20396,7 +20396,7 @@ entities: pos: 60.5,24.5 parent: 13307 - type: Door - secondsUntilStateChange: -28821.432 + secondsUntilStateChange: -28840.75 state: Opening - proto: AirlockHydroGlassLocked entities: @@ -20680,7 +20680,7 @@ entities: pos: 1.5,41.5 parent: 13307 - type: Door - secondsUntilStateChange: -72513.68 + secondsUntilStateChange: -72533 state: Opening - uid: 9959 components: @@ -21779,7 +21779,7 @@ entities: pos: 57.5,37.5 parent: 13307 - type: Door - secondsUntilStateChange: -23636.137 + secondsUntilStateChange: -23655.455 state: Opening - uid: 11596 components: @@ -111903,7 +111903,7 @@ entities: pos: -63.5,-31.5 parent: 13307 - type: Door - secondsUntilStateChange: -66724.055 + secondsUntilStateChange: -66743.375 state: Closing - uid: 23371 components: @@ -113898,7 +113898,7 @@ entities: pos: 26.5,6.5 parent: 13307 - type: Door - secondsUntilStateChange: -16296.65 + secondsUntilStateChange: -16315.969 state: Closing - type: DeviceNetwork deviceLists: @@ -114198,7 +114198,7 @@ entities: pos: 11.5,-21.5 parent: 13307 - type: Door - secondsUntilStateChange: -1188.8333 + secondsUntilStateChange: -1208.1515 state: Closing - uid: 29394 components: @@ -114454,7 +114454,7 @@ entities: pos: -43.5,13.5 parent: 13307 - type: Door - secondsUntilStateChange: -9885.451 + secondsUntilStateChange: -9904.77 state: Closing - uid: 34431 components: @@ -247098,7 +247098,7 @@ entities: pos: 7.5,44.5 parent: 13307 - type: Door - secondsUntilStateChange: -4287.915 + secondsUntilStateChange: -4307.2334 state: Opening - uid: 20774 components: From 641d38e475f13b3efbcff74621f285f0f3f235ac Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:51:29 +0300 Subject: [PATCH 08/33] Update meta.json --- .../Sirena/Clothing/Neck/Pendants/blue.rsi/meta.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/meta.json index d906818425a..ac703a3fbc0 100644 --- a/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/meta.json +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/meta.json @@ -1,8 +1,7 @@ { "version": 1, - "copyright": [ - "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" - ], + "license": "CC-BY-SA-3.0", + "copyright": "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)", "size": { "x": 32, "y": 32 From cbd9e0ede08bc362bec3b4191a47d1178e44db34 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:52:10 +0300 Subject: [PATCH 09/33] Update meta.json --- .../Sirena/Clothing/Neck/Pendants/cyan.rsi/meta.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/meta.json index d906818425a..ac703a3fbc0 100644 --- a/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/meta.json +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/meta.json @@ -1,8 +1,7 @@ { "version": 1, - "copyright": [ - "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" - ], + "license": "CC-BY-SA-3.0", + "copyright": "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)", "size": { "x": 32, "y": 32 From 1a42315497447b9c4f48c0f1822503df4fd9f5c9 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:52:31 +0300 Subject: [PATCH 10/33] Update meta.json --- .../Sirena/Clothing/Neck/Pendants/green.rsi/meta.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/meta.json index d906818425a..ac703a3fbc0 100644 --- a/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/meta.json +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/meta.json @@ -1,8 +1,7 @@ { "version": 1, - "copyright": [ - "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" - ], + "license": "CC-BY-SA-3.0", + "copyright": "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)", "size": { "x": 32, "y": 32 From 34d43e09e1ee094853fa85b07a1448e0fd39be68 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:52:46 +0300 Subject: [PATCH 11/33] Update meta.json --- .../Sirena/Clothing/Neck/Pendants/grey.rsi/meta.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/meta.json index d906818425a..ac703a3fbc0 100644 --- a/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/meta.json +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/meta.json @@ -1,8 +1,7 @@ { "version": 1, - "copyright": [ - "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" - ], + "license": "CC-BY-SA-3.0", + "copyright": "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)", "size": { "x": 32, "y": 32 From f4bb584eee53bce4d7d3990b10cbb8808daae77a Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:53:08 +0300 Subject: [PATCH 12/33] Update meta.json --- .../Sirena/Clothing/Neck/Pendants/orange.rsi/meta.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/meta.json index d906818425a..ac703a3fbc0 100644 --- a/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/meta.json +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/meta.json @@ -1,8 +1,7 @@ { "version": 1, - "copyright": [ - "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" - ], + "license": "CC-BY-SA-3.0", + "copyright": "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)", "size": { "x": 32, "y": 32 From f594301ec1dbd8a5f44794d70eb19910fcf16e31 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:53:24 +0300 Subject: [PATCH 13/33] Update meta.json --- .../Sirena/Clothing/Neck/Pendants/pink.rsi/meta.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/meta.json index d906818425a..ac703a3fbc0 100644 --- a/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/meta.json +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/meta.json @@ -1,8 +1,7 @@ { "version": 1, - "copyright": [ - "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" - ], + "license": "CC-BY-SA-3.0", + "copyright": "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)", "size": { "x": 32, "y": 32 From dd39e7c4464886b3c17674b5fdd6bbe06c43fc27 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Wed, 22 May 2024 19:53:39 +0300 Subject: [PATCH 14/33] Update meta.json --- .../Textures/Sirena/Clothing/Neck/Pendants/red.rsi/meta.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/meta.json index d906818425a..ac703a3fbc0 100644 --- a/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/meta.json +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/meta.json @@ -1,8 +1,7 @@ { "version": 1, - "copyright": [ - "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)" - ], + "license": "CC-BY-SA-3.0", + "copyright": "Malanisa (discord: ✦\uD835\uDD78\uD835\uDD86\uD835\uDD91\uD835\uDD86\uD835\uDD93\uD835\uDD8E\uD835\uDD98\uD835\uDD86✦#5800)", "size": { "x": 32, "y": 32 From a562a2ec7cbe1d820258588635943f132d12866c Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Wed, 22 May 2024 22:09:17 +0300 Subject: [PATCH 15/33] Revert "fix_map" This reverts commit a6e6d64a8debbd031f7215893c37bf607a302926. --- Resources/Maps/ADTMaps/adt_avrite.yml | 2 +- Resources/Maps/ADTMaps/adt_delta.yml | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Maps/ADTMaps/adt_avrite.yml b/Resources/Maps/ADTMaps/adt_avrite.yml index 28b707bc12c..6c9229cbb61 100644 --- a/Resources/Maps/ADTMaps/adt_avrite.yml +++ b/Resources/Maps/ADTMaps/adt_avrite.yml @@ -22365,7 +22365,7 @@ entities: pos: -42.5,4.5 parent: 2 - type: Door - secondsUntilStateChange: -1392.6122 + secondsUntilStateChange: -1389.5288 state: Opening - type: DeviceLinkSink links: diff --git a/Resources/Maps/ADTMaps/adt_delta.yml b/Resources/Maps/ADTMaps/adt_delta.yml index 12129608ab4..f42831b24a8 100644 --- a/Resources/Maps/ADTMaps/adt_delta.yml +++ b/Resources/Maps/ADTMaps/adt_delta.yml @@ -18227,7 +18227,7 @@ entities: pos: 51.5,11.5 parent: 13307 - type: Door - secondsUntilStateChange: -14728.001 + secondsUntilStateChange: -14708.683 state: Opening - uid: 2175 components: @@ -18236,7 +18236,7 @@ entities: pos: 49.5,4.5 parent: 13307 - type: Door - secondsUntilStateChange: -63504.03 + secondsUntilStateChange: -63484.715 state: Opening - proto: AirlockAtmosphericsGlass entities: @@ -18427,7 +18427,7 @@ entities: pos: 45.5,3.5 parent: 13307 - type: Door - secondsUntilStateChange: -63788.188 + secondsUntilStateChange: -63768.87 state: Opening - uid: 3108 components: @@ -18799,7 +18799,7 @@ entities: pos: -3.5,-9.5 parent: 13307 - type: Door - secondsUntilStateChange: -109.21745 + secondsUntilStateChange: -89.89924 state: Opening - uid: 17204 components: @@ -19679,7 +19679,7 @@ entities: pos: 74.5,33.5 parent: 13307 - type: Door - secondsUntilStateChange: -23338.906 + secondsUntilStateChange: -23319.588 state: Opening - uid: 11503 components: @@ -20396,7 +20396,7 @@ entities: pos: 60.5,24.5 parent: 13307 - type: Door - secondsUntilStateChange: -28840.75 + secondsUntilStateChange: -28821.432 state: Opening - proto: AirlockHydroGlassLocked entities: @@ -20680,7 +20680,7 @@ entities: pos: 1.5,41.5 parent: 13307 - type: Door - secondsUntilStateChange: -72533 + secondsUntilStateChange: -72513.68 state: Opening - uid: 9959 components: @@ -21779,7 +21779,7 @@ entities: pos: 57.5,37.5 parent: 13307 - type: Door - secondsUntilStateChange: -23655.455 + secondsUntilStateChange: -23636.137 state: Opening - uid: 11596 components: @@ -111903,7 +111903,7 @@ entities: pos: -63.5,-31.5 parent: 13307 - type: Door - secondsUntilStateChange: -66743.375 + secondsUntilStateChange: -66724.055 state: Closing - uid: 23371 components: @@ -113898,7 +113898,7 @@ entities: pos: 26.5,6.5 parent: 13307 - type: Door - secondsUntilStateChange: -16315.969 + secondsUntilStateChange: -16296.65 state: Closing - type: DeviceNetwork deviceLists: @@ -114198,7 +114198,7 @@ entities: pos: 11.5,-21.5 parent: 13307 - type: Door - secondsUntilStateChange: -1208.1515 + secondsUntilStateChange: -1188.8333 state: Closing - uid: 29394 components: @@ -114454,7 +114454,7 @@ entities: pos: -43.5,13.5 parent: 13307 - type: Door - secondsUntilStateChange: -9904.77 + secondsUntilStateChange: -9885.451 state: Closing - uid: 34431 components: @@ -247098,7 +247098,7 @@ entities: pos: 7.5,44.5 parent: 13307 - type: Door - secondsUntilStateChange: -4307.2334 + secondsUntilStateChange: -4287.915 state: Opening - uid: 20774 components: From 18d48f7d8ca09f10279baccbd210889e82ab7ac3 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Wed, 22 May 2024 22:14:43 +0300 Subject: [PATCH 16/33] =?UTF-8?q?=D0=BD=D0=B0=D1=85=D0=B5=D1=80=20=D0=BF?= =?UTF-8?q?=D1=83=D1=81=D1=82=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=B0=D0=BF=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=81=20=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC=D0=B8=20=D1=84=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/NES/Traits/disabilities.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 Resources/Prototypes/NES/Traits/disabilities.yml diff --git a/Resources/Prototypes/NES/Traits/disabilities.yml b/Resources/Prototypes/NES/Traits/disabilities.yml deleted file mode 100644 index af442fb44d3..00000000000 --- a/Resources/Prototypes/NES/Traits/disabilities.yml +++ /dev/null @@ -1,11 +0,0 @@ -# - type: trait -# id: Nearsighted -# name: trait-nearsighted-name -# description: You require glasses to see properly. -# traitGear: ClothingEyesGlasses -# components: -# - type: Nearsighted -# whitelist: -# components: -# - Blindable - From 2cb2801dfba1b06ee02834f3f55f30e48fa2089c Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:14:11 +0300 Subject: [PATCH 17/33] old crystal shards 1984 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Чтобы не мешались --- .../Objects/Materials/crystal_shard.yml | 273 +++++++++--------- 1 file changed, 137 insertions(+), 136 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml index 884a5531e7f..728b1ad8e34 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml @@ -1,136 +1,137 @@ -- type: entity - abstract: true - parent: BaseItem - id: ShardCrystalBase - name: crystal shard - description: A small piece of crystal. - components: - - type: Sharp - - type: Sprite - layers: - - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - map: [ "enum.DamageStateVisualLayers.Base" ] - - type: RandomSprite - available: - - enum.DamageStateVisualLayers.Base: - shard1: "" - shard2: "" - shard3: "" - - type: SpaceGarbage - - type: MeleeWeapon - wideAnimationRotation: -22.5 - attackRate: 1.5 - damage: - types: - Slash: 3.5 - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Glass - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: StaticPrice - price: 50 - -- type: entity - parent: ShardCrystalBase - id: ShardCrystalCyan - name: cyan crystal shard - description: A small piece of crystal. - components: - - type: Sprite - color: "#47f8ff" - - type: PointLight - radius: 2 - energy: 2.5 - color: "#47f8ff" - - type: Tag - tags: - - Trash - - CrystalCyan - -- type: entity - parent: ShardCrystalBase - name: blue crystal shard - id: ShardCrystalBlue - components: - - type: Sprite - color: "#39a1ff" - - type: PointLight - radius: 2 - energy: 2.5 - color: "#39a1ff" - - type: Tag - tags: - - Trash - - CrystalBlue - -- type: entity - parent: ShardCrystalBase - id: ShardCrystalOrange - name: orange crystal shard - components: - - type: Sprite - color: "#ff8227" - - type: PointLight - radius: 2 - energy: 2.5 - color: "#ff8227" - - type: Tag - tags: - - Trash - - CrystalOrange - -- type: entity - parent: ShardCrystalBase - id: ShardCrystalPink - name: pink crystal shard - components: - - type: Sprite - color: "#ff66cc" - - type: PointLight - radius: 2 - energy: 2.5 - color: "#ff66cc" - - type: Tag - tags: - - Trash - - CrystalPink - -- type: entity - parent: ShardCrystalBase - id: ShardCrystalGreen - name: green crystal shard - components: - - type: Sprite - color: "#52ff39" - - type: PointLight - radius: 2 - energy: 2.5 - color: "#52ff39" - - type: Tag - tags: - - Trash - - CrystalGreen - -- type: entity - parent: ShardCrystalBase - id: ShardCrystalRed - name: red crystal shard - components: - - type: Sprite - color: "#fb4747" - - type: PointLight - radius: 2 - energy: 2.5 - color: "#fb4747" - - type: Tag - tags: - - Trash - - CrystalRed +#- type: entity +# abstract: true +# parent: BaseItem +# id: ShardCrystalBase +# name: crystal shard +# description: A small piece of crystal. +# components: +# - type: Sharp +# - type: Sprite +# layers: +# - sprite: Objects/Materials/Shards/crystal.rsi +# state: shard1 +# map: [ "enum.DamageStateVisualLayers.Base" ] +# - type: RandomSprite +# available: +# - enum.DamageStateVisualLayers.Base: +# shard1: "" +# shard2: "" +# shard3: "" +# - type: SpaceGarbage +# - type: MeleeWeapon +# wideAnimationRotation: -22.5 +# attackRate: 1.5 +# damage: +# types: +# Slash: 3.5 +# - type: Damageable +# damageContainer: Inorganic +# damageModifierSet: Glass +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 100 +# behaviors: +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - type: StaticPrice +# price: 50 +# +#- type: entity +# parent: ShardCrystalBase +# id: ShardCrystalCyan +# name: cyan crystal shard +# description: A small piece of crystal. +# components: +# - type: Sprite +# color: "#47f8ff" +# - type: PointLight +# radius: 2 +# energy: 2.5 +# color: "#47f8ff" +# - type: Tag +# tags: +# - Trash +# - CrystalCyan +# +#- type: entity +# parent: ShardCrystalBase +# name: blue crystal shard +# id: ShardCrystalBlue +# components: +# - type: Sprite +# color: "#39a1ff" +# - type: PointLight +# radius: 2 +# energy: 2.5 +# color: "#39a1ff" +# - type: Tag +# tags: +# - Trash +# - CrystalBlue +# +#- type: entity +# parent: ShardCrystalBase +# id: ShardCrystalOrange +# name: orange crystal shard +# components: +# - type: Sprite +# color: "#ff8227" +# - type: PointLight +# radius: 2 +# energy: 2.5 +# color: "#ff8227" +# - type: Tag +# tags: +# - Trash +# - CrystalOrange +# +#- type: entity +# parent: ShardCrystalBase +# id: ShardCrystalPink +# name: pink crystal shard +# components: +# - type: Sprite +# color: "#ff66cc" +# - type: PointLight +# radius: 2 +# energy: 2.5 +# color: "#ff66cc" +# - type: Tag +# tags: +# - Trash +# - CrystalPink +# +#- type: entity +# parent: ShardCrystalBase +# id: ShardCrystalGreen +# name: green crystal shard +# components: +# - type: Sprite +# color: "#52ff39" +# - type: PointLight +# radius: 2 +# energy: 2.5 +# color: "#52ff39" +# - type: Tag +# tags: +# - Trash +# - CrystalGreen +# +#- type: entity +# parent: ShardCrystalBase +# id: ShardCrystalRed +# name: red crystal shard +# components: +# - type: Sprite +# color: "#fb4747" +# - type: PointLight +# radius: 2 +# energy: 2.5 +# color: "#fb4747" +# - type: Tag +# tags: +# - Trash +# - CrystalRed +# From 2dfc91034a069315d46947ba2a250e9578352778 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:24:54 +0300 Subject: [PATCH 18/33] Update ChangelogADT.yml --- Resources/Changelog/ChangelogADT.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 3fc997ed4c9..4dd0b8ab9ae 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1789,6 +1789,15 @@ Entries: - author: Username228 changes: - { message: "Изменен спрайт Костяного копья, теперь оно выглядит круче", type: Tweak} - id: 55750 #костыль отображения в Обновлениях + id: 55751 #костыль отображения в Обновлениях time: '2024-04-16T01:40:00.0000000+00:00' +- author: Username228 + changes: + - { message: "Изменены спрайты кристаллов, теперь они стали гораздо красивее.", type: Tweak} + - { message: "Добавлены разновидности кристалов по размерам.", type: Add} + - { message: "Добавлены кулончики из кристаллов, светящиеся в темноте, а так же их крафт. Поспешите покрасоваться перед IC друзьями!", type: Add} + - { message: "Добавлены сталагмиты.", type: Add} + id: 55752 #костыль отображения в Обновлениях + time: '2024-04-16T01:40:00.0000000+00:00' + From 0b786e14adec34627a7a1d329b7cb5e2b4f46846 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:45:44 +0300 Subject: [PATCH 19/33] Update crystal_shard.yml --- .../Prototypes/Entities/Objects/Materials/crystal_shard.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml index 728b1ad8e34..4ded88762ee 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml @@ -1,4 +1,5 @@ -#- type: entity +#ADT chganges +#- type: entity # abstract: true # parent: BaseItem # id: ShardCrystalBase From ed381389682b61e09f38077e2e83ecfcb320c062 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:46:11 +0300 Subject: [PATCH 20/33] Update crystals.yml --- Resources/Prototypes/Entities/Structures/Decoration/crystals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml index 6a930310ed1..72cd31f1690 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml @@ -1,3 +1,4 @@ +# ADT changes # - type: entity # id: CrystalGreen # parent: BaseStructure From 2116600a643e15625d36998a0bfdd635ca2bd717 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:47:22 +0300 Subject: [PATCH 21/33] Update blue.yml --- .../Prototypes/Sirena/Entities/Structures/Crystals/blue.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml index 9db58ebe5e0..7a93134e4a4 100644 --- a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml @@ -48,7 +48,7 @@ color: "#3d5cb3" - type: entity - id: CrystalShardBlue + id: ShardCrystalBlue parent: BaseCrystalShard components: - type: Sprite From d33240b7356ba32c79bf21bbc3ff4cd6aa6c1fb9 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:47:58 +0300 Subject: [PATCH 22/33] Update cyan.yml --- .../Prototypes/Sirena/Entities/Structures/Crystals/cyan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/cyan.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/cyan.yml index 389fc788dca..98ffbf894c4 100644 --- a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/cyan.yml +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/cyan.yml @@ -21,7 +21,7 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CrystalShardCyan: + ShardCrystalCyan: min: 0 max: 2 @@ -48,7 +48,7 @@ color: "#47a8a5" - type: entity - id: CrystalShardCyan + id: ShardCrystalCyan parent: BaseCrystalShard components: - type: Sprite From 22edb3cd994d53229aa4a9add015b7f0779867c4 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:48:21 +0300 Subject: [PATCH 23/33] Update blue.yml --- .../Prototypes/Sirena/Entities/Structures/Crystals/blue.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml index 7a93134e4a4..ca35fdd5774 100644 --- a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/blue.yml @@ -21,7 +21,7 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CrystalShardBlue: + ShardCrystalBlue: min: 0 max: 2 From a65dce72fd9f407af018590b9d484c62c85ce682 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:48:54 +0300 Subject: [PATCH 24/33] Update green.yml --- .../Prototypes/Sirena/Entities/Structures/Crystals/green.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/green.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/green.yml index ebd50936a08..d8559303d3d 100644 --- a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/green.yml +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/green.yml @@ -21,7 +21,7 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CrystalShardGreen: + ShardCrystalGreen: min: 0 max: 2 @@ -48,7 +48,7 @@ color: "#5ea34e" - type: entity - id: CrystalShardGreen + id: ShardCrystalGreen parent: BaseCrystalShard components: - type: Sprite From 939f8922627ebcac85486334de20e4d6cb55be7c Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:49:19 +0300 Subject: [PATCH 25/33] Update grey.yml --- .../Prototypes/Sirena/Entities/Structures/Crystals/grey.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/grey.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/grey.yml index a4977f8668d..ae71413fa01 100644 --- a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/grey.yml +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/grey.yml @@ -21,7 +21,7 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CrystalShardGrey: + ShardCrystalGrey: min: 0 max: 2 @@ -48,7 +48,7 @@ color: "#969696" - type: entity - id: CrystalShardGrey + id: ShardCrystalGrey parent: BaseCrystalShard components: - type: Sprite From cce86b983d8b538acdf41e57231d5abb38ee9730 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:49:57 +0300 Subject: [PATCH 26/33] Update orange.yml --- .../Prototypes/Sirena/Entities/Structures/Crystals/orange.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/orange.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/orange.yml index 0213b204b8e..1e29ccde9c6 100644 --- a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/orange.yml +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/orange.yml @@ -21,7 +21,7 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CrystalShardOrange: + ShardCrystalOrange: min: 0 max: 2 @@ -48,7 +48,7 @@ color: "#96863b" - type: entity - id: CrystalShardOrange + id: ShardCrystalOrange parent: BaseCrystalShard components: - type: Sprite From 8a9fb9946781a92340a312ea4fe65ec588565825 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:50:28 +0300 Subject: [PATCH 27/33] Update pink.yml --- .../Prototypes/Sirena/Entities/Structures/Crystals/pink.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/pink.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/pink.yml index f3ca2a8367c..51ae16772a5 100644 --- a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/pink.yml +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/pink.yml @@ -21,7 +21,7 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CrystalShardPink: + ShardCrystalPink: min: 0 max: 2 @@ -48,7 +48,7 @@ color: "#a84dab" - type: entity - id: CrystalShardPink + id: ShardCrystalPink parent: BaseCrystalShard components: - type: Sprite From 65356754429009803472f2f233a16c570b4e1e42 Mon Sep 17 00:00:00 2001 From: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com> Date: Thu, 23 May 2024 00:51:02 +0300 Subject: [PATCH 28/33] Update red.yml --- .../Prototypes/Sirena/Entities/Structures/Crystals/red.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/red.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/red.yml index d48f0cc22b8..77b6d49f2b7 100644 --- a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/red.yml +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/red.yml @@ -21,7 +21,7 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CrystalShardRed: + ShardCrystalRed: min: 0 max: 2 @@ -48,7 +48,7 @@ color: "#FF4020" - type: entity - id: CrystalShardRed + id: ShardCrystalRed parent: BaseCrystalShard components: - type: Sprite From 72191bc77cf0b24bca62e2daf2b35c7d6aa3cb4a Mon Sep 17 00:00:00 2001 From: Username228 Date: Thu, 23 May 2024 01:01:30 +0300 Subject: [PATCH 29/33] shards buff --- .../Entities/Structures/Crystals/base.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/base.yml b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/base.yml index 7deb17634c2..95f60fd25bf 100644 --- a/Resources/Prototypes/Sirena/Entities/Structures/Crystals/base.yml +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/base.yml @@ -39,3 +39,22 @@ sprite: Sirena/Structures/Decoration/crystal.rsi state: crystal_green noRot: true + - type: MeleeWeapon + wideAnimationRotation: -22.5 + attackRate: 1.5 + damage: + types: + Slash: 3.5 + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: StaticPrice + price: 50 From f26e32b9248de587f612d21c4a6432a83ca0d66c Mon Sep 17 00:00:00 2001 From: Username228 Date: Thu, 23 May 2024 01:10:18 +0300 Subject: [PATCH 30/33] locale and changelog fix --- Resources/Changelog/ChangelogADT.yml | 21 +++++++++---------- .../Locale/ru-RU/sirena/entities/crystals.ftl | 14 ++++++------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 995e0d63529..eae4ea41b7f 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1659,7 +1659,7 @@ Entries: - {message: "Фикс сообщений админов в ф1.", type: Fix} id: 55730 #костыль отображения в Обновлениях time: '2024-04-13T08:20:00.0000000+00:00' - + - author: 1Stepka1 changes: - {message: "Добавлен новый департамент синтетиков.", type: Add} @@ -1759,24 +1759,24 @@ Entries: - {message: "Дельту маштабно перестроили.", type: Tweak} id: 55746 time: '2024-05-12T08:20:00.0000000+00:00' - + - author: Мудрый дуб changes: - {message: "НТ решили не выдавать бесплатные деньги в вещмешках парамедика, а оставить себе.", type: Fix} - id: 55747 - time: '2024-05-07T23:25:00.0000000+00:00' - + id: 55747 + time: '2024-05-07T23:25:00.0000000+00:00' + - author: username228 changes: - - {message: "Лучшие ксенобиологи NanoTrasen смогли вернуть к жизни один из вымерших инопланетных видов - Слизнекошек с Дождливой планеты! Теперь у работников корпорации появляется уникальнейшая возможность лицезреть этих очаровательных созданий в живую, а так же завести себе как питомца!", type: Add} + - {message: "Лучшие ксенобиологи NanoTrasen смогли вернуть к жизни один из вымерших инопланетных видов - Слизнекошек с Дождливой планеты! Теперь у работников корпорации появляется уникальнейшая возможность лицезреть этих очаровательных созданий в живую, а так же завести себе как питомца!", type: Add} id: 55748 #костыль отображения в Обновлениях - time: '2024-05-10T20:25:00.0000000+00:00' - + time: '2024-05-10T20:25:00.0000000+00:00' + - author: JustKekc changes: - {message: "Добавлена замена '??' в тексте сообщения на 'вопросительно смотрит' эмоцией.", type: Add} id: 55749 - time: '2024-05-10T20:25:00.0000000+00:00' + time: '2024-05-10T20:25:00.0000000+00:00' - author: Петр Игнатьевич changes: @@ -1805,5 +1805,4 @@ Entries: - { message: "Добавлены кулончики из кристаллов, светящиеся в темноте, а так же их крафт. Поспешите покрасоваться перед IC друзьями!", type: Add} - { message: "Добавлены сталагмиты.", type: Add} id: 55753 #костыль отображения в Обновлениях - time: '2024-04-16T01:40:00.0000000+00:00' - \ No newline at end of file + time: '2024-0405-23T01:09:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/sirena/entities/crystals.ftl b/Resources/Locale/ru-RU/sirena/entities/crystals.ftl index ecbf14344a1..ae28b220255 100644 --- a/Resources/Locale/ru-RU/sirena/entities/crystals.ftl +++ b/Resources/Locale/ru-RU/sirena/entities/crystals.ftl @@ -17,7 +17,7 @@ ent-CrystalBlueMedium = { ent-CrystalBlue } ent-CrystalBlueSmall = { ent-CrystalBlue } .desc = { ent-BaseCrystal.desc } -ent-CrystalShardBlue = осколок синего кристалла +ent-ShardCrystalBlue = осколок синего кристалла .desc = { ent-BaseCrystalShard.desc } ent-ClothingCheapPendantBlue = кулон из синего кристалла @@ -33,7 +33,7 @@ ent-CrystalCyanMedium = { ent-CrystalCyan } ent-CrystalCyanSmall = { ent-CrystalCyan } .desc = { ent-BaseCrystal.desc } -ent-CrystalShardCyan = осколок голубого кристалла +ent-ShardCrystalCyan = осколок голубого кристалла .desc = { ent-BaseCrystalShard.desc } ent-ClothingCheapPendantCyan = кулон из голубого кристалла @@ -49,7 +49,7 @@ ent-CrystalGreenMedium = { ent-CrystalGreen } ent-CrystalGreenSmall = { ent-CrystalGreen } .desc = { ent-BaseCrystal.desc } -ent-CrystalShardGreen = осколок зелёного кристалла +ent-ShardCrystalGreen = осколок зелёного кристалла .desc = { ent-BaseCrystalShard.desc } ent-ClothingCheapPendantGreen = кулон из зелёного кристалла @@ -65,7 +65,7 @@ ent-CrystalGreyMedium = { ent-CrystalGrey } ent-CrystalGreySmall = { ent-CrystalGrey } .desc = { ent-BaseCrystal.desc } -ent-CrystalShardGrey = осколок серого кристалла +ent-ShardCrystalGrey = осколок серого кристалла .desc = { ent-BaseCrystalShard.desc } ent-ClothingCheapPendantGrey = кулон из серого кристалла @@ -81,7 +81,7 @@ ent-CrystalOrangeMedium = { ent-CrystalOrange } ent-CrystalOrangeSmall = { ent-CrystalOrange } .desc = { ent-BaseCrystal.desc } -ent-CrystalShardOrange = осколок оранжевого кристалла +ent-ShardCrystalOrange = осколок оранжевого кристалла .desc = { ent-BaseCrystalShard.desc } ent-ClothingCheapPendantOrange = кулон из оранжевого кристалла @@ -97,7 +97,7 @@ ent-CrystalPinkMedium = { ent-CrystalPink } ent-CrystalPinkSmall = { ent-CrystalPink } .desc = { ent-BaseCrystal.desc } -ent-CrystalShardPink = осколок розового кристалла +ent-ShardCrystalPink = осколок розового кристалла .desc = { ent-BaseCrystalShard.desc } ent-ClothingCheapPendantPink = кулон из розового кристалла @@ -113,7 +113,7 @@ ent-CrystalRedMedium = { ent-CrystalRed } ent-CrystalRedSmall = { ent-CrystalRed } .desc = { ent-BaseCrystal.desc } -ent-CrystalShardRed = осколок красного кристалла +ent-ShardCrystalRed = осколок красного кристалла .desc = { ent-BaseCrystalShard.desc } ent-ClothingCheapPendantRed = кулон из красного кристалла From 3a36708ac38cd90a5177c1247f66fc856728af89 Mon Sep 17 00:00:00 2001 From: Username228 Date: Thu, 23 May 2024 01:36:46 +0300 Subject: [PATCH 31/33] FIX --- Resources/Changelog/ChangelogADT.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index eae4ea41b7f..4c30b9276e7 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1805,4 +1805,4 @@ Entries: - { message: "Добавлены кулончики из кристаллов, светящиеся в темноте, а так же их крафт. Поспешите покрасоваться перед IC друзьями!", type: Add} - { message: "Добавлены сталагмиты.", type: Add} id: 55753 #костыль отображения в Обновлениях - time: '2024-0405-23T01:09:00.0000000+00:00' + time: '2024-05-23T01:09:00.0000000+00:00' From 177c8d61f534e75c955f723b3e1f775575706b24 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 23 May 2024 13:54:43 +0300 Subject: [PATCH 32/33] =?UTF-8?q?=D1=80=D0=BE=D0=BB=D1=8C=20=D1=8E=D1=80?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=B0=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D1=80?= =?UTF-8?q?=D1=82=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml | 1 + Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml | 1 + Resources/Prototypes/ADT/Maps/ADTMaps/box.yml | 2 +- Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml | 2 +- Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml | 1 + Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml | 2 +- Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml | 2 +- Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml | 2 +- Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml | 2 +- Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml | 2 +- Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml | 1 + 11 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml index 1e01ad016f7..9e285afce4e 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml @@ -48,6 +48,7 @@ SecurityOfficer: [ 3, 3 ] SecurityCadet: [ 1, 3 ] Detective: [ 1, 1 ] + Lawyer: [1, 1] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml index 920cd5633f5..e9f29672dc0 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml @@ -61,6 +61,7 @@ Brigmedic: [ 1, 1 ] ADTBlueShieldOfficer: [ 1, 1 ] Magistrat: [ 1, 1 ] + Lawyer: [1, 1] ADTInvestigator: [ 1, 1 ] #ADT ADTSecurityCyborg: [ 1, 1 ] #ADT ADTRoboticist: [ 1, 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/box.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/box.yml index 6acee5c8cda..7e64717d29e 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/box.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/box.yml @@ -55,7 +55,7 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] # Corvax-IAA + Lawyer: [ 2, 2 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml index fdc49ce92b9..abded692c9e 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml @@ -29,7 +29,7 @@ Janitor: [ 1, 1 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] - #Lawyer: [ 1, 1 ] # Corvax-IAA + Lawyer: [ 1, 1 ] # Corvax-IAA ServiceWorker: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml index 0b23139afcc..1cf659a9ee7 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml @@ -59,6 +59,7 @@ Brigmedic: [ 1, 1 ] ADTBlueShieldOfficer: [ 1, 1 ] Magistrat: [ 1, 1 ] + Lawyer: [1, 1] ADTInvestigator: [ 1, 1 ] #ADT ADTSecurityCyborg: [ 1, 1 ] #ADT ADTRoboticist: [ 1, 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml index 64f7fbd4329..83326ed044d 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml @@ -52,7 +52,7 @@ HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 2, 2 ] Warden: [ 1, 1 ] - #Lawyer: [ 1, 1 ] # Corvax-IAA + Lawyer: [ 1, 1 ] # Corvax-IAA SecurityCadet: [ 3, 3 ] Detective: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml index 9121aed9ff1..a86dfd63310 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml @@ -56,7 +56,7 @@ SecurityOfficer: [ 7, 7 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] # Corvax-IAA + Lawyer: [ 2, 2 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml index dc485f742fa..65dd976716e 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml @@ -54,7 +54,7 @@ SecurityOfficer: [ 4, 6 ] Detective: [ 1, 1 ] SecurityCadet: [ 3, 6 ] - #Lawyer: [ 2, 2 ] # Corvax-IAA + Lawyer: [ 2, 2 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml index 193aa588ec2..d425c605f41 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml @@ -27,7 +27,7 @@ Janitor: [ 3, 3 ] Chaplain: [ 2, 2 ] Librarian: [ 2, 2 ] - #Lawyer: [ 2, 2 ] # Corvax-IAA + Lawyer: [ 2, 2 ] # Corvax-IAA ServiceWorker: [ 3, 4 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml index 470ac7b59a9..54c42090f62 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml @@ -52,7 +52,7 @@ SecurityOfficer: [ 3, 3 ] Detective: [ 1, 1 ] SecurityCadet: [ 2, 2 ] - #Lawyer: [ 1, 1 ] # Corvax-IAA + Lawyer: [ 1, 1 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml index 45d96b970e3..f07b6f87537 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml @@ -54,6 +54,7 @@ SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] SecurityCadet: [ 4, 4 ] + Lawyer: [2, 2] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 1, 3 ] From 0f8a2e061575950aaf9c4b7861895568e3488677 Mon Sep 17 00:00:00 2001 From: Username228 Date: Thu, 23 May 2024 14:28:20 +0300 Subject: [PATCH 33/33] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BD=D0=B5?= =?UTF-8?q?=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=B3=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8=D1=82=D1=8C?= =?UTF-8?q?=20=D0=BA=D1=80=D0=B0=D1=81=D0=BD=D1=8B=D0=B5=20=D0=BA=D1=80?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=B0=D0=BB=D0=BB=D1=8B=20=D0=B1=D0=B5=D0=B7?= =?UTF-8?q?=20=D1=89=D0=B8=D1=82=D1=81=D0=BF=D0=B0=D0=B2=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Entities/Markers/Spawners/Random/crystal.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml index 35bdbc8259a..6531f8953c3 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml @@ -26,4 +26,7 @@ - CrystalCyan - CrystalCyanSmall - CrystalCyanMedium + - CrystalRed + - CrystalRedSmall + - CrystalRedMedium chance: 0.7