From 54bcf9033b2955709519b78d3f2de7e0902e5607 Mon Sep 17 00:00:00 2001 From: Gamewar360 <136398521+GaMEWAR360@users.noreply.github.com> Date: Fri, 29 May 2026 02:39:06 +0300 Subject: [PATCH] . (#420) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * centcom * coolbob * fix * fix2 * fix_tag_rebalance_ore * buffdragon * чёто на атмосянском * fix43 * rebalance * Update paper.yml # Conflicts: # Resources/Prototypes/_Wega/Entities/Objects/Misc/paper.yml * fix * armor * -isoly --------- Co-authored-by: liegend <2008.morozov.ri@gmail.com> Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com> --- .../StationCargoOrderDatabaseComponent.cs | 1 + .../Dragon/Components/DragonRiftComponent.cs | 7 +- Content.Server/Dragon/DragonRiftSystem.cs | 22 ++- .../Components/CargoOrderConsoleComponent.cs | 1 + .../Weapons/Guns/Gunshots/laser_sniper.ogg | Bin 0 -> 24825 bytes .../Locale/ru-RU/_wega/constructionbag.ftl | 2 - .../Locale/ru-RU/_wega/store/ert-catalog.ftl | 5 +- Resources/Locale/ru-RU/_wega/store/reva.ftl | 13 ++ .../ru-RU/_wega/store/spellbook-catalog.ftl | 2 + .../prototypes/_wega/actions/implants.ftl | 2 + .../_wega/catalog/fills/boxes/misc.ftl | 4 +- .../_wega/entities/mobs/npcs/carp.ftl | 9 ++ .../objects/devices/constructionbag.ftl | 4 + .../entities/objects/misc/implanters.ftl | 3 + .../objects/misc/subdermal_implants.ftl | 2 + .../_wega/entities/objects/tools/tools.ftl | 8 +- .../weapons/grenade/canister_grenades.ftl | 8 +- .../weapons/guns/battery/battery_guns.ftl | 6 + .../Prototypes/Catalog/Cargo/cargo_armory.yml | 14 +- .../Catalog/Cargo/cargo_security.yml | 8 +- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../Prototypes/Catalog/Fills/Boxes/heads.yml | 1 + .../Catalog/Fills/Lockers/heads.yml | 3 +- .../Corvax/Entities/Clothing/Hands/gloves.yml | 2 +- .../Entities/Clothing/OuterClothing/armor.yml | 3 - .../Entities/Mobs/Player/humanoid.yml | 1 + .../Entities/Objects/Misc/folders.yml | 4 +- .../Objects/Specific/Research/disk.yml | 1 + .../Specific/Robotics/borg_modules.yml | 13 +- .../Weapons/Guns/Battery/battery_guns.yml | 10 +- .../Machines/Computers/computers.yml | 2 + .../Structures/Specific/Anomaly/cores.yml | 57 ++++---- .../Entities/Structures/Specific/dragon.yml | 5 + .../Recipes/Lathes/Packs/science.yml | 1 + Resources/Prototypes/Research/arsenal.yml | 3 +- .../Prototypes/Research/experimental.yml | 1 + Resources/Prototypes/Research/industrial.yml | 2 + .../Prototypes/Roles/Jobs/CentComm/cburn.yml | 2 +- .../Roles/Jobs/CentComm/deathsquad.yml | 2 +- .../Jobs/CentComm/emergencyresponseteam.yml | 12 +- .../Roles/Jobs/CentComm/official.yml | 2 +- Resources/Prototypes/_Wega/Actions/types.yml | 17 +++ .../_Wega/Catalog/Cargo/markets.yml | 3 + .../_Wega/Catalog/Fills/Boxes/misc.yml | 36 ++++- .../Prototypes/_Wega/Catalog/ert_catalog.yml | 15 ++ .../Prototypes/_Wega/Catalog/rev_catalog.yml | 132 ++++++++++-------- .../_Wega/Catalog/spellbook_catalog.yml | 16 +++ .../_Wega/Entities/Effects/misc.yml | 16 +++ .../_Wega/Entities/Mobs/NPCs/carp.yml | 80 +++++++++++ .../Entities/Objects/Misc/implanters.yml | 8 ++ .../_Wega/Entities/Objects/Misc/paper.yml | 5 + .../Objects/Misc/subdermal_implants.yml | 30 +++- .../Specific/Robotics/BorgItem/iconitem.yml | 33 +++++ .../Specific/Robotics/BorgItem/secitem.yml | 47 +++---- .../Specific/Robotics/borg_modules.yml | 18 ++- .../Specific/Specific/construction-bag.yml | 26 ++++ .../_Wega/Entities/Objects/Tools/tools.yml | 97 ++++++++++++- .../Weapons/Grenades/canister_grenades.yml | 23 ++- .../Weapons/Guns/Battery/battery_guns.yml | 39 +++++- .../Weapons/Guns/Projectiles/projectiles.yml | 56 ++++++++ .../Objects/Weapons/Guns/Snipers/snipers.yml | 36 +++++ .../Objects/Weapons/Throwable/bola.yml | 7 +- .../Storage/Canisters/gas_canisters.yml | 4 +- .../Procedural/biome_ore_templates_low.yml | 44 +++--- .../_Wega/Procedural/biome_templates.yml | 26 ++-- .../Prototypes/_Wega/Recipes/Lathes/misc.yml | 12 +- .../Prototypes/_Wega/Research/arsenal.yml | 6 +- .../Prototypes/_Wega/Research/biochemical.yml | 2 + .../Prototypes/_Wega/Research/industrial.yml | 2 + .../_Wega/Roles/Jobs/CentComm/cburn.yml | 2 +- .../Jobs/CentComm/emergencyresponseteam.yml | 8 +- Resources/Prototypes/_Wega/tags.yml | 2 + Resources/Prototypes/borg_types.yml | 1 + .../bluespace_lifeline.png | Bin 0 -> 4974 bytes .../Effects/bluespace_lifeline.rsi/meta.json | 30 ++++ .../Devices/bag_diski.rsi/equipped-BELT.png | Bin 0 -> 501 bytes .../Objects/Devices/bag_diski.rsi/icon.png | Bin 0 -> 656 bytes .../Devices/bag_diski.rsi/inhand-left.png | Bin 0 -> 444 bytes .../Devices/bag_diski.rsi/inhand-right.png | Bin 0 -> 438 bytes .../Objects/Devices/bag_diski.rsi/meta.json | 26 ++++ .../inhand-left-shield.png | Bin 1307 -> 1281 bytes .../blueshieldshield.rsi/inhand-left.png | Bin 336 -> 310 bytes .../Robotics/iconitem.rsi/bolo-icon.png | Bin 0 -> 685 bytes .../iconitem.rsi/generic_materials.png | Bin 1713 -> 1586 bytes .../generic_materials_battery.png | Bin 0 -> 1713 bytes .../iconitem.rsi/generic_materials_cabel.png | Bin 1971 -> 2070 bytes .../Robotics/iconitem.rsi/gren-icon.png | Bin 0 -> 730 bytes .../Specific/Robotics/iconitem.rsi/meta.json | 9 ++ .../equipped-BELT.png | Bin 0 -> 1566 bytes .../cargo_access_configurator.rsi/icon.png | Bin 0 -> 3142 bytes .../inhand-left.png | Bin 0 -> 1336 bytes .../inhand-right.png | Bin 0 -> 1383 bytes .../cargo_access_configurator.rsi/meta.json | 62 ++++++++ .../equipped-BELT.png | Bin 0 -> 1566 bytes .../sci_access_configurator.rsi/icon.png | Bin 0 -> 3260 bytes .../inhand-left.png | Bin 0 -> 1336 bytes .../inhand-right.png | Bin 0 -> 1383 bytes .../sci_access_configurator.rsi/meta.json | 62 ++++++++ .../Guns/Battery/inhands_64.rsi/meta.json | 27 ++++ .../inhands_64.rsi/pulse-inhand-left.png | Bin 0 -> 1094 bytes .../inhands_64.rsi/pulse-inhand-right.png | Bin 0 -> 1135 bytes .../inhands_64.rsi/wielded-inhand-left.png | Bin 0 -> 1263 bytes .../inhands_64.rsi/wielded-inhand-right.png | Bin 0 -> 1295 bytes .../Guns/Battery/pulse_sniper.rsi/base.png | Bin 0 -> 1093 bytes .../pulse_sniper.rsi/equipped-BACKPACK.png | Bin 0 -> 1520 bytes .../Guns/Battery/pulse_sniper.rsi/icon.png | Bin 0 -> 830 bytes .../Battery/pulse_sniper.rsi/inhand-left.png | Bin 0 -> 330 bytes .../Battery/pulse_sniper.rsi/inhand-right.png | Bin 0 -> 327 bytes .../pulse_sniper.rsi/mag-unshaded-1.png | Bin 0 -> 105 bytes .../pulse_sniper.rsi/mag-unshaded-2.png | Bin 0 -> 115 bytes .../pulse_sniper.rsi/mag-unshaded-3.png | Bin 0 -> 118 bytes .../pulse_sniper.rsi/mag-unshaded-4.png | Bin 0 -> 131 bytes .../Guns/Battery/pulse_sniper.rsi/meta.json | 49 +++++++ .../pulse_sniper.rsi/wielded-inhand-left.png | Bin 0 -> 1634 bytes .../pulse_sniper.rsi/wielded-inhand-right.png | Bin 0 -> 1611 bytes .../Guns/Battery/pulseshotgun.rsi/base.png | Bin 0 -> 668 bytes .../Guns/Battery/pulseshotgun.rsi/icon.png | Bin 0 -> 668 bytes .../pulseshotgun.rsi/mag-unshaded-1.png | Bin 0 -> 122 bytes .../pulseshotgun.rsi/mag-unshaded-2.png | Bin 0 -> 131 bytes .../pulseshotgun.rsi/mag-unshaded-3.png | Bin 0 -> 131 bytes .../pulseshotgun.rsi/mag-unshaded-4.png | Bin 0 -> 131 bytes .../Guns/Battery/pulseshotgun.rsi/meta.json | 29 ++++ 122 files changed, 1173 insertions(+), 220 deletions(-) create mode 100644 Resources/Audio/_Wega/Weapons/Guns/Gunshots/laser_sniper.ogg delete mode 100644 Resources/Locale/ru-RU/_wega/constructionbag.ftl create mode 100644 Resources/Locale/ru-RU/_wega/store/reva.ftl create mode 100644 Resources/Locale/ru-RU/_wega/store/spellbook-catalog.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/actions/implants.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/carp.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/constructionbag.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/implanters.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/subdermal_implants.ftl create mode 100644 Resources/Prototypes/_Wega/Catalog/Cargo/markets.yml create mode 100644 Resources/Prototypes/_Wega/Catalog/spellbook_catalog.yml create mode 100644 Resources/Prototypes/_Wega/Entities/Effects/misc.yml create mode 100644 Resources/Prototypes/_Wega/Entities/Mobs/NPCs/carp.yml create mode 100644 Resources/Textures/_Wega/Effects/bluespace_lifeline.rsi/bluespace_lifeline.png create mode 100644 Resources/Textures/_Wega/Effects/bluespace_lifeline.rsi/meta.json create mode 100644 Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/icon.png create mode 100644 Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/inhand-left.png create mode 100644 Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/inhand-right.png create mode 100644 Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/meta.json create mode 100644 Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/bolo-icon.png create mode 100644 Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/generic_materials_battery.png create mode 100644 Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/gren-icon.png create mode 100644 Resources/Textures/_Wega/Objects/Tools/cargo_access_configurator.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Wega/Objects/Tools/cargo_access_configurator.rsi/icon.png create mode 100644 Resources/Textures/_Wega/Objects/Tools/cargo_access_configurator.rsi/inhand-left.png create mode 100644 Resources/Textures/_Wega/Objects/Tools/cargo_access_configurator.rsi/inhand-right.png create mode 100644 Resources/Textures/_Wega/Objects/Tools/cargo_access_configurator.rsi/meta.json create mode 100644 Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/icon.png create mode 100644 Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/inhand-left.png create mode 100644 Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/inhand-right.png create mode 100644 Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/meta.json create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/meta.json create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/pulse-inhand-left.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/pulse-inhand-right.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/base.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/icon.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/inhand-left.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/inhand-right.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/meta.json create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/base.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/icon.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/meta.json diff --git a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs index 56401602b3..13721cebbc 100644 --- a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs +++ b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs @@ -39,6 +39,7 @@ public sealed partial class StationCargoOrderDatabaseComponent : Component public List> Markets = new() { "market", + "sec", }; // TODO: Can probably dump this diff --git a/Content.Server/Dragon/Components/DragonRiftComponent.cs b/Content.Server/Dragon/Components/DragonRiftComponent.cs index fa49b1f1f1..077bb768d0 100644 --- a/Content.Server/Dragon/Components/DragonRiftComponent.cs +++ b/Content.Server/Dragon/Components/DragonRiftComponent.cs @@ -35,6 +35,9 @@ public sealed partial class DragonRiftComponent : SharedDragonRiftComponent [ViewVariables(VVAccess.ReadWrite), DataField("spawnCooldown")] public float SpawnCooldown = 30f; - [ViewVariables(VVAccess.ReadWrite), DataField("spawn", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string SpawnPrototype = "MobCarpDragon"; + [DataField(required: true)] // Corvax-Wega-Add + public Dictionary SpawnWeights = new(); // Corvax-Wega-Add + + // [ViewVariables(VVAccess.ReadWrite), DataField("spawn", customTypeSerializer: typeof(PrototypeIdSerializer))] Corvax-Wega-Change + // public string SpawnPrototype = "MobCarpDragon"; Corvax-Wega-Change } diff --git a/Content.Server/Dragon/DragonRiftSystem.cs b/Content.Server/Dragon/DragonRiftSystem.cs index 842b27ec86..e7dceba1e8 100644 --- a/Content.Server/Dragon/DragonRiftSystem.cs +++ b/Content.Server/Dragon/DragonRiftSystem.cs @@ -13,6 +13,9 @@ using Content.Shared.Damage.Components; using Robust.Shared.Audio.Systems; using Robust.Shared.GameStates; using Robust.Shared.Utility; +using Robust.Shared.Random; // Corvax-Wega-Add +using Robust.Shared.Prototypes; // Corvax-Wega-Add +using System.Linq; // Corvax-Wega-Add namespace Content.Server.Dragon; @@ -27,6 +30,7 @@ public sealed class DragonRiftSystem : EntitySystem [Dependency] private readonly NavMapSystem _navMap = default!; [Dependency] private readonly NPCSystem _npc = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly IRobustRandom _random = default!; // Corvax-Wega-Add public override void Initialize() { @@ -88,7 +92,7 @@ public sealed class DragonRiftSystem : EntitySystem if (comp.SpawnAccumulator > comp.SpawnCooldown) { comp.SpawnAccumulator -= comp.SpawnCooldown; - var ent = Spawn(comp.SpawnPrototype, xform.Coordinates); + var ent = Spawn(GetWeightedRandom(comp.SpawnWeights), xform.Coordinates); // Corvax-Wega-Add // Update their look to match the leader. if (TryComp(comp.Dragon, out var randomSprite)) @@ -103,7 +107,23 @@ public sealed class DragonRiftSystem : EntitySystem } } } + // Corvax-Wega-Start + private EntProtoId GetWeightedRandom(Dictionary weights) + { + var current = 0f; + var totalWeight = weights.Values.Sum(); + var randomValue = _random.NextFloat(0, totalWeight); + foreach (var (prototype, weight) in weights) + { + current += weight; + if (randomValue <= current) + return prototype; + } + + return weights.Keys.First(); + } + // Corvax-Wega-End private void OnExamined(EntityUid uid, DragonRiftComponent component, ExaminedEvent args) { args.PushMarkup(Loc.GetString("carp-rift-examine", ("percentage", MathF.Round(component.Accumulator / component.MaxAccumulator * 100)))); diff --git a/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs b/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs index 06f554d465..5d11a385da 100644 --- a/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs +++ b/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs @@ -81,6 +81,7 @@ public sealed partial class CargoOrderConsoleComponent : Component public List> AllowedGroups = new() { "market", + "sec", "SalvageJobReward2", "SalvageJobReward3", "SalvageJobRewardMAX", diff --git a/Resources/Audio/_Wega/Weapons/Guns/Gunshots/laser_sniper.ogg b/Resources/Audio/_Wega/Weapons/Guns/Gunshots/laser_sniper.ogg new file mode 100644 index 0000000000000000000000000000000000000000..29a5f6a8cc3acea6828a75546adaa9847e42f8fe GIT binary patch literal 24825 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

tS0Ln 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 literal 0 HcmV?d00001 diff --git a/Resources/Locale/ru-RU/_wega/constructionbag.ftl b/Resources/Locale/ru-RU/_wega/constructionbag.ftl deleted file mode 100644 index 5ba98f9868..0000000000 --- a/Resources/Locale/ru-RU/_wega/constructionbag.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-ConstructionBag = строительная сумка - .desc = Строительная сумка, удобна для переноски строительных материалов. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/store/ert-catalog.ftl b/Resources/Locale/ru-RU/_wega/store/ert-catalog.ftl index 64aa0960f8..4cbc6a41ca 100644 --- a/Resources/Locale/ru-RU/_wega/store/ert-catalog.ftl +++ b/Resources/Locale/ru-RU/_wega/store/ert-catalog.ftl @@ -227,4 +227,7 @@ tactical-interface-ambuzol-name = 5 таблеток Амбузола tactical-interface-ambuzol-desc = Стабильный способ излечить от зомби вируса. tactical-interface-ambuzol-plus-name = Таблетка Амбузола плюс -tactical-interface-ambuzol-plus-desc = Иммунитет от зомби. \ No newline at end of file +tactical-interface-ambuzol-plus-desc = Иммунитет от зомби. + +tactical-interface-bluesheild-name = энергощит "Синий Щит" +tactical-interface-bluesheild-desc = Специальный щит, который генерирует твердый поток энергии при помощи встроенного проектора, который отражает любые снаряды. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/store/reva.ftl b/Resources/Locale/ru-RU/_wega/store/reva.ftl new file mode 100644 index 0000000000..e98745a749 --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/store/reva.ftl @@ -0,0 +1,13 @@ +reva-cash-name = Кредиты +reva-cash-desc = Пачка 10000 кредитов, убеди главу или купите что-нибудь. + +reva-powerlink-name = Поглотитель энергии + +reva-boxkey = Коробка с ключами связи синдиката + +reva-tactkik-flame-name = Элитный тактический желет +reva-tactkik-name = Тактический желет + +reva-emag-name = ЕМАГ +reva-jaws-name = Челюсти жизни синдиката +reva-kids-name = Боевая аптечка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/store/spellbook-catalog.ftl b/Resources/Locale/ru-RU/_wega/store/spellbook-catalog.ftl new file mode 100644 index 0000000000..57897afbd1 --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/store/spellbook-catalog.ftl @@ -0,0 +1,2 @@ +spellbook-staff-boxecore-name = Коробка с аномальными ядрами +spellbook-staff-boxecore-description = Коробка со всеми ядрами аномалий, который были подвержены коллапсу \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/actions/implants.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/actions/implants.ftl new file mode 100644 index 0000000000..b90cc212ce --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/actions/implants.ftl @@ -0,0 +1,2 @@ +ent-ActionActivateBluespaceLifeline = Блюспейс коридор + .desc = Активирует имплант Блюспейс коридор, телепортируя вас далеко-далеко от станции. Вернуться назад не получится. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl index 0cf4233202..43c9e62175 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl @@ -1,3 +1,5 @@ ent-BoxHugEmpty = { ent-BoxHug } .desc = { ent-BoxHug.desc } - .suffix = Пустой \ No newline at end of file + .suffix = Пустой +ent-BoxCore = коробка с ядрами аномалий + .desc = Коробка полная волшебства и безумия ( и чутка науки ). \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/carp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/carp.ftl new file mode 100644 index 0000000000..8ea59e1591 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/carp.ftl @@ -0,0 +1,9 @@ +ent-MobCarpHoloDragon = { ent-MobCarpHolo } + .desc = { ent-MobCarpHolo.desc } + .suffix = ВыводокДракона +ent-MobCarpRainbowDragon = { ent-MobCarpRainbow } + .desc = { ent-MobCarpRainbow.desc } + .suffix = ВыводокДракона +ent-MobSharkDragon = { ent-MobShark } + .desc = { ent-MobShark.desc } + .suffix = ВыводокДракона \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/constructionbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/constructionbag.ftl new file mode 100644 index 0000000000..c5e3f58398 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/constructionbag.ftl @@ -0,0 +1,4 @@ +ent-ConstructionBag = строительная сумка + .desc = Строительная сумка, удобна для переноски строительных материалов. +ent-TechDiskBag = сумка для техноличных дисков + .desc = Тканевая сумка для хранения очень большого количества дисков с печати и удобной продажи. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/implanters.ftl new file mode 100644 index 0000000000..eb4b39ff61 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/implanters.ftl @@ -0,0 +1,3 @@ +ent-BluseSpaceImplanter = имплантер "Блюспейс коридор" + .desc = Компактный одноразовый шприц, специально разработанный для введения подкожных имплантов. Игла покрыта анестетиком. + .suffix = Блюспейс спасатель \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/subdermal_implants.ftl new file mode 100644 index 0000000000..70c06f153e --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/subdermal_implants.ftl @@ -0,0 +1,2 @@ +ent-BluespaceLifelineImplant = имплант "Блюспейс коридор" + .desc = Телепортирует тело носителя на ЦентКом при активации. Вернуться назад не получится. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/tools/tools.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/tools/tools.ftl index 0a20fd3d77..f020907589 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/tools/tools.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/tools/tools.ftl @@ -5,4 +5,10 @@ ent-CombatRCDExperimental = экспериментальное боевое РС .suffix = ОБР и Адмены ent-HandheldGPSBasicOff = { ent-HandheldGPSBasic } .desc = { ent-HandheldGPSBasic.desc } - .suffix = Выключен \ No newline at end of file + .suffix = Выключен +ent-AccessConfiguratorCargo = конфигуратор доступа снабжения + .desc = Инструмент настройки доступов для квартимейстера, позволяющий настраивать доступ у всех дверей и консолей под доступом снабжения. +ent-AccessConfiguratorSci = конфигуратор доступа научного отдела + .desc = Инструмент настройки доступов для научного руководителя, позволяющий настраивать доступ у всех дверей и консолей под доступом научного отдела. +ent-AccessConfiguratorAllAccses = настроенный конфигуратор доступа + .desc = Конфигуратор доступа со встроенной картой, имеющая все необходимые доступы. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/grenade/canister_grenades.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/grenade/canister_grenades.ftl index a77bd3d886..af488b19ac 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/grenade/canister_grenades.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/grenade/canister_grenades.ftl @@ -1,2 +1,8 @@ ent-HolyWaterGrenade = свято-очистительная граната - .desc = Специальная граната для борьбы с нечестью, выпускающая большое облако пены святой воды. \ No newline at end of file + .desc = Специальная граната для борьбы с нечестью, выпускающая большое облако пены святой воды. +ent-GrenadeFlashBangProject = { ent-GrenadeFlashBang } + .desc = { ent-GrenadeFlashBang.desc } +ent-TearGasGrenadeProject = { ent-TearGasGrenade } + .desc = { ent-TearGasGrenade.desc } +ent-GrenadeStingerProject = { ent-GrenadeStinger } + .desc = { ent-GrenadeStinger.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl index 91fe6d848a..d114579061 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -28,4 +28,10 @@ ent-WeaponIonCarabine = ионный карабин .suffix = Винтовка ent-WeaponEnergyPulsar = энергетический карабин "Пульсар" .desc = Энергетический карабин огромной мощности. Способен самозаряжаться с крайне долгим интервалом. + .suffix = Винтовка +ent-WeaponPulseShotgun = импульсный дробовик + .desc = Завершенный прототип энергетического дробовика, само наличие даного оружия делает сотрудника "большой шишкой". + .suffix = Дробовик +ent-WeaponPulseSniper = импульсная снайперская винтовка + .desc = Импульсныая винтовка с очень низким показателем скоростельности засчет убойности поподания. Один выстрел - один почти готовый труп. .suffix = Винтовка \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index bb4130e571..6bf6b913f7 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -6,7 +6,7 @@ product: CrateArmorySMG cost: 9000 category: cargoproduct-category-name-armory - group: market + group: sec - type: cargoProduct id: ArmoryShotgun @@ -16,7 +16,7 @@ product: CrateArmoryShotgun cost: 7000 category: cargoproduct-category-name-armory - group: market + group: sec - type: cargoProduct id: SecurityRiot @@ -26,7 +26,7 @@ product: CrateSecurityRiot cost: 7500 category: cargoproduct-category-name-armory - group: market + group: sec - type: cargoProduct id: TrackingImplant @@ -46,7 +46,7 @@ product: CrateTrainingBombs cost: 3000 category: cargoproduct-category-name-armory - group: market + group: sec - type: cargoProduct id: ArmoryLaser @@ -56,7 +56,7 @@ product: CrateArmoryLaser cost: 4800 category: cargoproduct-category-name-armory - group: market + group: sec - type: cargoProduct id: ArmoryPistol @@ -66,7 +66,7 @@ product: CrateArmoryPistols cost: 5200 category: cargoproduct-category-name-armory - group: market + group: sec - type: cargoProduct id: ArmoryRifle @@ -76,4 +76,4 @@ product: CrateArmoryRifle cost: 8000 category: cargoproduct-category-name-armory - group: market + group: sec diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 9b5c0ddad6..9eb4fb6aa3 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -6,7 +6,7 @@ product: CrateSecurityArmor cost: 1250 category: cargoproduct-category-name-security - group: market + group: sec - type: cargoProduct id: SecurityHelmet @@ -16,7 +16,7 @@ product: CrateSecurityHelmet cost: 550 category: cargoproduct-category-name-security - group: market + group: sec - type: cargoProduct id: SecurityNonLethal @@ -56,7 +56,7 @@ product: CrateSecurityBiosuit cost: 1600 category: cargoproduct-category-name-security - group: market + group: sec - type: cargoProduct id: SecurityBarrier @@ -66,7 +66,7 @@ product: DeployableBarrier cost: 1000 category: cargoproduct-category-name-security - group: market + group: sec - type: cargoProduct id: SecurityNonlethalThrowables diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 7a5e7e85bd..ef5716177a 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -197,7 +197,7 @@ product: CrateVendingMachineRestockSecTechFilled cost: 2200 category: cargoproduct-category-name-security - group: market + group: sec - type: cargoProduct id: CrateVendingMachineRestockSeeds diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml index 1f570177bd..83702fbae8 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml @@ -92,6 +92,7 @@ - id: SalvageJobBoardComputerCircuitboard - id: MailTeleporterMachineCircuitboard - id: FundingAllocationComputerCircuitboard # Corvax-Wega + - id: LavalandShuttleComputerCircuitboard # Corvax-Wega - type: entity parent: BoxStamps diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 855a599f04..33e8399149 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -16,7 +16,7 @@ prob: 0.02 - id: PrinterDocFlatpack # Corvax-Printer - id: FundingAllocationComputerFlatpack # Corvax-Wega - - id: LavalandShuttleComputerCircuitboard # Corvax-Wega-Lavaland + - id: AccessConfiguratorCargo # Corvax-Wega - type: entity id: LockerQuarterMasterFilled @@ -293,6 +293,7 @@ - id: DoorRemoteResearch - id: HandTeleporter - id: RubberStampRd + - id: AccessConfiguratorSci # Corvax-Wega - id: PlushieLizardJobResearchdirector prob: 0.02 diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml index 1238982b37..f56fc9367f 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Hands/gloves.yml @@ -8,7 +8,7 @@ sprite: Corvax/Clothing/Hands/Gloves/kim.rsi - type: Clothing sprite: Corvax/Clothing/Hands/Gloves/kim.rsi - - type: Insulated + # - type: Insulated # Corvax-Wega-Add - type: entity parent: ClothingHandsBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 26892d25c1..7a2859973b 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -351,9 +351,6 @@ - type: GroupExamine # Corvax-Wega-Blood-Cult-Start - type: BloodShieldActivaeble - - type: ClothingSpeedModifier - walkModifier: 1 - sprintModifier: 1 - type: HeldSpeedModifier # Corvax-Wega-Blood-Cult-End diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index afacc9e176..2233585cb9 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -26,6 +26,7 @@ implants: - MindShieldImplant - DeathRattleImplantCentcomm + - BluespaceLifelineImplant # Corvax-Wega-Add ## Death Squad diff --git a/Resources/Prototypes/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/Entities/Objects/Misc/folders.yml index 7e24130655..79ad399378 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml @@ -484,9 +484,9 @@ - type: EdibleMatter canBeEaten: false - type: WirelessNetworkConnection - range: 20000 + range: 200 - type: DeviceLinkSource - range: 20000 + range: 200 ports: - OrderSender - type: ChangeableCargoAccount diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml index 38b6ddf657..98d2044fdb 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml @@ -75,6 +75,7 @@ Arsenal: { color: "#dc373b" } Experimental: { color: "#9a6ef0" } CivilianServices: { color: "#7ecd48" } + Biochemical: { color: "#449ae6" } # Corvax-Wega-Add enum.TechDiskVisuals.Tier: t2_marks: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 0a3863d8ea..9fcd595c8f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -781,13 +781,7 @@ - item: Multitool - item: RemoteSignallerAdvanced # Corvax-Wega-Robot-Start - - item: SprayPainter - - hand: - emptyRepresentative: SprayPainterAmmo - emptyLabel: borg-slot-spray-painter-ammo-empty - whitelist: - components: - - SprayPainterAmmo + - item: SprayPainterBorg # Corvax-Wega-Robot-End - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-tools-module } @@ -812,14 +806,14 @@ - type: ItemBorgModule hands: - hand: - emptyRepresentative: BorgModuleConstructionMaterialPlaceholder + emptyRepresentative: ConstrukAndBattery # Corvax-Wega-add emptyLabel: borg-slot-construction-empty whitelist: tags: - ConstructionMaterial - PowerCell # Corvax-Wega-robots - hand: - emptyRepresentative: BorgModuleConstructionMaterialPlaceholder + emptyRepresentative: ConstrukAndBattery # Corvax-Wega-Add emptyLabel: borg-slot-construction-empty whitelist: tags: @@ -1309,6 +1303,7 @@ whitelist: tags: - ConstructionMaterial + - PowerCell # Corvax-Wega-Add - CableCoil # Corvax-Wega-Robot # Corvax-Wega-Start # - hand: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index a8b6677556..c3911e78ee 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -336,6 +336,7 @@ sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi - type: Gun selectedMode: SemiAuto + fireRate: 1.5 # Corvax-Wega-Add availableModes: - SemiAuto soundGunshot: @@ -385,7 +386,7 @@ # Corvax-Wega-gun-end - type: Gun selectedMode: SemiAuto - fireRate: 3 + fireRate: 2 # Corvax-Wega-Change 3 availableModes: - SemiAuto - FullAuto @@ -399,7 +400,7 @@ startingCharge: 5000 # Corvax-Wega-gun-start - type: EmpResistance - strengthMultiplier: 0 + strengthMultiplier: 0.5 # Corvax-Wega-gun-end - type: entity @@ -433,7 +434,10 @@ maxAngle: -32 # Corvax-Wega-gun-end - type: Gun - fireRate: 1.5 + fireRate: 3 # Corvax-Wega-Chagne 1.5 + availableModes: + - SemiAuto + - FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: BatteryAmmoProvider diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 35ac9627bb..3ba48a6693 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -892,6 +892,7 @@ state: generic_panel_open - type: CargoOrderConsole removeLimitAccess: [ "Quartermaster" ] + allowedGroups: [ "market","SalvageJobReward2","SalvageJobReward3", "SalvageJobRewardMAX"] - type: ActiveRadio channels: - Supply @@ -1047,6 +1048,7 @@ announcementChannel: Security removeLimitAccess: [ "HeadOfSecurity" ] # mode: SendToPrimary # Corvax-Wega + allowedGroups: [ "market", "sec", "SalvageJobReward2","SalvageJobReward3", "SalvageJobRewardMAX"] - type: ActiveRadio channels: - Security diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml index a695167648..a3528f3591 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml @@ -11,7 +11,7 @@ layers: - state: core - state: pulse - map: ["decay"] + # map: ["decay"] Corvax-Wega-Change - type: Appearance - type: GenericVisualizer visuals: @@ -54,8 +54,6 @@ - type: IgnitionSource temperature: 700 ignited: true - - type: CoreTempChange - tempChangePerSecond: 5 - type: Gun fireRate: 0.75 soundGunshot: @@ -81,8 +79,6 @@ energy: 10 color: "#1e070e" castShadows: false - - type: RadiationSource - intensity: 0.5 - type: MeleeThrowOnHit - type: MeleeWeapon attackRate: 0.5 @@ -114,8 +110,6 @@ energy: 2.7 color: "#befaff" castShadows: false - - type: CoreTempChange - tempChangePerSecond: -5 - type: Gun fireRate: 0.75 soundGunshot: @@ -142,27 +136,32 @@ energy: 3.5 color: "#cb5b7e" castShadows: false - # - type: Healing - # damageContainers: - # - Biological - # damage: - # groups: # these are all split across multiple types - # Brute: -150 - # Burn: -150 - # Toxin: -150 - # bloodlossModifier: -20 - # delay: 1 - # selfHealPenaltyMultiplier: 0 - # healingBeginSound: - # path: "/Audio/Items/Medical/ointment_begin.ogg" - # params: - # volume: 1.0 - # variation: 0.125 - # healingEndSound: - # path: "/Audio/Items/Medical/ointment_end.ogg" - # params: - # volume: 1.0 - # variation: 0.125 + - type: Healing + damageContainers: + - Biological + damage: + types: # these are all split across multiple types + Blunt: -200 + Piercing: -200 + Slash: -200 + Heat: -200 + Cold: -200 + Shock: -200 + Poison: -150 + Radiation: -200 + bloodlossModifier: -20 + delay: 1 + selfHealPenaltyMultiplier: 0 + healingBeginSound: + path: "/Audio/Items/Medical/ointment_begin.ogg" + params: + volume: 1.0 + variation: 0.125 + healingEndSound: + path: "/Audio/Items/Medical/ointment_end.ogg" + params: + volume: 1.0 + variation: 0.125 - type: entity parent: BaseAnomalyCore @@ -257,7 +256,7 @@ - type: Item size: Ginormous shape: - - 0,0,19,9 + - 0,0,0,0 - type: Storage maxItemSize: Huge grid: diff --git a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml index 8a7f13d1a4..e5b5a8d4d3 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml @@ -6,6 +6,11 @@ mode: SnapgridCenter components: - type: DragonRift + spawnWeights: + MobCarpDragon: 0.59 + MobSharkDragon: 0.2 + MobCarpHoloDragon: 0.2 + MobCarpRainbowDragon: 0.01 - type: Transform anchored: true - type: Physics diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml index ea6e09546b..1979ea9ea5 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml @@ -23,6 +23,7 @@ - SignallerAdvanced - DeviceQuantumSpinInverter - DeviceDesynchronizer + - TechDiskBag # Corvax-Wega-Add - ClothingBackpackHarmpack - type: latheRecipePack diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 7a22483937..cac1d79a13 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -136,10 +136,11 @@ cost: 10000 # Corvax-Wega-Edit 5000 recipeUnlocks: - ClothingBackpackElectropack +# Corvax-Wega-start - SecurityPlating - ArmorBossterSuitModule - EMPShieldSuitModule - +# Corvax-Wega-End # Tier 2 diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index cf9b2d62fe..ef68322e66 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -55,6 +55,7 @@ cost: 5000 recipeUnlocks: - TechDiskComputerCircuitboard + - TechDiskBag # Corvax-Wega-Add - type: technology id: MagnetsTech diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index b4074afa48..04ae82a16d 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -193,6 +193,8 @@ - WeaponIndustrialFanPlasmaCutter # Corvax-Wega-Lavaland - BorgModuleAdvancedMining - SalvageExpeditionsComputerCircuitboard # Corvax-Cringe + technologyPrerequisites: # Corvax-Wega-Add + - SalvageEquipment # Corvax-Wega-add # Tier 3 diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml index 15391b6b61..66c19352e2 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml @@ -14,7 +14,7 @@ - CentralCommand special: - !type:AddImplantSpecial - implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] + implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add - type: startingGear id: CBURNGear diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml index b28afb85bb..67e3321e7b 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml @@ -14,7 +14,7 @@ - CentralCommand special: - !type:AddImplantSpecial - implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] + implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add - type: startingGear id: DeathSquadGear diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index d4b30c8a76..6160f6099c 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -15,7 +15,7 @@ - CentralCommand special: - !type:AddImplantSpecial - implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] + implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add - type: startingGear parent: ERTLeaderGearEVA @@ -107,7 +107,7 @@ components: - type: BibleUser #Lets them heal with bibles - !type:AddImplantSpecial - implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] + implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add - type: startingGear parent: ERTChaplainGearEVA @@ -203,7 +203,7 @@ - CentralCommand special: - !type:AddImplantSpecial - implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] + implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add - type: startingGear parent: ERTEngineerGearEVA @@ -309,7 +309,7 @@ - CentralCommand special: - !type:AddImplantSpecial - implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] + implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add - type: startingGear parent: ERTSecurityGearEVA @@ -404,7 +404,7 @@ - CentralCommand special: - !type:AddImplantSpecial - implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] + implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add - type: startingGear parent: ERTMedicalGearEVA @@ -482,7 +482,7 @@ - CentralCommand special: - !type:AddImplantSpecial - implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] + implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add - type: startingGear parent: ERTJanitorGearEVA diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml index 23571476d8..96b5c81c1a 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml @@ -14,7 +14,7 @@ - CentralCommand special: - !type:AddImplantSpecial - implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] + implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add - type: startingGear id: CentcommGear diff --git a/Resources/Prototypes/_Wega/Actions/types.yml b/Resources/Prototypes/_Wega/Actions/types.yml index 9b172deb08..70efa2d323 100644 --- a/Resources/Prototypes/_Wega/Actions/types.yml +++ b/Resources/Prototypes/_Wega/Actions/types.yml @@ -20,3 +20,20 @@ icon: { sprite: _Wega/Interface/Actions/action_demon.rsi, state: "instant_regeneration" } - type: InstantAction event: !type:DamageOnActionEvent + +- type: entity + parent: BaseSuicideAction + id: ActionActivateBluespaceLifeline + name: Activate Bluespace Lifeline + description: Activates your bluespace lifeline implant, teleporting you far-far away from this station. You won't be able to come back. + components: + - type: Action + checkCanInteract: false + checkConsciousness: false + itemIconStyle: BigAction + priority: -20 + icon: + sprite: _Wega/Effects/bluespace_lifeline.rsi + state: bluespace_lifeline + - type: InstantAction + event: !type:ActivateImplantEvent \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Catalog/Cargo/markets.yml b/Resources/Prototypes/_Wega/Catalog/Cargo/markets.yml new file mode 100644 index 0000000000..b12bab675e --- /dev/null +++ b/Resources/Prototypes/_Wega/Catalog/Cargo/markets.yml @@ -0,0 +1,3 @@ +- type: cargoMarket + id: sec + diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml index 2567c1545f..78bfa135f5 100644 --- a/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml +++ b/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml @@ -24,4 +24,38 @@ - type: Tag tags: - BoxCardboard - - BoxHug \ No newline at end of file + - BoxHug + +- type: entity + parent: BoxCardboard + id: BoxCore + name: box with core + description: A special box for sensitive people. + components: + - type: Sprite + layers: + - state: box_hug + - state: heart + - type: Item + heldPrefix: hug + - type: Tag + tags: + - BoxCardboard + - BoxHug + - type: StorageFill + contents: + - id: AnomalyCorePyroclastic + - id: AnomalyCoreGravity + - id: AnomalyCoreIce + - id: AnomalyCoreFlesh + - id: AnomalyCoreLiquid + - id: AnomalyCoreRock + - id: AnomalyCoreBluespace + - id: AnomalyCoreElectricity + - id: AnomalyCoreFlora + - id: AnomalyCoreShadow + - id: AnomalyCoreTech + - type: Storage + maxItemSize: Ginormous + grid: + - 0,0,3,3 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Catalog/ert_catalog.yml b/Resources/Prototypes/_Wega/Catalog/ert_catalog.yml index c2a553bd36..5822a77979 100644 --- a/Resources/Prototypes/_Wega/Catalog/ert_catalog.yml +++ b/Resources/Prototypes/_Wega/Catalog/ert_catalog.yml @@ -307,6 +307,21 @@ categories: - ERTEquipment +- type: listing + id: ERTBlueSheildSheild + name: tactical-interface-bluesheild-name + description: tactical-interface-bluesheild-desc + productEntity: BlueSheildSheild + cost: + TacticalResource: 5 + categories: + - ERTEquipmentPro + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - CBURNTacticalInterface + - type: listing id: ERTPortableRechargerPro name: tactical-interface-portable-recharger-pro-name diff --git a/Resources/Prototypes/_Wega/Catalog/rev_catalog.yml b/Resources/Prototypes/_Wega/Catalog/rev_catalog.yml index caeaef9e42..06c23b4fe0 100644 --- a/Resources/Prototypes/_Wega/Catalog/rev_catalog.yml +++ b/Resources/Prototypes/_Wega/Catalog/rev_catalog.yml @@ -1,6 +1,6 @@ - type: listing id: RevolitionMagazineMedkitCombatFilled - name: ent-MedkitCombatFilled + name: reva-kids-name description: uplink-combat-medkit-desc productEntity: MedkitCombatFilled cost: @@ -8,19 +8,19 @@ categories: - RevolutionSupport -- type: listing - id: RevolitionMagazineChemistryBottleNocturine - name: ent-ChemistryBottleNocturine - description: uplink-nocturine-chemistry-bottle-desc - productEntity: ChemistryBottleNocturine - cost: - HelpfulResource: 1 - categories: - - RevolutionSupport +# - type: listing + # id: RevolitionMagazineChemistryBottleNocturine + # name: ent-ChemistryBottleNocturine + # description: uplink-nocturine-chemistry-bottle-desc + # productEntity: ChemistryBottleNocturine + # cost: + # HelpfulResource: 1 + # categories: + # - RevolutionSupport - type: listing id: RevolitionMagazineSyndicateJawsOfLife - name: ent-SyndicateJawsOfLife + name: reva-jaws-name description: uplink-syndicate-jaws-of-life-desc productEntity: SyndicateJawsOfLife cost: @@ -28,41 +28,41 @@ categories: - RevolutionSupport -- type: listing - id: RevolitionMagazineAgentIDCard - name: ent-AgentIDCard - description: uplink-agent-id-card-desc - productEntity: AgentIDCard - cost: - HelpfulResource: 1 - categories: - - RevolutionSupport +# - type: listing + # id: RevolitionMagazineAgentIDCard + # name: ent-AgentIDCard + # description: uplink-agent-id-card-desc + # productEntity: AgentIDCard + # cost: + # HelpfulResource: 1 + # categories: + # - RevolutionSupport -- type: listing - id: RevolitionMagazineClothingOuterHardsuitCarp - name: ent-ClothingOuterHardsuitCarp - description: uplink-hardsuit-carp-desc - productEntity: ClothingOuterHardsuitCarp - cost: - HelpfulResource: 1 - categories: - - RevolutionSupport +# - type: listing + # id: RevolitionMagazineClothingOuterHardsuitCarp + # name: ent-ClothingOuterHardsuitCarp + # description: uplink-hardsuit-carp-desc + # productEntity: ClothingOuterHardsuitCarp + # cost: + # HelpfulResource: 1 + # categories: + # - RevolutionSupport -- type: listing - id: RevolitionMagazineClothingShoesChameleonNoSlips - name: ent-ClothingShoesChameleonNoSlips - description: uplink-clothing-no-slips-shoes-desc - productEntity: ClothingShoesChameleonNoSlips - cost: - HelpfulResource: 1 - categories: - - RevolutionSupport +# - type: listing + # id: RevolitionMagazineClothingShoesChameleonNoSlips + # name: ent-ClothingShoesChameleonNoSlips + # description: uplink-clothing-no-slips-shoes-desc + # productEntity: ClothingShoesChameleonNoSlips + # cost: + # HelpfulResource: 1 + # categories: + # - RevolutionSupport - type: listing id: RevolitionMagazineBriefcaseSyndieLobbyingBundleFilled - name: ent-BriefcaseSyndieLobbyingBundleFilled - description: uplink-bribe-desc - productEntity: BriefcaseSyndieLobbyingBundleFilled + name: reva-cash-name + description: reva-cash-desc + productEntity: SpaceCash10000 cost: HelpfulResource: 1 categories: @@ -78,20 +78,30 @@ categories: - RevolutionSupport +# - type: listing + # id: RevolitionMagazineHypopen + # name: uplink-hypopen-name + # description: uplink-hypopen-desc + # icon: { sprite: /Textures/Objects/Misc/pens.rsi, state: pen } + # productEntity: HypopenBox + # cost: + # HelpfulResource: 1 + # categories: + # - RevolutionSupport + - type: listing - id: RevolitionMagazineHypopen - name: uplink-hypopen-name - description: uplink-hypopen-desc - icon: { sprite: /Textures/Objects/Misc/pens.rsi, state: pen } - productEntity: HypopenBox + id: RevolitionMagazineOuterVestWebElite + name: reva-tactkik-flame-name + description: uplink-clothing-outer-vest-web-elite-desc + productEntity: ClothingOuterVestWebElite cost: - HelpfulResource: 1 + HelpfulResource: 2 categories: - RevolutionSupport - type: listing id: RevolitionMagazineOuterVestWeb - name: ent-ClothingOuterVestWeb + name: reva-tactkik-name description: uplink-clothing-outer-vest-web-desc productEntity: ClothingOuterVestWeb cost: @@ -99,19 +109,19 @@ categories: - RevolutionSupport -- type: listing - id: RevolitionMagazineCrateFunSyndicateSegway - name: ent-CrateFunSyndicateSegway - description: uplink-syndicate-segway-crate-desc - productEntity: CrateFunSyndicateSegway - cost: - HelpfulResource: 2 - categories: - - RevolutionSupport +# - type: listing + # id: RevolitionMagazineCrateFunSyndicateSegway + # name: ent-CrateFunSyndicateSegway + # description: uplink-syndicate-segway-crate-desc + # productEntity: CrateFunSyndicateSegway + # cost: + # HelpfulResource: 2 + # categories: + # - RevolutionSupport - type: listing id: RevolitionMagazineEncryptionKeySyndie - name: ent-EncryptionKeySyndie + name: reva-boxkey description: uplink-encryption-key-desc productEntity: BoxEncryptionKeySyndie cost: @@ -121,7 +131,7 @@ - type: listing id: RevolitionMagazineEmag - name: ent-Emag + name: reva-emag-name description: uplink-emag-desc productEntity: Emag cost: @@ -142,7 +152,7 @@ - type: listing id: RevolitionMagazinePowerSink - name: ent-PowerSink + name: reva-powerlink-name description: uplink-power-sink-desc productEntity: PowerSink cost: @@ -152,7 +162,7 @@ - type: listing id: RevolitionMagazineClothingHeadHatCatEars - name: ent-ClothingHeadHatCatEars + name: uplink-cat-ears-name description: uplink-cat-ears-desc productEntity: ClothingHeadHatCatEars cost: diff --git a/Resources/Prototypes/_Wega/Catalog/spellbook_catalog.yml b/Resources/Prototypes/_Wega/Catalog/spellbook_catalog.yml new file mode 100644 index 0000000000..74fbb60b86 --- /dev/null +++ b/Resources/Prototypes/_Wega/Catalog/spellbook_catalog.yml @@ -0,0 +1,16 @@ +- type: listing + id: SpellbookBoxCore + name: spellbook-staff-boxecore-name + description: spellbook-staff-boxecore-description + productEntity: BoxCore + icon: + sprite: Structures/Specific/Anomalies/Cores/pyro_core.rsi + state: core + cost: + WizCoin: 3 + categories: + - SpellbookEquipment + conditions: + - !type:ListingLimitedStockCondition + stock: 1 + diff --git a/Resources/Prototypes/_Wega/Entities/Effects/misc.yml b/Resources/Prototypes/_Wega/Entities/Effects/misc.yml new file mode 100644 index 0000000000..6525eb19a9 --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Effects/misc.yml @@ -0,0 +1,16 @@ +- type: entity + parent: Acidifier + id: BluespaceLifeline + name: bluespace lifeline + description: Teleports your body to save your life! + components: + - type: Sprite + sprite: /Textures/_Wega/Effects/bluespace_lifeline.rsi + noRot: true + layers: + - state: bluespace_lifeline + - type: EmitSoundOnSpawn + sound: + path: /Audio/Effects/tesla_consume.ogg + params: + variation: 0.3 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/carp.yml new file mode 100644 index 0000000000..b90eb95e36 --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/carp.yml @@ -0,0 +1,80 @@ +- type: entity + id: MobSharkDragon + suffix: DragonBrood + parent: MobShark + components: + - type: GhostRole + allowMovement: true + allowSpeech: true + makeSentient: true + name: ghost-role-information-sentient-carp-name + description: ghost-role-information-sentient-carp-description + rules: ghost-role-information-space-dragon-summoned-carp-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonistFlock + - type: GhostTakeoverAvailable + - type: HTN + rootTask: + task: DragonCarpCompound + - type: Flammable + damage: + types: {} + - type: Temperature + - type: TemperatureDamage + heatDamageThreshold: 1200 + - type: FriendlyFaction # Corvax-Wega-Friendly + faction: Dragon # Corvax-Wega-Friendly + +- type: entity + id: MobCarpRainbowDragon + suffix: DragonBrood + parent: MobCarpRainbow + components: + - type: GhostRole + allowMovement: true + allowSpeech: true + makeSentient: true + name: ghost-role-information-sentient-carp-name + description: ghost-role-information-sentient-carp-description + rules: ghost-role-information-space-dragon-summoned-carp-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonistFlock + - type: GhostTakeoverAvailable + - type: HTN + rootTask: + task: DragonCarpCompound + - type: Flammable + damage: + types: {} + - type: Temperature + - type: TemperatureDamage + heatDamageThreshold: 1200 + - type: FriendlyFaction # Corvax-Wega-Friendly + faction: Dragon # Corvax-Wega-Friendly + +- type: entity + id: MobCarpHoloDragon + suffix: DragonBrood + parent: MobCarpHolo + components: + - type: GhostRole + allowMovement: true + allowSpeech: true + makeSentient: true + name: ghost-role-information-sentient-carp-name + description: ghost-role-information-sentient-carp-description + rules: ghost-role-information-space-dragon-summoned-carp-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonistFlock + - type: GhostTakeoverAvailable + - type: HTN + rootTask: + task: DragonCarpCompound + - type: Flammable + damage: + types: {} + - type: Temperature + - type: TemperatureDamage + heatDamageThreshold: 1200 + - type: FriendlyFaction # Corvax-Wega-Friendly + faction: Dragon # Corvax-Wega-Friendly \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_Wega/Entities/Objects/Misc/implanters.yml index 8b7176d88d..bb5f94cca4 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Misc/implanters.yml @@ -1,3 +1,11 @@ +- type: entity + id: BluseSpaceImplanter + name: bluespase implanter + parent: BaseImplantOnlyImplanter + components: + - type: Implanter + implant: BluespaceLifelineImplant + - type: entity id: LoyaltyImplanter name: loyalty implanter diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_Wega/Entities/Objects/Misc/paper.yml index 164479e1c4..973fb3c046 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Misc/paper.yml @@ -126,8 +126,13 @@ Blunt: 0 angle: 10 - type: Flash + flashOnUse: false - type: RevolutionaryConverter - type: Tag tags: - Book - RevShop + - type: LimitedCharges + maxCharges: 1 + - type: AutoRecharge + rechargeDuration: 30 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_Wega/Entities/Objects/Misc/subdermal_implants.yml index c2f6573794..f695329fef 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Misc/subdermal_implants.yml @@ -10,6 +10,34 @@ - type: Item # Corvax-Wega-Surgery size: Tiny # Corvax-Wega-Surgery +- type: entity + parent: BaseSubdermalImplant + id: BluespaceLifelineImplant + name: bluespace lifeline implant + description: Teleports the hosts body to Central Command on activation. They will not be able to return. + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Medical/Surgery/implants.rsi + state: nt + - type: SubdermalImplant + permanent: true + implantAction: ActionActivateBluespaceLifeline + - type: TriggerOnMobstateChange + mobState: + - Dead + - type: TriggerOnActivateImplant + - type: AddComponentsOnTrigger # make them embed into the target, but only when activated so that they can't be metagamed + targetUser: true + components: + - type: TimedDespawn + lifetime: 0 + - type: SpawnOnTrigger + proto: BluespaceLifeline + predicted: true + - type: Tag + tags: + - SubdermalImplant + - type: entity parent: BaseSubdermalImplant id: LoyaltyImplant @@ -17,4 +45,4 @@ description: This implant grants access to the Centcomm channel without a headset. Only authorized for Centcomm employees. categories: [ HideSpawnMenu ] components: - - type: MindControlImplant + - type: MindControlImplant \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/iconitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/iconitem.yml index b983d0385f..83c3d0019c 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/iconitem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/iconitem.yml @@ -122,3 +122,36 @@ sprite: _Wega/Objects/Specific/Robotics/iconitem.rsi state: cash-icon +- type: entity + parent: BaseItem + id: ConstrukAndBattery + name: ConstrukAndCabel + categories: [ HideSpawnMenu ] + description: CashIcon + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/iconitem.rsi + state: generic_materials_battery + +- type: entity + parent: BaseItem + id: BolaIcon + name: bolo-icon + categories: [ HideSpawnMenu ] + description: CashIcon + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/iconitem.rsi + state: bolo-icon + +- type: entity + parent: BaseItem + id: GrenIcon + name: bgren-icon + categories: [ HideSpawnMenu ] + description: CashIcon + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/iconitem.rsi + state: gren-icon + diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/secitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/secitem.yml index 46cafc60fe..245667feb8 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/secitem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/secitem.yml @@ -126,7 +126,7 @@ # SEC Granader - type: entity name: hand grenade gun - parent: BaseStorageItem + parent: BaseItem id: WeaponHandGranadeGun description: Load granade for optimal results. components: @@ -134,16 +134,8 @@ sprite: _Wega/Objects/Weapons/Guns/Battery/borggun.rsi layers: - state: icon - - type: Storage - maxItemSize: Normal - grid: - - 0,0,0,1 - - 1,0,0,0 - whitelist: - tags: - - HandGrenade - type: Gun - fireRate: 2 + fireRate: 0.5 selectedMode: SemiAuto availableModes: - SemiAuto @@ -151,15 +143,26 @@ path: /Audio/Effects/thunk.ogg soundEmpty: path: /Audio/Items/hiss.ogg - clumsyProof: true - - type: ContainerAmmoProvider - container: storagebase - - type: Item - size: Large - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [] + - type: Appearance + - type: BatteryAmmoProvider + proto: GrenadeStingerProject + fireCost: 500 + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: BatterySelfRecharger + autoRechargeRate: 25 + autoRechargePauseTime: 20 + - type: AmmoCounter + - type: BatteryWeaponFireModes + fireModes: + - proto: GrenadeStingerProject + fireCost: 500 + - proto: GrenadeFlashBangProject + fireCost: 250 + - proto: TearGasGrenadeProject + fireCost: 500 + - type: entity name: box granade @@ -172,13 +175,9 @@ - state: box_of_doom # Corvax-Resprite - state: flashbang - type: Storage + maxItemSize: Normal grid: - 0,0,4,3 - - type: StorageFill - contents: - - id: GrenadeStinger - - id: TearGasGrenade - - id: GrenadeFlashBang # SEC Sheild - type: entity diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml index 64e80bf160..fc4d3110aa 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -140,6 +140,7 @@ whitelist: tags: - ConstructionMaterial + - PowerCell - CableCoil - hand: emptyRepresentative: ScientistIcon # Corvax-Wega-Robot @@ -889,19 +890,25 @@ - item: WeaponHandGranadeGun - hand: emptyLabel: borg-slot-granade-empty - emptyRepresentative: ModularGrenade + emptyRepresentative: GrenIcon whitelist: tags: - HandGrenade - Payload - VoiceTrigger - - item: BoxBorgGranade + components: + - PayloadCase + - PayloadTrigger - hand: - emptyLabel: borg-slot-cabeldet-empty - emptyRepresentative: CableDetStack + emptyLabel: borg-slot-granade-empty + emptyRepresentative: BolaIcon whitelist: tags: - - Payload + - CableCoil + - Bola + components: + - Ensnaring + - item: BoxBorgGranade - type: BorgModuleIcon icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: grenade-module } @@ -1103,6 +1110,7 @@ - type: ItemBorgModule hands: - item: RCDCombatRecharging + - item: AccessConfiguratorAllAccses - item: BorgGeneratorMaterialRod - item: BorgGeneratorTile - item: BorgGeneratorMaterialSteal diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Specific/construction-bag.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Specific/construction-bag.yml index 2092485596..eb8bb9c1aa 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Specific/construction-bag.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Specific/construction-bag.yml @@ -27,4 +27,30 @@ tags: - ConstructionMaterial - type: Dumpable + +- type: entity + parent: BaseStorageItem + id: TechDiskBag + name: technology disk bag + components: + - type: Sprite + sprite: _Wega/Objects/Devices/bag_diski.rsi + state: icon + - type: Item + size: Ginormous + storedRotation: -90 + - type: Clothing + quickEquip: false + slots: + - belt + - type: Storage + grid: + - 0,0,19,9 + maxItemSize: Normal + quickInsert: true + areaInsert: true + whitelist: + components: + - TechnologyDisk + - type: Dumpable - type: MagnetPickup \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/_Wega/Entities/Objects/Tools/tools.yml index f7b8463028..04a9f42224 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Tools/tools.yml @@ -98,4 +98,99 @@ # Corvax-Wega-Lavaland-start - type: HandheldGpsUi broadcastEnabled: false - # Corvax-Wega-Lavaland-end \ No newline at end of file + # Corvax-Wega-Lavaland-end + +- type: entity + parent: AccessConfigurator + id: AccessConfiguratorCargo + name: cargo access configurator + description: A modified access configurator used by the cargo. + components: + - type: Item + size: Normal + shape: + - 0,0,0,1 + - type: Sprite + sprite: _Wega/Objects/Tools/cargo_access_configurator.rsi + - type: Clothing + sprite: _Wega/Objects/Tools/cargo_access_configurator.rsi + - type: AccessOverrider + showPrivilegedId: false + accessLevels: + - Cargo + - Salvage + - Quartermaster + privilegedIdSlot: + name: id-card-console-privileged-id + startingItem: QuartermasterIDCard + ejectSound: /Audio/Machines/id_swipe.ogg + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectOnBreak: true + disableEject: true + swap: false + whitelist: + components: + - IdCard + denialSound: + path: /Audio/Machines/custom_deny.ogg + doAfter: 0.5 + +- type: entity + parent: AccessConfigurator + id: AccessConfiguratorSci + name: scie access configurator + description: A modified access configurator used by the cargo. + components: + - type: Item + size: Normal + shape: + - 0,0,0,1 + - type: Sprite + sprite: _Wega/Objects/Tools/sci_access_configurator.rsi + - type: Clothing + sprite: _Wega/Objects/Tools/sci_access_configurator.rsi + - type: AccessOverrider + showPrivilegedId: false + accessLevels: + - Research + privilegedIdSlot: + name: id-card-console-privileged-id + startingItem: ResearchIDCard + ejectSound: /Audio/Machines/id_swipe.ogg + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectOnBreak: true + disableEject: true + swap: false + whitelist: + components: + - IdCard + denialSound: + path: /Audio/Machines/custom_deny.ogg + doAfter: 0.5 + +- type: entity + parent: AccessConfigurator + id: AccessConfiguratorAllAccses + name: borg access configurator + description: A modified access configurator used by the cargo. + components: + - type: Item + size: Normal + shape: + - 0,0,0,1 + - type: AccessOverrider + showPrivilegedId: false + privilegedIdSlot: + name: id-card-console-privileged-id + startingItem: CaptainIDCard + ejectSound: /Audio/Machines/id_swipe.ogg + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectOnBreak: true + disableEject: true + swap: false + whitelist: + components: + - IdCard + denialSound: + path: /Audio/Machines/custom_deny.ogg + doAfter: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Grenades/canister_grenades.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Grenades/canister_grenades.yml index 65b6b77d01..af37ce0b01 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Grenades/canister_grenades.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Grenades/canister_grenades.yml @@ -15,4 +15,25 @@ solution: reagents: - ReagentId: Holywater - Quantity: 75 \ No newline at end of file + Quantity: 75 + +- type: entity + parent: GrenadeStinger + id: GrenadeStingerProject + categories: [ HideSpawnMenu ] + components: + - type: TriggerOnSpawn + +- type: entity + parent: TearGasGrenade + id: TearGasGrenadeProject + categories: [ HideSpawnMenu ] + components: + - type: TriggerOnSpawn + +- type: entity + parent: GrenadeFlashBang + id: GrenadeFlashBangProject + categories: [ HideSpawnMenu ] + components: + - type: TriggerOnSpawn \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index ae8f0196e8..7de7f929f3 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -351,4 +351,41 @@ - type: BatterySelfRecharger autoRechargeRate: 35 - type: Item - size: Large \ No newline at end of file + size: Large + +- type: entity + name: pulse shotgun + parent: BaseWeaponBattery + id: WeaponPulseShotgun + description: The final prototype of the energy shotgun, specially designed for death squads. Devoid of firing modes, but more deadly. + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Gun + fireRate: 1.5 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser3.ogg + - type: Wieldable + unwieldOnUse: false + - type: BatteryAmmoProvider + proto: BulletPulseSpread + fireCost: 100 + - type: Item + size: Large + sprite: _Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi + heldPrefix: pulse + - type: GunRequiresWield + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: Appearance diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 518cf8b1a9..3dd28aafab 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -91,3 +91,59 @@ radius: 1.5 energy: 4.6 color: "#ffffff" + +- type: entity + name: pulse bolt + id: BulletPulse + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser + shader: unshaded + - type: Physics + - type: Ammo + - type: Projectile + impactEffect: BulletImpactEffectDisabler + damage: + types: + Heat: 21 + +- type: entity + id: BulletPulseSpread + categories: [ HideSpawnMenu ] + parent: BulletPulse + components: + - type: ProjectileSpread + proto: BulletPulse + count: 6 + spread: 10 + +- type: entity + parent: BasicHitscan + id: PulseSniper + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 90 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_blue + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_blue + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_blue \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index ed660eef75..6b5c4a529e 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -49,3 +49,39 @@ - type: Appearance - type: StaticPrice price: 5000 + +- type: entity + name: pulse sniper + parent: BaseWeaponBattery + id: WeaponPulseSniper + description: A high tech energy sniper favoured by the NT-ERT operatives. + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: _Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 0.5 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_Wega/Weapons/Guns/Gunshots/laser_sniper.ogg + - type: BatteryAmmoProvider + proto: PulseSniper + fireCost: 1500 + - type: Battery + maxCharge: 7500 + startingCharge: 7500 + - type: Wieldable + - type: GunRequiresWield + - type: CursorOffsetRequiresWield + - type: EyeCursorOffset + maxOffset: 3 + pvsIncrease: 0.3 diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Throwable/bola.yml index 43d626449d..7e08a04f22 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Throwable/bola.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Throwable/bola.yml @@ -29,7 +29,7 @@ sprite: _Wega/Objects/Weapons/Throwable/cult_bola.rsi state: icon - type: Item - size: Normal + size: Small shape: - 0,0,0,1 - type: DamageOnLand @@ -132,4 +132,7 @@ sound: collection: MetalBreak - !type:DoActsBehavior - acts: [ "Destruction" ] \ No newline at end of file + acts: [ "Destruction" ] + - type: Tag + tags: + - Bola \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/_Wega/Entities/Structures/Storage/Canisters/gas_canisters.yml index bb5b469de7..c0c895b5e0 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -11,8 +11,8 @@ air: volume: 1500 moles: - Oxygen: 609.26 # oxygen - NitrousOxide: 2160.1 # N2O + Oxygen: 1938.56 # oxygen + NitrousOxide: 830.8 # N2O temperature: 293.15 - type: Destructible thresholds: diff --git a/Resources/Prototypes/_Wega/Procedural/biome_ore_templates_low.yml b/Resources/Prototypes/_Wega/Procedural/biome_ore_templates_low.yml index 85635ab982..6dda651a8d 100644 --- a/Resources/Prototypes/_Wega/Procedural/biome_ore_templates_low.yml +++ b/Resources/Prototypes/_Wega/Procedural/biome_ore_templates_low.yml @@ -8,9 +8,9 @@ WallRockChromite: WallRockChromiteTin WallRockSand: WallRockSandTin WallRockSnow: WallRockSnowTin - maxCount: 20 - minGroupSize: 4 - maxGroupSize: 8 + maxCount: 30 + minGroupSize: 10 + maxGroupSize: 15 radius: 4 - type: biomeMarkerLayer @@ -21,9 +21,9 @@ WallRockBasalt: WallRockBasaltLavalandQuartz WallRockChromite: WallRockChromiteQuartz WallRockSnow: WallRockSnowQuartz - maxCount: 20 - minGroupSize: 4 - maxGroupSize: 8 + maxCount: 30 + minGroupSize: 10 + maxGroupSize: 15 radius: 4 - type: biomeMarkerLayer @@ -35,9 +35,9 @@ WallRockChromite: WallRockChromiteCoal WallRockSand: WallRockSandCoal WallRockSnow: WallRockSnowCoal - maxCount: 20 - minGroupSize: 4 - maxGroupSize: 6 + maxCount: 30 + minGroupSize: 8 + maxGroupSize: 12 radius: 4 # Medium value @@ -51,9 +51,9 @@ WallRockChromite: WallRockChromiteGold WallRockSand: WallRockSandGold WallRockSnow: WallRockSnowGold - maxCount: 10 - minGroupSize: 2 - maxGroupSize: 5 + maxCount: 20 + minGroupSize: 5 + maxGroupSize: 10 radius: 4 # Silver @@ -66,9 +66,9 @@ WallRockChromite: WallRockChromiteSilver WallRockSand: WallRockSandSilver WallRockSnow: WallRockSnowSilver - maxCount: 10 - minGroupSize: 2 - maxGroupSize: 5 + maxCount: 20 + minGroupSize: 5 + maxGroupSize: 10 radius: 4 # High value @@ -82,9 +82,9 @@ WallRockChromite: WallRockChromitePlasma WallRockSand: WallRockSandPlasma WallRockSnow: WallRockSnowPlasma - maxCount: 6 - minGroupSize: 3 - maxGroupSize: 5 + maxCount: 12 + minGroupSize: 4 + maxGroupSize: 8 radius: 4 # Uranium @@ -97,9 +97,9 @@ WallRockChromite: WallRockChromiteUranium WallRockSand: WallRockSandUranium WallRockSnow: WallRockSnowUranium - maxCount: 7 - minGroupSize: 2 - maxGroupSize: 4 + maxCount: 15 + minGroupSize: 4 + maxGroupSize: 8 radius: 4 - type: biomeMarkerLayer @@ -111,7 +111,7 @@ WallRockChromite: WallRockChromiteDiamond WallRockSand: WallRockSandDiamond WallRockSnow: WallRockSnowDiamond - maxCount: 3 + maxCount: 6 minGroupSize: 1 maxGroupSize: 2 radius: 4 diff --git a/Resources/Prototypes/_Wega/Procedural/biome_templates.yml b/Resources/Prototypes/_Wega/Procedural/biome_templates.yml index 57e9823c8b..9ff59cde75 100644 --- a/Resources/Prototypes/_Wega/Procedural/biome_templates.yml +++ b/Resources/Prototypes/_Wega/Procedural/biome_templates.yml @@ -114,19 +114,19 @@ cellularReturnType: Distance2 # As I can see, it works much better than I could have imagined. entityWeights: - WallRockBasalt: 0.947 - WallRockBasaltLavalandTin: 0.019 - WallRockBasaltLavalandCoal: 0.0095 - WallRockBasaltLavalandQuartz: 0.0095 - WallRockBasaltLavalandPlasma: 0.0095 - WallRockBasaltLavalandSilver: 0.0054 - WallRockBasaltLavalandGold: 0.0034 - WallRockBasaltLavalandUranium: 0.00135 - WallRockBasaltLavalandDiamond: 0.00135 - WallRockBasaltLavalandBananium: 0.00108 - WallRockBasaltLavalandGems: 0.00081 - WallRockBasaltLavalandGibtonite: 0.00027 - WallRockBasaltLavalandMagmite: 0.00027 + WallRockBasalt: 0.647 + WallRockBasaltLavalandTin: 0.04 + WallRockBasaltLavalandCoal: 0.019 + WallRockBasaltLavalandQuartz: 0.019 + WallRockBasaltLavalandPlasma: 0.0098 + WallRockBasaltLavalandSilver: 0.0098 + WallRockBasaltLavalandGold: 0.0098 + WallRockBasaltLavalandUranium: 0.00535 + WallRockBasaltLavalandBananium: 0.00508 + WallRockBasaltLavalandGems: 0.0015 + WallRockBasaltLavalandMagmite: 0.0015 + WallRockBasaltLavalandDiamond: 0.001 + WallRockBasaltLavalandGibtonite: 0.0005 - !type:BiomeDummyLayer id: Loot # Fill basalt diff --git a/Resources/Prototypes/_Wega/Recipes/Lathes/misc.yml b/Resources/Prototypes/_Wega/Recipes/Lathes/misc.yml index 6fcc403a44..ac4ba062c3 100644 --- a/Resources/Prototypes/_Wega/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_Wega/Recipes/Lathes/misc.yml @@ -36,4 +36,14 @@ completetime: 5 materials: Steel: 500 - Plastic: 300 \ No newline at end of file + Plastic: 300 + +- type: latheRecipe + id: TechDiskBag + result: TechDiskBag + categories: + - Clothing + completetime: 5 + materials: + Cloth: 300 + Durathread: 100 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Research/arsenal.yml b/Resources/Prototypes/_Wega/Research/arsenal.yml index 7556d7f5c2..37ccb8768f 100644 --- a/Resources/Prototypes/_Wega/Research/arsenal.yml +++ b/Resources/Prototypes/_Wega/Research/arsenal.yml @@ -28,6 +28,8 @@ - BorgModuleLethal - PortableRechargerBag - PortableRechargerTurbo + technologyPrerequisites: + - WeaponizedLaserManipulation - type: technology id: AdvancedFlash @@ -40,4 +42,6 @@ cost: 7500 recipeUnlocks: - ClothingHeadHelmetFlash - - ClothingNeckFlashNeck \ No newline at end of file + - ClothingNeckFlashNeck + technologyPrerequisites: + - SpecialMeans \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Research/biochemical.yml b/Resources/Prototypes/_Wega/Research/biochemical.yml index e8575986c0..69541e9fa0 100644 --- a/Resources/Prototypes/_Wega/Research/biochemical.yml +++ b/Resources/Prototypes/_Wega/Research/biochemical.yml @@ -145,6 +145,8 @@ - Bonesaw - ScalpelLaser - BorgModuleSurgery + technologyPrerequisites: + - SurgicalTools - type: technology id: LauncherSyringe diff --git a/Resources/Prototypes/_Wega/Research/industrial.yml b/Resources/Prototypes/_Wega/Research/industrial.yml index 22cb9f7d2e..1c3f7f8712 100644 --- a/Resources/Prototypes/_Wega/Research/industrial.yml +++ b/Resources/Prototypes/_Wega/Research/industrial.yml @@ -53,3 +53,5 @@ - StorageLargeSuitModule - JetpackSuitModule - ConstructorSuitModule + technologyPrerequisites: + - IndustrialModifier \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/cburn.yml index 92d08978b3..61e28c279e 100644 --- a/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/cburn.yml +++ b/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/cburn.yml @@ -19,7 +19,7 @@ jumpsuit: ClothingUniformJumpsuitColorBrown back: ClothingBackpackDuffelCBURN mask: ClothingMaskGasERT - eyes: ClothingEyesGlassesSecurity + eyes: ClothingERTHud ears: ClothingHeadsetAltCentCom gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitCBURNLeader diff --git a/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/emergencyresponseteam.yml index 18ea86df97..f891f87976 100644 --- a/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/_Wega/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -5,7 +5,7 @@ back: ClothingBackpackERTLeader shoes: ClothingShoesBootsCombatFilled head: ClothingHeadHatERTLeaderBeret - eyes: ClothingEyesGlassesSecurity + eyes: ClothingERTHud neck: ClothingNeckMantleERTLeader gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorBasicSlim @@ -30,7 +30,7 @@ back: ClothingBackpackERTLeader shoes: ClothingShoesBootsMagCombat head: ClothingHeadHatERTLeaderBeret - eyes: ClothingEyesGlassesSecurity + eyes: ClothingERTHud neck: ClothingNeckMantleERTLeader gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTLeader @@ -54,7 +54,7 @@ back: ClothingBackpackERTLeader shoes: ClothingShoesBootsMagCombat mask: ClothingMaskGasERT - eyes: ClothingEyesGlassesSecurity + eyes: ClothingERTHud neck: ClothingNeckMantleERTLeader gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTLeader @@ -78,7 +78,7 @@ back: ClothingBackpackERTLeader shoes: ClothingShoesBootsMagCombat mask: ClothingMaskGasERT - eyes: ClothingEyesGlassesSecurity + eyes: ClothingERTHud neck: ClothingNeckMantleERTLeader gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTLeader diff --git a/Resources/Prototypes/_Wega/tags.yml b/Resources/Prototypes/_Wega/tags.yml index 8a7944418a..5cf7bc5be8 100644 --- a/Resources/Prototypes/_Wega/tags.yml +++ b/Resources/Prototypes/_Wega/tags.yml @@ -518,3 +518,5 @@ - type: Tag id: OrganicBrain +- type: Tag + id: Bola \ No newline at end of file diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index a6d6ef1dd2..c09e4b9706 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -79,6 +79,7 @@ - Android - type: ShowAccessReaderSettings - type: MagbootsImplant + - type: ThermalSight # Corvax-Wega-end # Visual diff --git a/Resources/Textures/_Wega/Effects/bluespace_lifeline.rsi/bluespace_lifeline.png b/Resources/Textures/_Wega/Effects/bluespace_lifeline.rsi/bluespace_lifeline.png new file mode 100644 index 0000000000000000000000000000000000000000..70c50ffb20a01efc06ba0521e6eaef296d0c8cd3 GIT binary patch literal 4974 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5a2df86be0fb334cbeb95ec465c8a32654bfb360 GIT binary patch literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z%RF5iLn`LH zy=CZq*g=Br!TDE{7G@n#9X#Wfox9~) z+O@yhGecee*gI%W{r%^98>#cngLjq8ot zd-Qf-(tf|?|Gp%9%H6M<`2P1J?S`3W&)$1K**0_g57C*IpKtwQ=_&N`$DMiKp2-Rd z&fRa~UEb|`ApLjaIX^zHss7o2wspMT^`y-1()rZgN2jHK`@4F|A_a~$ds!b@n9Y0s gv@U(O^aJ^yY>w=^R@N38%7R?&>FVdQ&MBb@0K0g^2mk;8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..36e636b9937439a948bb9e42416c77684e32ce0c GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z3p`yMLn`LH zy=Cur*g%Bs1N*88Rt%;|9L!FMj$4G*xb(y@7BaE*T~IDbPfTBRL{wt+8;_1&^AIh$ z2}!dWd5u{`3zEg(Y-xON?%MhE`_WVL5B75a?SOy;CgazY=|4EH-#NXF@$a{es;wgE?d$`-f89~?M`?y>@nN%v5l`nW3Oyd3mUhicbM2H% zr9Z{a%-Z=yT4AY)oW9Zenby_QdDE_)S;ODIF1&8$S|itImCs=og6I|cm-DRPiqAA-2oH=I^T zySAPEX?AJRceg^B>UySSSMAQ1@42#R+X)fB_Sf>q&2Q`9KbIQ$Ou2vSx2xCoUf(%a zEMe1SCyvBDA1BDFxbiBp#M+d0bga1j$$0zc;r_l&Iein|Q| Z7M3U7-(0b`e60Y;sh+NWF6*2UngF`Iym9~l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/meta.json b/Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/meta.json new file mode 100644 index 0000000000..20607bc2de --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Devices/bag_diski.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe, inhand sprites by lzk228(discord 455630609641897984), mod trofey by gw360 (<@500744677352407051>)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Shields/blueshieldshield.rsi/inhand-left-shield.png b/Resources/Textures/_Wega/Objects/Shields/blueshieldshield.rsi/inhand-left-shield.png index 9d278a9bb97b4a3390e80cece921b60ab934b058..a588e3959f9502a5583b1c2d03346d3342673924 100644 GIT binary patch delta 1157 zcmV;01bX|M3V{lcLlyW>9mnxlvK-pMl0yy|bd0pC1{oQVSR#MXkb|J@VS|RwgpF(v zw8af^ta`CsInoZU6j_#K>pj0-_CD~?4?XGk-uwBdC)>X-z~OK>9M1n1f#&A9)spl6)jYq+Hxot%#7%j95x~1aP;^ zh^1H&A)kwz>XCmCk>*xQGL26b5C`B$h)7c@Q?0dx{AAKnQX=5jCX<#@YYF+OR67VX zK41SPIDjM&2Vg2?s^vyBe=-wQuDx;}aWMw_=(SH~qDr|D%}=FFmDcCdx4#cH2*d#> zH=_BOtf0iBz_njrLOj|&|M|8)veD zav~vioxff>gR7_S0sy@IGg(8~B=q^id(RJj0|Y2Cz@F&hbfT;8dg+W~Uz)w^T;sR6 zL41DyE}O*z6d3@tCz{DkU=d{iz+aJfOm1QzdwKp;XrHVh{vuQ;6s&*rG)_bs7)`g}wgKQ#Erx&11fI*(I_&lJ z^`2vTeFj}SEQm8;TQiV?hDxQ}Ve7gMUDr{ml#zmlZO!Pg!}xTww6tWA&Xoyk>aM(| z?#kz+H>@yr7@yug7V98RvE{Ee(&NvfR(XF20DbLZX&*mcUg){0d3}EL<{Z-v z5TJMj0H9dfN3HS@=O%tbv9ymD#SIio`(3uZ_^>{o2E+k4*x3Tmp70kNlg|0i7IwR? zwHI&S6V@k7hy$S2Md@H?3+@I0SLCV_1aH4q7XyC`d40b2@tX78-??|2$sRx)fN{}K zwYq;OwM@WnK>PT~cU8y!a%BuHv%R=+(Fpu8dExz=f0EAMhByEZZd_PNSapB(k(re2qdRq5CgAQ%SatQmjSGRVwSGRm z^b075!{Kl^91e%W;q+oCe>?Z8>9eTk+v5Rb`U5Xi{|VZY=~dHb1*!hP5314_a9q7$Nq zne1MJx~}7(+Cp|LhHWj0=+VAoKXroi04&EO(I5ChouWZH0ao?>uYcNHvh%39w>N{ed6UJC#-!CG2c@zJrh9ip-{*4WL7R&^4EkP-j4pPJk7p z`U5|x0}xcxXOq4J2s&NUPfBUw@X3*V$=aX-z~OK>oc}KZ&CT(jXv8lT6xKP(Z_8|PPx@_`VMvT;+jB0@erVkxN+z}?a# zmSRPOd^T>X2SR^DnqMu-G(K5C9DoBMB26bvwb2psQ=^uW6al|BHEJo1j*y>Dc7s6U z^Yw3n14sgK0H%|sT5d)2C(}{o+AH@F7h|xGUi)M^s+3#N{B+V(X?-qz`}JGU#G~EwpTGQzW5=V1Z8jq)tb;hkmcQDRb8}gwCZ0v3_7HynjpycN;)=!e4AoIp;rHEcIP$ zFW$Z6QZGN zO;La9n1J1Y?(viF>W=;8$~Zb^cX1P<5%^=s&*zT`lus`&ynpjg()rsE2jIbt3o8k$sXl))MJR*&4nR;%pB1F~13#!grl293 zJ}a)C?glrk{=g6F3<%N*u!2;7;0JX809Q?aCV|{clNAIje|Izk&!jZeY8_PcF~_z{ zcCSHQ*RfacATu7rjy8(uLDjLJIzf5>mSd9W5B#7`(IA}wtNQ-eKW)h*`U5|P@)j7R z6JQ06{=f@$0K(`5SaDqafgjX6mDUs`>~4F$gOB5i%%+?TphthuHw2f&(Nj<~Lckkqry!_tY*}ixo``qG>7ro~8-ZRm(&Q0^IiWP}k=T}m@@5R$y z>$ac!b7$x4+wYB}sy2LFd+ZZe;*vdRK^lS2VrITmBm@Rv9 z#g73FeuNf%W8|~c|NXc2`n&`C?tPzITzKN&!SJp-^PMwmRuO z{`K0-`PSvNzhm8;`OWrSjfhh`Q+4x9N*Y(zopr03aG>GXMYp diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/bolo-icon.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/bolo-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..375e9fc9e04d9e4fd8f4318d6ee3161b81d6439a GIT binary patch literal 685 zcmV;e0#f~nP)Px%XGugsR9J=WluKw6Q51&1sV+jOgp3B#N^7X};YwN~QWpUq=%S^K6dI^hN+^|N zt2-YX-MUfe&MDYcgaiwA(SNLX&&ul#;x;jhPn5g z`~UYp=N_(Nmbc(Wzn|2@?jS9ct&%j)Q#Z@832NPH^jTy4>bomJ&uZhGq0lIsKvcdzlcVoI{D!8 zwA9tnfh@cAnER4cQ>(uXrhm<#Mxi>~C(gv)12EG)%2d;4RYn5?Lw5;>!_pgB7WXtw zf?}7K+iyr}GzTJ)hyb|#X`iX4O}aX}^gS(;Wp{TQEt4hD+RUT3v&;{l1B$gTb$LDO z4V!Rsa#8{a^!A9WombE@S!A~h0NL$AcDq>lwxY+EIz63KEltB?1(a~><~4q7Z0qEJ zE=J2_dFs2siAaQ0yf_i95|?o79C-fZfjBtG)g)+{EUhg~Jbw1VG-0{r)j0AMl<;}! z3+LN>W_kVzhLdn&Y(!kXbP<5>sdWGv8=aPJ55^AE9mNx4Bl?0>>&*zTVZ+8Bi2(=i TyQpW`q<7DVdtO%(dgyL4*P{zBHU_ z-V#SE&HASG)W)J@7Z!-t*W;$s)YL_}n|7$Fi;_*JiQX6Ea%viBSxik|t|}9DSfkbo ztu&2^4P@@z;m3b>Ufe2#z!-y+5+Qu<{BNZc#uz-$<003jp}pOBp2y_mWN3i-`DFpn z1^}zJj;n9Iuyy^qby&8I6ates&OOK&gE0ne3`T3TQYd4{X0x=kw3thmE>+xTp#aAC z0Pfr@wrykCHbMw$YikiwVo8Y<0;Ghzu`zf`;dve=lktD&Symb)xJp?F1rU~nv;@)n8xX>;a#B=0O+^rS^OY!c z38ZBqr9fp}r1XcBvk!}YY5VZ-X>Qz{rR(usX6d-_V`xdF6u~A05Hggt$n4Oe!Jutm z;8l{zqX2Yl?+m_k5J5cQOOUH{nfY5mQ7S>t>CAs)J2{t5v!VByzzAS)Fv--FX`15+ zCdS5@x-!kwmFbfCU|0yY6r#)~lt>}b zS=TSET4S^>8uQA_hq?Vo8{6WI08EUH7a2{Ajnf=Y6h+<~Pn39---MRr`qkgiS_d~> zUax--yvutZyur5iMy~(zSCR4Qk&z(f9oswU?dhSnrzgy&do8!1j zp|man*z?18fS=CHe1uQWe1YTrSrTR8l2irYLpEOqywXTcG-Ew*D`s@<`{`fh~ z+DF0hTr%^KqV*m5=p?S|l1v^g%Ft4U9`Ap`4cFDxWj4p-NGX|LSfIbZpI9u$;oW;V zHtA;~5{Yo2?=?=HejD%$QDHGkCXWVi-(UDvEdN4MAf*)9Y_{Yw%A1ew*uz)tPjF)R z&9W7+udkQGyZ3Tl&y@tcYz6>YTU(9RnnWTIWB|(FhQF^`&A_w!*_ZO8K9^4Oz`lQ{ zxPA6(&g;4AG5~P#;za=jFBgvERJ`FHp1Z||$KMD1>$uZ#7#bSlyq*(J%2mr(!j;Hz z9301~dfwB~DBn2q!T%L4L80rGEx3Vrhz7WVlYI z*=98{$-VdN;r3pW<~Fr3*o$AdC<1}dw4 zCTP!JRsf~~K&!0c#z${7ZCJk^&Er7|fwGAg7g9>0l)_XBWty0VfuR)ne4edax2o&c zua~VeR{=^{0twIQal+xAC+S=L`$y2FR+2_)2P?=U?W&TM$ z65x5Hbv1w4uM}S*Kq-Z(>*RALdEIm}FWfp%oW0lUExFv{+~A~TS3ZEyG^8f*Jza|s zR+p2a>~1O|&1SP@V+-N>3Z$kXrNGE%k8jUKO*bVy!VgS6` z_X(eV_8!|>{M`KYZV~aBvu7R4gYB*C>*``(SC{L0B@P4v0Rn*lBO@bpc6I^~kH?8b zB7{PJ0wG36N7?=JPk?1-Zo$h}=e{GY-zk5|vhbBG2giX}EG80(1b{<+E!tBQ+|+yk zfL-Um0N{^bGE}a~lGg8#Tktw|&&OB}EXt6n1}A z=g#hg(P&hyUAvacmoGa(ot>RTA`#;8IH8dB8bYBEVC{qpEiZF&=)#8 zV5tjsJphgi0L{(KkNr7Lr_&4$4l;i{JS;-8MqN@10pQ4k+hXab-GP0=RZ7v_ z-L1O2yH(-XYOZgSzp2*kJJqr3b?R94x}tTSpb-B8c6L4G$G}o$00000Nks-uM6N<$ Ef>5z?3jhEB diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/generic_materials_battery.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/generic_materials_battery.png new file mode 100644 index 0000000000000000000000000000000000000000..9bb5167f1b9442f2317a5b83b85d65b26f71a998 GIT binary patch literal 1713 zcmV;i22S~jP)EX>4Tx04R}tkv&MmKpe$i(@IsUf_4yb$WR5rf~bh2RIvyaN?V~-2a`*`ph-iL z;^HW{799LotU9+0Yt2!bCV?t+t|ixgR!iO&OqZeZmGxb<mDAy-i3Kq`*VMe9wlosz#|gRG2O6;H;898 zEuHf|agY@xh4`F!+@K2*KXP4m`HgelVS#4`jZ|WuI7lq!TUc&kRxniJY2uKgYLqXe zT~;`6aaKze*0?8sVIZrmB)Lv=7*Q-ChB!pXsGx`vEQD#*NHLM1{YV@CkmHY&OD0zl zj2sInLxtq{!T;cQw`Oi?(oG6PfQ}d2{ulxLyFk5a+uz5wT|WW5&%l+|^p|VE>?i5f zrWQH^`nG|K>!v2}0hc?#;FB&Hk|TL(3b`Ecen#Jv0S0b??lrf!#y(CTfE0DLd;=UD z0;74#UT^d6&eq=kJ=5s#2W^XTr4ku}r~m*2=Sf6CR9J=WmS1R7R~*Mb=iIbuI_$R2 z`66mYZEA&9*0jYrlx)?vPVy4=P{E0F!f5(d*h8Jn$ryAGTQde#`{2+AmodsH?w>*( zOr?JYEn;bkTV%LSrrBmSG0DC6?BVualjb(HFxZPC<1}dw4KAs_WOUm#s5b0ZLf{viDMWJRUTU2O$KNm6Zr7(WFEQ0aAiZtQ5LopzAs+ zm$T++S~>3J1;~mj0IF-A!!Qho+~e_ZYkq#kMQzm8)e#Pd6~OTDu&Wd9uV4{+?jaQw z6$n6+l3Vlh96o&55?5XQ*h13jG~sYqxruNUU}V!Mz~ik#2!WK+)y~@5+7-!DsZ`nL z(rr+gR$*oSNj(zad8BnU*{>8|B0wpHsq5r(CVAa-GB4aZP@KKj>n*w5;@se*Wmi6c z&@`kb@I76N5LTCyqU>%eBF$#AWn&BB`U<3`A*H~`XOYqhS&qJtc)9VRp)=gNoucif zU218Z`!>`hQVORC0sM7!+(;(Nk{vm6+!^cZ>!rVc0Dxe7tMj`k!pX-~fLQEwxrM*j zvuBShsf}|l?&M-7!^VBDJ467-kM}b(H%nuE1CwJD%*@R)GdEi@e^~+bH@|EOcmuSx zwE-|bK2AqRM^W7H_T7Bl+~8z4IX2-u3%0j9goVPEiYO5fjYd^xB_t9F0)YU2zn^$K z&gq^VK#=#(e*-}G+ei8Pg=V(Z`vI67nxU9@|>{-2C-!5%HO`XC2Ff?XB$V>SAA4m+N{Z4g>-L0)YS{BO`Qn zb^;KO$B9HDghGD;Ax1|>+5PiRfMsWH!OK_Yz9X&QDao?%l`IFxfmkdi5{U$WLw+sV zQxx3Pd;ox5=f42pk6$uWuE~cEP92P2 z`B4;hRp-v`gwbeJtzEm8%a<=ZL7knQL?RL5@i?K7^%_E<5Mb?u3oS2ma_GaNBnrD> zDwX2sE3YwX-V^XRCn6WvwUA6EX=`h9M1-$iAiRX|_nK$v+y5qer>(3nW->gp_f0pQ4k+hXab-GP0= zRZ7v_-L1O2yH(-XYOZgSzp2*kJJqr3b?R94x}tTSpb-B8c6L4G$G}o$00000NkvXX Hu0mjfevK^o literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/generic_materials_cabel.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/generic_materials_cabel.png index d8ed8c46e1de07459ee7492ce3284f9db89ee869..b8ca57a58878f29e06f6f806814bdc384d468457 100644 GIT binary patch delta 1654 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 FV1mX;`1k+- diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/gren-icon.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/gren-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..eb50615f238edb87365f0fc66e71cc7d1d1256ce GIT binary patch literal 730 zcmV<00ww*4P)Px%lu1NER9J=Wma$LUP!Ps{sj5hb!C7Fa(DPs^RjOvNV2Bl_N^Bq~QwJ7?46OVi ztQ{CwkXk7Vi2Mmi=>S;B2#W|0u_A_GBs&cD<_*o29A$^O1s(o!S?nxwWA|`?e5}v9_wdkv^F*-Ef_`T2QF(?n4eEX$%= ztzuag0JT~Tfa~jP0Q&ttQ52>A38_8M>2!#qNPbPzl>XDx6Rzu`X&OQZEXzU&A&HaZ z(~z2g5CYq_DVNLGwvDdq(my{xM+kxAIQYI#v)Pn!VHncy_X&c4#l^+HPr!9ubX~_Z zO>|wS)9FZmb#)cjb>-RNKpM)wwzh_%C{xKHqX(iW!nSQHl?txwN<}J_ic|o=_k9L~ z0YV5KA0G+Bkh!@z;H3m%7#4DkFFs#2oyy@(=@KGuDHLyr&uiV{QL|+7=}}4 z!Ng&d_TMM5u&@9ir4E9Ci;Iig?}5~vx4ev2R#xPpN#t3?GyF674e|CUNM8F3djJ3c M07*qoM6N<$f@jrQ=>Px# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/meta.json b/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/meta.json index 20027de9a6..6b6ce1c8e4 100644 --- a/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/meta.json +++ b/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/meta.json @@ -18,12 +18,21 @@ }, { "name": "generic_materials" + }, + { + "name": "generic_materials_battery" }, { "name": "musical-icon" }, { "name": "cabel-icon" + }, + { + "name": "bolo-icon" + }, + { + "name": "gren-icon" }, { "name": "generic_materials_cabel" diff --git a/Resources/Textures/_Wega/Objects/Tools/cargo_access_configurator.rsi/equipped-BELT.png b/Resources/Textures/_Wega/Objects/Tools/cargo_access_configurator.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..3b57ed39b1053411e20bfac6c637c61f3710e995 GIT binary patch literal 1566 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 n=)I6PU*{G?W zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$ z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA{F{<|gLZ=tGpCYK4fRnrNes#c~^vm#rd$Qj7C* zN?N>Ymoihv0VY@ZR-I@~JI z%|h56nwME(2QvUo7)cjW#8^2Nm6YcfWru(x0UClh<)LOkLK7)vLXtf=|?L zo`>wX%#G9RfSI+y)5S5Qg7NJw!@On#k%q+J(&TpK0tS_7+s=gQ2|i`p>&`FuRVXn1 zmYzosj|`)VTiT-VtD!9lZYpKoztanaZl6CdpH>yt#m~f{(7=F9%;B=J&;5P*{{MH? zBCfSE$LpmYroCC2C;z_cW{pIf76;STG?tsk^NQ_%3b-@I#o62NPJaILmEgDb@9+P< zsC`+s$(ij%aKN;sUXxr*eHV8vvaoh%|JNDjx9a_Gt<#%sTK3Ijm|GJXI*%p$_O;i$ z{Qm!aecQxWz5manCr?du=DjIc^knC>7}-r5M35bY=0=4ARmR)jIdYEg?{MUrw9PwE z=zdt|znsD=D$1TG|1$1$SMYpi#vi^`-pi&l`}4d*t_+8Re*XJlwp%Cn(A0m4dmdI5 zC(Sr^XBOLxUrTf1u5XFVdQ&MBb@09kd+Pyhe` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Tools/cargo_access_configurator.rsi/meta.json b/Resources/Textures/_Wega/Objects/Tools/cargo_access_configurator.rsi/meta.json new file mode 100644 index 0000000000..959c950201 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Tools/cargo_access_configurator.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Color-swap of the network configurator made by 20kdc (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/equipped-BELT.png b/Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..3b57ed39b1053411e20bfac6c637c61f3710e995 GIT binary patch literal 1566 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0ed77d8a65de182581c53db649dbd6e7e33d3c5a GIT binary patch literal 1336 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjKQRB%&n3*T*V3KUXg?B|j-uuOhbq ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~% zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?xG?W zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$ z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA{F{<|gLZ=tGpCYK4fRnrNes#c~^vm#rd$Qj7C* zN?N>Ymoihv0VY@ZR-I@~JI z%|h56nwME(2QvUo7)cjW#8^2Nm6YcfWru(x0UClh<)LOkLK7)vLXtf=|?L zo`>wX%#G9RfSEPW)5S5Qg7NLGjkzrbBF75jr}PPNx-D3+#P>yD+liNIC*&fPqAx5C z$vMCwGUdvgeH#0|IoL!i{JqOC>Fdq+>>=mR845TsFtQ*M2ZA2_eqFrrjCE*OXsCCf zNIQE4=fYKwHtQ5u&a+mGnZ4atV3s`hd6@&^_rL!={B8N)y*6@TcXH#q$e6MBf@=nv?rV0~>LIVR1 zqM)MjLOQe4^Y=_)!p0@q-ap08UP^ddSa0^=+sC|H7r&;nPg!rwQ7vfp_3iaKv8?{- zsV|QemK-*iv3}up{RS1!nA_WSe>!{nu@hJ1o=^V+{|kJn*&+Dr|995oQODPR|FVkr n=)I6PU*{G?W zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$ z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA{F{<|gLZ=tGpCYK4fRnrNes#c~^vm#rd$Qj7C* zN?N>Ymoihv0VY@ZR-I@~JI z%|h56nwME(2QvUo7)cjW#8^2Nm6YcfWru(x0UClh<)LOkLK7)vLXtf=|?L zo`>wX%#G9RfSI+y)5S5Qg7NJw!@On#k%q+J(&TpK0tS_7+s=gQ2|i`p>&`FuRVXn1 zmYzosj|`)VTiT-VtD!9lZYpKoztanaZl6CdpH>yt#m~f{(7=F9%;B=J&;5P*{{MH? zBCfSE$LpmYroCC2C;z_cW{pIf76;STG?tsk^NQ_%3b-@I#o62NPJaILmEgDb@9+P< zsC`+s$(ij%aKN;sUXxr*eHV8vvaoh%|JNDjx9a_Gt<#%sTK3Ijm|GJXI*%p$_O;i$ z{Qm!aecQxWz5manCr?du=DjIc^knC>7}-r5M35bY=0=4ARmR)jIdYEg?{MUrw9PwE z=zdt|znsD=D$1TG|1$1$SMYpi#vi^`-pi&l`}4d*t_+8Re*XJlwp%Cn(A0m4dmdI5 zC(Sr^XBOLxUrTf1u5XFVdQ&MBb@09kd+Pyhe` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/meta.json b/Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/meta.json new file mode 100644 index 0000000000..959c950201 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Tools/sci_access_configurator.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Color-swap of the network configurator made by 20kdc (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/meta.json new file mode 100644 index 0000000000..c659db594e --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Energy Shotgun inhands made by Boaz1111 based on the energy shotgun icon sprite made by Papermaker48 for SS14, (as a reference) pulse version by @texttipo", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "pulse-inhand-left", + "directions": 4 + }, + { + "name": "pulse-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/pulse-inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/pulse-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..54c24c735b9b91c450158af0ca3a8ae53ce9fef0 GIT binary patch literal 1094 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVBz(2aSW+oe0$eFTi8+J_{Tt( z?y%gC`FxYKx{{_Ubf_opt@y}VaWi`1^LaJQm74qH`WYRU`hK|N;v86<;n@2}jNK_~ z(zbJN>~{a=U6Q%!p5q%nw~CQ9T{IOe}86gv6196d)6O<=~1-hBI^;+{#S0Wp#-u2wJ{*n1BIlhDC!m%k0Y5(fJ*>7FB z#s8{&tVD>O0I~=$g*Cy#Uh(uxSkBLzcPRBy92g$9}IrKUAWZAAe`Y)lvVw~ zxBsnnpV%gH`zrs}^i3Rf@;zt&NZpKKQs#|z+Mmt9_Yryv>zf-bv9eLY!pS>L@KGP(e zL2kjieycaxPqcp?{wKZt_Wy?^CLN`V8In%U+YmdyM%Q%rzb9*d|9k6wB{W2{L0C=e zT7Tw~-(M%M-qMn%vp#71@AZ-U!lbXquI`z(tC+<;-r>5{Bo$4YlXIA!J=Z)HR=;-f z=DXcihwZ&SsI6y_Q~j`M-|<_aetiswEnS(Qp zChn>EcxM7jDvSTW$epL_7tUt8`2PD!mWk<#n&rI9uD_nhGI5fEXTJH0Z@uhugjsx8 zeyUY((Bw2ZaNK|1Bo@X=4(mQm-F*Jp^cu5e2Ti53x1GHBZQAv1wSAkja(AAxvi^~= z?0s8YtamKy6Gc-C-XQ6z3hRqET|Z}dc_TaKtQ{ML1 zf2~(LTwk6ge*gZ@N}2WXj6aX1Z=PAJT_W(at}-@8A%lrWJ=l8E+3dHEl#|Y{U~&{b zFn1$gnOk7!RE+vx9G-)dO00d33qts zM>KQ%5?!DWwKip2pYCw1Kn4hlbb@Z9q9j)IG9qRI%OiKa{5p&970(oIN({ZPu2(Q|Fk6Gd6B^SiL;! zWqGb+Cv<|G3&GETr@%!(I z6JNFlJlAef4t(_`ZTs!5<)>eX6nkxCvu4*2TGIFL;JFj;WmdKI;Vst04DU%2mk;8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/wielded-inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0feb7a3dfe1a5bc0bffb66cea89abf115a9774d9 GIT binary patch literal 1263 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVAn;Dom z6dI^N>{Yz*JZ)C`x&2Gn*nTaIT6?PMQFM6n?wRTvzp>a4HiDaH|KcakVg>mQU=4W$CUtCtN5#nK6dXGUjz3TO+*+KaX#qpb8ewB`& z@j8z;hIK9vYiMrx$sMATP8|3Cba;31qn)1?hS=Bpd-b0xJGZLp(vvvNw6}$Jd#{Oe zu$*y9H`EkyR$tAB2?*CWY{ozrS!`=z|9&)an!c}z2K1;sc&Hd^0r%RR3iq4v~Q92>1 zCSuact@AP(3SP`fkr(UTd;PWTrAMzBZf*YAXyEu?zxicy1$`JB;wzbRkGVQJ>)Eq_ zI!T2(rua{ENWNcP%M%$`Eq(Rb$Ka4vv0kgIcCY=mEk9eT|M*+i{CmE;H@-OfXfp4# z(@!_~`1zf>c5T|<(AwEww>`gl;^5oIiC@jmPd%IFd-i|o-hI!O+%o*PcEaTHb$j;a zzc_l-RdcGBk&%(o%aSOa)0^JkzVr8T-mJX)T6Oyu@vSaTOg#9nb6u$Up8M~&|9{21 zA$~<)%)=u>z8-HoI3_*rFK@5e^I`}Ovb zEa(4Hqtb&xOV2L)GJl@H{{!}~byNNs*n9u|GB=s`%e%*Ob83!1QCn@s%hcF#N#m)L zqu)>Wr9o9icRX}%R=&`^E*#_MOyKjN!PAXQ5zg#YOlVB^B@amdKI;Vst0K>pF-2eap literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/wielded-inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..51d417b3dbee5878ce702b28c5f1def00511e6b5 GIT binary patch literal 1295 zcmb`H`!gE`0LP=ux%RxOoqASGO(cs$%cX*_)ZH4ng_rA2&Y^008s@1CXJI zpZnkRbPqY?75x?f&=CeAeb5hSWX{OV0QEDFPoN=z)OF5s;1)n?Z*d ziqo!;sBN~guy4jQ5`&6tZaeLo7TLNO)4rV%*0Vf%;#|FTnxZ$ZFHk0g z{_sdaHuaRgPgB6Al`yG@*K7Na5dxs4a|C$es?(0rV|lB4HnaMeot>aG4qjeV=kXdd zmeGzOjOsF1m!F)&DI7_UDQtJ=#&OVw1L$-!eQ|X^E|tITVb4P#zUJp}9N%X%Vx^b4 zT=WEP*e5Bhs_&yu=piQ*j_<>&kie|?2}%Dw567eESZeWF0$8e3d8^^55J6L!EpSfP7w_yB$X@hon>71pi52Btcr-fI1(;7~%Ul?o&?(PHc>Q_w} zw5dqZHR`R(Y^^R_0lgHuKaXWo*)z=x2i*6nu_H!#0!D^E<8DPNHjC7iSL zvTf?Vk*7 zapt<4m(Ld>h`a7yUdhDm9O#b`wEh|6BaGy!X+ z$z0(~)Yu)Sq2JF{TXC5r&4-2z(E+kGD)Ns#i#Fyfrj5o_J5`zWI-QXgzW^S;T|xF@a(eVXGN=T51RvYex;d86~Jbav70{ezwLK8XA&q#BOhezs$MXv+u** z`YLZnBE!cuqQL2*VpT2#B66h?lQl6?0da!%w3ZRbPx&|4BqaR9J<*m&;D$SP+K4!^Jkn1ZQ$H2st#JNF*y3gbmU}v&%fdJO|G(kHDKm zLK-0ro6Z6WWyyjCNL)06;9RgWjzy9oXBJ=+8t6{bf!f5ft@Hg=^`AP9;DcggV}p1+ zj;`y{_kAWOC&kXr4ig^*pPQSb(P&5jUDvt0yORJ@9|6C;y#+s90BAHC0PkOc zrKKe_O_Pq};CUW~VX(Ki7e0UY3Pd6ina}63Z5!YB+1uMgQ4}sOFU7kF2+FQ$ngqhk zE0qe0qR{L0a2yAChZY2e3(5{)7zX8XIef=7O%Ys+=S#djmY0{YEQ`Tl5E{<+efIbF z!_23qro_a=#P}*uDwO~z7K>PxMXgqowrxLyJB}k<*ACdDedf7bj$W?^KpdCqwukGw;#+Wd!2?4Xhu{Eya&jU7Ha0fo>FFuOVi9;W zT+sJVTT4v*1so&4C*aw`2LVsO(P)(G>uUfk%OWT{5YF~quZQcp!Zb}e{QE69e5VCB zH#Z0tQ4`!HPBbyQUq@YwHB;4tDYux(pfmc{USKAgF#s$ynlhO@J?QI>lW&nggj zU~O%U+~)va-|1c0bkt8aq8C;%X1LgCjU|N32i`~45Oy}ga9s+gt;!1?)k;0^iO8l%Ru7TC7U ze~L!6@1Cl@AqXko5hI4WT(?XRaMT<&%-&;Y&Kb3T$JO0hXQiB9Gjb)%*@QtY&L1P z+qBzlR#sN1*Xt;XA^>8s7y#XFS0t0kv3yNU!2K+5wOTTp%}Tg8SrCatg27+_!13`h z0L^Ao0wj}3lF8&x377)#JWpma8EUl}^Yine;au0HUavDdJImbMoUklQ0$g5RhM!eq z5uhlFI5;?v>2w-+%rp{-2wm6dbULiAuHt!~xVpNMnx>ITr5MLX5OAM`uIu=|FVpFC zARw6O;mgB^5WvO7#drjKEh0GA0WmD#JtEwOj^hygZGITB9}@oq-ZA;n;$6$Q00000 LNkvXXu0mjfd;SQ! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/equipped-BACKPACK.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..a3a64a1b00448d93894e8e92fb2a1482422a33c2 GIT binary patch literal 1520 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 IIVCg!04Qi^R{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f23c6c207e113eefae8f4bdf5abfc715b0b1844c GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5xIb6XFV_m6erUU0p*%L+$MB7(yl+t@@vmlH%p%m71EWsi|pVVv_Zr zq5Y=PJfKqEk|4iehW|)Fm&I`{P-20ni(^Q|oa6)vR%KoTp&$j7244}y6DxY+8M`Mi z@=bPC2#IKA;+yWv&2Vwe%UGTpYahJwVZE3q%3TpC*O?qoSDa$Z0m|u~IF$?0q19U5cr>mdKI;Vst E06sTqAOHXW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/mag-unshaded-1.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..a9a5c8ebf4761a3a57cd4c89c00605d9316ef684 GIT binary patch literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%APKcArY-_ z&oS~cFt9Kf%sdh{Nh0STOFvL<-Kkgi>=^8MHuW>zzO#Pj5}*)+r>mdKI;Vst0R90T AaR2}S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/mag-unshaded-2.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..a569dac5a3d6c24a04c77a9bd291701cd42a362d GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}x}GkMArY-_ z&oc@FRWTSE%{-d6ZG*}-fp<5A{bP0l+XkKk6j0j+p#TQrzsr` P)XU)M>gTe~DWM4f9YrK) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/mag-unshaded-4.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..7ecf80d474c9ef2a0773a119fdde66f87eceb474 GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ww^AIArY-_ zFER2mD2Olx7D*gtnr6^inv>|6^YH$YxJGGdAqIy18P0m$`r^j~lippK{8VrHmHy`I c%oQ)0j;-ZNfA}nI63`$9Pgg&ebxsLQ0Lp?XoB#j- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/meta.json new file mode 100644 index 0000000000..eb2582fd36 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by @mirton and edited by @sentryprimis, edited by DeimonFly", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/wielded-inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bdae236751ede6b0a1aaa119f79197b6c6aeff82 GIT binary patch literal 1634 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 To=H{%4P)?h^>bP0l+XkK7=$6* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/mag-unshaded-2.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..cf23dc0a94073d9ccb061097df8ddeea845e852a GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzFHaZ8kO64Tl8W{o literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/mag-unshaded-4.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..9a042fcd2ffdb750e3b6dbcdc3903a5ea0b8177e GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzFHaZ8kOHS&C4h;;A3KyQ=+8&fT