diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 1b38a0858ea..4c30b9276e7 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: @@ -1786,14 +1786,23 @@ Entries: id: 55750 #костыль отображения в Обновлениях time: '2024-05-13T08:20:00.0000000+00:00' +- author: мудрый дуб + changes: + - {message: "НТ теперь поставляют новый костюм горничной в ящике театрального снаряжения", type: Add} + id: 55751 #костыль отображения в Обновлениях + time: '2024-05-22T21:56:00.0000000+00:00' + - author: Username228 changes: - { message: "Изменен спрайт Костяного копья, теперь оно выглядит круче", type: Tweak} - id: 55750 #костыль отображения в Обновлениях + id: 55752 #костыль отображения в Обновлениях time: '2024-04-16T01:40:00.0000000+00:00' - -- author: мудрый дуб + +- author: Username228 changes: - - {message: "НТ теперь поставляют новый костюм горничной в ящике театрального снаряжения", type: Add} - id: 55751 #костыль отображения в Обновлениях - time: '2024-05-22T21:56:00.0000000+00:00' \ No newline at end of file + - { message: "Изменены спрайты кристаллов, теперь они стали гораздо красивее.", type: Tweak} + - { message: "Добавлены разновидности кристалов по размерам.", type: Add} + - { message: "Добавлены кулончики из кристаллов, светящиеся в темноте, а так же их крафт. Поспешите покрасоваться перед IC друзьями!", type: Add} + - { message: "Добавлены сталагмиты.", type: Add} + id: 55753 #костыль отображения в Обновлениях + time: '2024-05-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 new file mode 100644 index 00000000000..ae28b220255 --- /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-ShardCrystalBlue = осколок синего кристалла + .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-ShardCrystalCyan = осколок голубого кристалла + .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-ShardCrystalGreen = осколок зелёного кристалла + .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-ShardCrystalGrey = осколок серого кристалла + .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-ShardCrystalOrange = осколок оранжевого кристалла + .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-ShardCrystalPink = осколок розового кристалла + .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-ShardCrystalRed = осколок красного кристалла + .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/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml index 884a5531e7f..4ded88762ee 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml @@ -1,136 +1,138 @@ -- 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 +#ADT chganges +#- 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 +# diff --git a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml index c1a01c423b1..72cd31f1690 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml @@ -1,197 +1,118 @@ -- 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" ] +# ADT changes +# - 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..95f60fd25bf --- /dev/null +++ b/Resources/Prototypes/Sirena/Entities/Structures/Crystals/base.yml @@ -0,0 +1,60 @@ +- 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 + - 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 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..ca35fdd5774 --- /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: + ShardCrystalBlue: + 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: ShardCrystalBlue + 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..98ffbf894c4 --- /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: + ShardCrystalCyan: + 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: ShardCrystalCyan + 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..d8559303d3d --- /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: + ShardCrystalGreen: + 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: ShardCrystalGreen + 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..ae71413fa01 --- /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: + ShardCrystalGrey: + 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: ShardCrystalGrey + 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..1e29ccde9c6 --- /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: + ShardCrystalOrange: + 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: ShardCrystalOrange + 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..51ae16772a5 --- /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: + ShardCrystalPink: + 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: ShardCrystalPink + 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..77b6d49f2b7 --- /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: + ShardCrystalRed: + 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: ShardCrystalRed + 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 00000000000..45eea796c0c Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/equipped-NECK-hamster.png differ 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 00000000000..eb89b91a706 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/equipped-NECK.png differ 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 00000000000..a8ba294a9eb Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/icon.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/inhand-left.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/inhand-left.png new file mode 100644 index 00000000000..debb78e1b87 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/inhand-left.png differ 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 00000000000..aa678683810 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/inhand-right.png differ 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..ac703a3fbc0 --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "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)", + "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 00000000000..06b3df099d4 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/equipped-NECK-hamster.png differ 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 00000000000..72f30b50fab Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/icon.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/icon.png new file mode 100644 index 00000000000..629be6a675d Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/icon.png differ 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 00000000000..3545a4a483b Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/inhand-left.png differ 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 00000000000..5eaaea69243 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/inhand-right.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/meta.json new file mode 100644 index 00000000000..ac703a3fbc0 --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "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)", + "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/green.rsi/equipped-NECK-hamster.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/equipped-NECK-hamster.png new file mode 100644 index 00000000000..ca733cf69ce Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/equipped-NECK-hamster.png differ 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 00000000000..45d46c4417e Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/equipped-NECK.png differ 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 00000000000..15bf250047c Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/icon.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/inhand-left.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/inhand-left.png new file mode 100644 index 00000000000..e03e5c1e1bf Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/inhand-left.png differ 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 00000000000..f31f18f8142 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/inhand-right.png differ 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..ac703a3fbc0 --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "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)", + "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 00000000000..87092aad4f9 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/equipped-NECK-hamster.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/equipped-NECK.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/equipped-NECK.png new file mode 100644 index 00000000000..45384b60a5a Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/icon.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/icon.png new file mode 100644 index 00000000000..cc8801698e5 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/icon.png differ 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 00000000000..0f4d08f1ba6 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/inhand-right.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/inhand-right.png new file mode 100644 index 00000000000..4ec390e1e89 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/inhand-right.png differ 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..ac703a3fbc0 --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "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)", + "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 00000000000..a903e428bf2 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/equipped-NECK-hamster.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/equipped-NECK.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/equipped-NECK.png new file mode 100644 index 00000000000..f5361267929 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/equipped-NECK.png differ 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 00000000000..55d53789923 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/icon.png differ 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 00000000000..ccbba091724 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/inhand-left.png differ 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 00000000000..e54daacfc1b Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/inhand-right.png differ 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..ac703a3fbc0 --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "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)", + "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 00000000000..d406153170b Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/equipped-NECK-hamster.png differ 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 00000000000..060d15fb190 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/equipped-NECK.png differ 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 00000000000..62a46343a0b Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/icon.png differ 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 00000000000..3ad439beba5 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/inhand-left.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/inhand-right.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/inhand-right.png new file mode 100644 index 00000000000..e248531ad4d Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/inhand-right.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/meta.json b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/meta.json new file mode 100644 index 00000000000..ac703a3fbc0 --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "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)", + "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/red.rsi/equipped-NECK-hamster.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/equipped-NECK-hamster.png new file mode 100644 index 00000000000..40246289098 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/equipped-NECK-hamster.png differ 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 00000000000..b51b54c9e89 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/icon.png b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/icon.png new file mode 100644 index 00000000000..c67b96facbd Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/icon.png differ 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 00000000000..0282354a4d1 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/inhand-left.png differ 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 00000000000..2a694aa22d5 Binary files /dev/null and b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/inhand-right.png differ 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..ac703a3fbc0 --- /dev/null +++ b/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "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)", + "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 00000000000..06256090600 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue_medium.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue_medium.png new file mode 100644 index 00000000000..683b76a130e Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue_medium.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue_small.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue_small.png new file mode 100644 index 00000000000..66b3b7f8152 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue_small.png differ 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 00000000000..798c531fd48 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan.png differ 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 00000000000..5455b2164d0 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan_medium.png differ 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 00000000000..d9e924d7dc2 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan_small.png differ 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 00000000000..2b70777f4d0 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green_medium.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green_medium.png new file mode 100644 index 00000000000..cc7c19d31c8 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green_medium.png differ 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 00000000000..4c0cd16cee2 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green_small.png differ 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 00000000000..91bbe51fb38 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey_medium.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey_medium.png new file mode 100644 index 00000000000..c7614278c62 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey_medium.png differ 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 00000000000..47ed9451b54 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey_small.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange.png new file mode 100644 index 00000000000..cbfa13188a2 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange_medium.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange_medium.png new file mode 100644 index 00000000000..4941de73b54 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange_medium.png differ 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 00000000000..a5b084dd03a Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange_small.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink.png new file mode 100644 index 00000000000..e9306800e80 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink_medium.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink_medium.png new file mode 100644 index 00000000000..1fe26b6c567 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink_medium.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink_small.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink_small.png new file mode 100644 index 00000000000..73ec1304893 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink_small.png differ 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 00000000000..d8dd7e4bce7 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red.png differ 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 00000000000..de7db6812fa Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red_medium.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red_small.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red_small.png new file mode 100644 index 00000000000..c41bf52eefa Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red_small.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_blue.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_blue.png new file mode 100644 index 00000000000..b03e618a261 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_blue.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_cyan.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_cyan.png new file mode 100644 index 00000000000..e149871fe9b Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_cyan.png differ 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 00000000000..7564b4058e7 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_green.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_grey.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_grey.png new file mode 100644 index 00000000000..8472dc5d82c Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_grey.png differ 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 00000000000..0bc81434a2a Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_orange.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_pink.png b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_pink.png new file mode 100644 index 00000000000..4bebdfaf46b Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_pink.png differ 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 00000000000..8c5d0907b0b Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_red.png differ 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..7e6b97e1d20 --- /dev/null +++ b/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/meta.json @@ -0,0 +1,95 @@ +{ + "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)", + "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..0eee1190cea --- /dev/null +++ b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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)", + "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 00000000000..c804cc9c335 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite1.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite2.png b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite2.png new file mode 100644 index 00000000000..85b2a7d87c9 Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite2.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite3.png b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite3.png new file mode 100644 index 00000000000..35cc0520ffc Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite3.png differ diff --git a/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite4.png b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite4.png new file mode 100644 index 00000000000..bafcdf5b89e Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite4.png differ 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 00000000000..87a593a9f0b Binary files /dev/null and b/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite5.png differ