From bb43ab9d929c6c783d41f6ad3c1d033b4eae989e Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Fri, 5 Sep 2025 00:27:17 +0100 Subject: [PATCH] =?UTF-8?q?=D0=AF=D0=B4=D1=80=D1=91=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=82=D0=B8=D0=B2=D0=BD=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8:=20=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B2=20=D1=86=D0=B5=D0=BD=D0=B5=20=D0=B2=20=D0=B0?= =?UTF-8?q?=D0=BF=D0=BB=D0=B8=D0=BD=D0=BA=D0=B5=20(#3067)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weapons/guns/launchers/launchers.ftl | 4 +- .../catalog/fills/backpacks/duffelbag.ftl | 2 + .../catalog/fills/boxes/syndicate.ftl | 10 +- .../clothing/outerclothing/hardsuits.ftl | 4 +- .../guns/ammunition/magazines/rifle.ftl | 8 +- .../objects/weapons/guns/biocode/biocode.ftl | 5 +- .../weapons/guns/launchers/launchers.ftl | 4 +- .../weapons/guns/ammunition/boxes/rifle.ftl | 8 +- .../guns/ammunition/cartridges/rifle.ftl | 18 +- .../guns/ammunition/cartridges/srifle.ftl | 10 +- .../guns/ammunition/magazines/rifle.ftl | 10 +- .../_sunrise/store/uplink-catalog.ftl | 28 +-- .../ru-RU/_strings/store/uplink-catalog.ftl | 18 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 16 +- .../Prototypes/Catalog/uplink_catalog.yml | 74 ++----- .../Entities/Clothing/Belt/belts.yml | 1 + .../Weapons/Guns/Shotguns/shotguns.yml | 4 + .../Catalog/Fills/Backpacks/duffelbag.yml | 23 ++ .../Catalog/Fills/Boxes/nanotrasen.yml | 2 + .../Catalog/Fills/Boxes/syndicate.yml | 170 ++++++++++----- .../_Sunrise/Catalog/uplink_catalog.yml | 202 ++++++++++++++---- .../Weapons/Guns/Launchers/launchers.yml | 4 +- .../Objects/Storage/boxes.rsi/meta.json | 27 --- .../light_rifle_speed_loader.rsi/icon.png | Bin 0 -> 579 bytes .../light_rifle_speed_loader.rsi/meta.json | 3 + .../Objects/Storage/boxes_sunrise.rsi/box.png | Bin 0 -> 382 bytes .../Storage/boxes_sunrise.rsi/box_hug.png | Bin 0 -> 412 bytes .../Storage/boxes_sunrise.rsi/box_of_doom.png | Bin 0 -> 369 bytes .../boxes_sunrise.rsi/box_of_doom_big.png | Bin 0 -> 392 bytes .../Storage/boxes_sunrise.rsi/box_science.png | Bin 0 -> 3028 bytes .../boxes_sunrise.rsi/box_security.png | Bin 0 -> 409 bytes .../Storage/boxes_sunrise.rsi/boxwide.png | Bin 0 -> 413 bytes .../Storage/boxes_sunrise.rsi/boxwidetoy.png | Bin 0 -> 425 bytes .../Storage/boxes_sunrise.rsi/dl6902.png | Bin 0 -> 216 bytes .../Storage/boxes_sunrise.rsi/dragunov.png | Bin 0 -> 222 bytes .../boxes_sunrise.rsi/hug-inhand-left.png | Bin 0 -> 305 bytes .../boxes_sunrise.rsi/hug-inhand-right.png | Bin 0 -> 300 bytes .../Storage/boxes_sunrise.rsi/incendiary.png | Bin 0 -> 176 bytes .../Storage/boxes_sunrise.rsi/inhand-left.png | Bin 0 -> 197 bytes .../boxes_sunrise.rsi/inhand-right.png | Bin 0 -> 213 bytes .../Storage/boxes_sunrise.rsi/internals.png | Bin 0 -> 420 bytes .../Storage/boxes_sunrise.rsi}/l6_base.png | Bin .../Storage/boxes_sunrise.rsi}/l6_red.png | Bin .../Storage/boxes_sunrise.rsi}/l6_uranium.png | Bin .../Storage/boxes_sunrise.rsi/magazine.png | Bin 0 -> 197 bytes .../Storage/boxes_sunrise.rsi/meta.json | 108 ++++++++++ .../boxes_sunrise.rsi/shotgun_base.png | Bin 0 -> 186 bytes .../boxes_sunrise.rsi}/shotgun_red.png | Bin .../boxes_sunrise.rsi}/shotgun_uranium.png | Bin .../Storage/boxes_sunrise.rsi/shrapnel.png | Bin 0 -> 172 bytes .../Storage/boxes_sunrise.rsi}/smg_base.png | Bin .../Storage/boxes_sunrise.rsi}/smg_red.png | Bin .../boxes_sunrise.rsi}/smg_uranium.png | Bin .../Storage/boxes_sunrise.rsi/stinger.png | Bin 0 -> 175 bytes .../Storage/boxes_sunrise.rsi}/wide_ert.png | Bin .../Storage/boxes_sunrise.rsi/writing.png | Bin 0 -> 149 bytes .../boxes_sunrise.rsi/writing_of_doom.png | Bin 0 -> 149 bytes Tools/_sunrise/Schemas/ignore_list.yml | 2 +- 58 files changed, 529 insertions(+), 236 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/box.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/box_hug.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/box_of_doom.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/box_of_doom_big.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/box_science.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/box_security.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/boxwide.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/boxwidetoy.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/dl6902.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/dragunov.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/hug-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/hug-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/incendiary.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/internals.png rename Resources/Textures/{Objects/Storage/boxes.rsi => _Sunrise/Objects/Storage/boxes_sunrise.rsi}/l6_base.png (100%) rename Resources/Textures/{Objects/Storage/boxes.rsi => _Sunrise/Objects/Storage/boxes_sunrise.rsi}/l6_red.png (100%) rename Resources/Textures/{Objects/Storage/boxes.rsi => _Sunrise/Objects/Storage/boxes_sunrise.rsi}/l6_uranium.png (100%) create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/magazine.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/shotgun_base.png rename Resources/Textures/{Objects/Storage/boxes.rsi => _Sunrise/Objects/Storage/boxes_sunrise.rsi}/shotgun_red.png (100%) rename Resources/Textures/{Objects/Storage/boxes.rsi => _Sunrise/Objects/Storage/boxes_sunrise.rsi}/shotgun_uranium.png (100%) create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/shrapnel.png rename Resources/Textures/{Objects/Storage/boxes.rsi => _Sunrise/Objects/Storage/boxes_sunrise.rsi}/smg_base.png (100%) rename Resources/Textures/{Objects/Storage/boxes.rsi => _Sunrise/Objects/Storage/boxes_sunrise.rsi}/smg_red.png (100%) rename Resources/Textures/{Objects/Storage/boxes.rsi => _Sunrise/Objects/Storage/boxes_sunrise.rsi}/smg_uranium.png (100%) create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/stinger.png rename Resources/Textures/{Objects/Storage/boxes.rsi => _Sunrise/Objects/Storage/boxes_sunrise.rsi}/wide_ert.png (100%) create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/writing.png create mode 100644 Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/writing_of_doom.png diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/launchers.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/launchers.ftl index f71666fb62..1fb96ac8d5 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/launchers.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/launchers.ftl @@ -1,8 +1,8 @@ ent-WeaponLauncherRL5 = RL-5 .desc = { ent-BaseWeaponLauncher.desc } -ent-WeaponGrenadeLauncherGL70 = GL-79 +ent-WeaponGrenadeLauncherGL70 = GL-70 .desc = { ent-BaseWeaponLauncher.desc } -ent-WeaponGrenadeLauncherGL70Flash = GL-79 +ent-WeaponGrenadeLauncherGL70Flash = GL-70 .suffix = GrenadeFlash .desc = { ent-WeaponGrenadeLauncherGL70.desc } ent-WeaponGrenadeLauncherSecurity = security grenade launcher diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/backpacks/duffelbag.ftl index 7637f9bf31..a30d2383ec 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/backpacks/duffelbag.ftl @@ -51,3 +51,5 @@ ent-ClothingBackpackDuffelWeaponSubMachineGunWt550Filled = Набор WT550 .desc = WT550 c 3мя магазинами. ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Набор MG-342 .desc = MG-342 c 2мя магазинами. +ent-ClothingBackpackDuffelSyndicateSuperAmmoFilled = Набор "Оружейная лавка" + .desc = Большой боекомплект для всего отряда! В набор входят: коробка магазинов для C-20r, коробка барабанов для «Бульдога», коробка магазинов для L6 SAW и россыпные патроны, коробка магазинов для DL6902 и дополнительная россыпь патронов, коробка магазинов для «Эстока», коробка магазинов для «Драгунова», а также коробка безгильзовых патронов. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/syndicate.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/syndicate.ftl index 19218a8164..d9e69a8b2a 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/syndicate.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/syndicate.ftl @@ -6,8 +6,8 @@ ent-CaselessAmmoKit = Коробка с магазинами для Siar-52 .desc = Содержит 3 расширенных магазина и 3 базовых магазина для Siar-52 ent-ShotGunKit = Коробка с магазинами для Бульдога .desc = Перезаряжаю! Содержит 5 магазинов дроби и 3 магазина пуля для Bulldog -ent-LMGKit = Коробка с коробами для пулемёта - .desc = Перезаряжаю! Содержит 4 магазина для L6 Saw или DL6902 +ent-LMGKit = Коробка с коробами для L6 SAW + .desc = Перезаряжаю! Содержит 3 магазина для L6 Saw ent-CyberEyeThermalBox = Коробка с кибер-глазом "Термо" .desc = Небольшая коробка, безопасно содержащая пару кибер-глаз. Упаковка распадается при открытии, не оставляя следов. ent-CyberEyeNightVisionBox = Коробка с кибер-глазом "Ночное зрение" @@ -30,3 +30,9 @@ ent-LMGUraniumAmmoKit = комплект урановых патронов дл .desc = { ent-BoxCardboard.desc } ent-CaneShotgunBox = коробка дротиков .desc = { ent-BoxDarts.desc } +ent-MMGKit = Коробка с коробами для DL6902 + .desc = Перезаряжаю! Содержит 2 магазина для DL6902 +ent-DragunovAmmoKit = Коробка с магазинами для Драгунова + .desc = Перезаряжаю! Содержит 5 магазинов для Драгунова и коробку FMJ патронов к ним +ent-RifleAmmoKit = Коробка с магазинами для Эсток + .desc = Перезаряжаю! Содержит 6 магазинов, 3 SP, 2 FMJ и 1 AP diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl index 45efb04075..5cb73b4914 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl @@ -36,5 +36,5 @@ ent-ClothingOuterHardsuitPirateCapSun = капитанский пиратски .suffix = Pirate, Sunrise ent-ClothingOuterHardsuitChameleon = синдикатовский хамелеон .desc = Глядя на его материалы, в голове невольно всплывают образы из области научной фантастики. -ent-ClothingOuterHardsuitInfiltration = бронекостюм Синдиката: Проникновение - .desc = Бронекостюм, предпочитаемый Специальными Операциями Синдиката. Он, помимо прочности, был разработан с учетом скрытности. \ No newline at end of file +ent-ClothingOuterHardsuitInfiltration = скафандр инфильтратора + .desc = Усиленный скафандр Синдиката, созданный для скрытных операций. Совмещает защиту и активную маскировку. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl index afdf2984b7..53b27999c9 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl @@ -7,11 +7,11 @@ ent-MagazineAR18 = магазин (7,62мм NT) ent-MagazineAR18Extended = расширенный магазин AR18 .desc = { ent-MagazineAR18.desc } ent-MagazineFamas = магазин автомата автомата фамаз - .desc = Использует патроны калибра .20 винтовочные. + .desc = Использует патроны калибра 5,56мм. ent-MagazineG36 = магазин автомата G-36 - .desc = Использует патроны калибра .20 винтовочные. + .desc = Использует патроны калибра 5,56мм. ent-MagazineM16A4 = магазин M16A4 - .desc = Использует патроны калибра .20 винтовочные. + .desc = Использует патроны калибра 5,56мм. ent-MagazineFamasExtended = расширенный магазин Famas .desc = { ent-MagazineFamas.desc } ent-MagazineG36Extended = расширенный магазин G36 @@ -19,6 +19,6 @@ ent-MagazineG36Extended = расширенный магазин G36 ent-MagazineM16A4Extended = расширенный магазин M16A4 .desc = { ent-MagazineM16A4.desc } ent-MagazineM28 = магазин автомата M28 - .desc = Использует патроны калибра .20 винтовочные. + .desc = Использует патроны калибра 5,56мм. ent-MagazineM28Extended = расширенный магазин M28 .desc = { ent-MagazineM28.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl index d2d958bf75..42a54f90a4 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl @@ -63,4 +63,7 @@ ent-WeaponGrenadeLauncherGL70Biocode = { ent-WeaponGrenadeLauncherGL70 } .suffix = БИОКОД ent-WeaponShotgunMinotaurBiocode = { ent-WeaponShotgunMinotaur } .suffix = БИОКОД - .desc = { ent-WeaponShotgunMinotaur.desc } \ No newline at end of file + .desc = { ent-WeaponShotgunMinotaur.desc } +ent-WeaponMiniEnergyCrossbowBiocode = { ent-WeaponMiniEnergyCrossbow } + .suffix = БИОКОД + .desc = { ent-WeaponMiniEnergyCrossbow.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/launchers.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/launchers.ftl index 6a7da95261..ef30a48293 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/launchers.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/launchers.ftl @@ -1,8 +1,8 @@ ent-WeaponLauncherRL5 = RL-5 .desc = { ent-BaseWeaponLauncher.desc } -ent-WeaponGrenadeLauncherGL70 = GL-79 +ent-WeaponGrenadeLauncherGL70 = GL-70 .desc = GL-70 - это стандартный гранатомёт, используемый армией Земли для зачистки территорий и проведения крупных взрывов. -ent-WeaponGrenadeLauncherGL70Flash = GL-79 +ent-WeaponGrenadeLauncherGL70Flash = GL-70 .suffix = Флешка .desc = { ent-WeaponGrenadeLauncherGL70.desc } ent-WeaponGrenadeLauncherSecurity = гранатомёт безопасности diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl index 4e893834e1..a293216cec 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl @@ -2,13 +2,13 @@ ent-BaseMagazineBoxRifle = { ent-BaseItem } .desc = { ent-BaseItem.desc } ent-MagazineBoxRifleBig = ящик патронов (5,56мм) .desc = { ent-BaseMagazineBoxRifle.desc } -ent-MagazineBoxRifleSP = ammunition box (.20 rifle SP) +ent-MagazineBoxRifleSP = ammunition box (5,56мм SP) .desc = { ent-BaseMagazineBoxRifle.desc } -ent-MagazineBoxRifleHP = ammunition box (.20 rifle HP) +ent-MagazineBoxRifleHP = ammunition box (5,56мм HP) .desc = { ent-BaseMagazineBoxRifle.desc } -ent-MagazineBoxRifleFMJ = ammunition box (.20 rifle FMJ) +ent-MagazineBoxRifleFMJ = ammunition box (5,56мм FMJ) .desc = { ent-BaseMagazineBoxRifle.desc } -ent-MagazineBoxRifleAP = ammunition box (.20 rifle AP) +ent-MagazineBoxRifleAP = ammunition box (5,56мм AP) .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRiflePractice = коробка патронов (5,56мм учебные) .desc = { ent-BaseMagazineBoxRifle.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl index a29bdcc5dc..d34769b8ce 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl @@ -1,18 +1,18 @@ -ent-BaseCartridgeRifle = патрон (.20 винтовочный) +ent-BaseCartridgeRifle = патрон (5,56мм) .desc = { ent-BaseCartridge.desc } -ent-CartridgeRifleSP = cartridge (.20 rifle SP) +ent-CartridgeRifleSP = cartridge (5,56мм SP) .desc = { ent-BaseCartridgeRifle.desc } -ent-CartridgeRifleHP = cartridge (.20 rifle HP) +ent-CartridgeRifleHP = cartridge (5,56мм HP) .desc = { ent-BaseCartridgeRifle.desc } -ent-CartridgeRifleFMJ = cartridge (.20 rifle FMJ) +ent-CartridgeRifleFMJ = cartridge (5,56мм FMJ) .desc = { ent-BaseCartridgeRifle.desc } -ent-CartridgeRifleAP = cartridge (.20 rifle AP) +ent-CartridgeRifleAP = cartridge (5,56мм AP) .desc = { ent-BaseCartridgeRifle.desc } -ent-CartridgeRiflePractice = патрон (.20 винтовочный учебный) +ent-CartridgeRiflePractice = патрон (5,56мм учебный) .desc = { ent-BaseCartridgeRifle.desc } -ent-CartridgeRifleIncendiary = патрон (.20 винтовочный зажигательный) +ent-CartridgeRifleIncendiary = патрон (5,56мм зажигательный) .desc = { ent-BaseCartridgeRifle.desc } -ent-CartridgeRifleUranium = патрон (.20 винтовочный урановый) +ent-CartridgeRifleUranium = патрон (5,56мм урановый) .desc = { ent-BaseCartridgeRifle.desc } -ent-CartridgeRifle = патрон (.20 винтовочный) +ent-CartridgeRifle = патрон (5,56мм) .desc = { ent-BaseCartridgeRifle.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/srifle.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/srifle.ftl index 808d4f88b6..8822757981 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/srifle.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/srifle.ftl @@ -1,15 +1,15 @@ -ent-CartridgeSRifleBase = патрон (.20 винтовочный) +ent-CartridgeSRifleBase = патрон (5,56мм) .desc = { ent-BaseCartridge.desc } .suffix = { "" } -ent-CartridgeSRifle = патрон (.20 винтовочный) +ent-CartridgeSRifle = патрон (5,56мм) .desc = { ent-CartridgeSRifleBase.desc } .suffix = { "" } -ent-CartridgeSRifleFlash = патрон (.20 винтовочный светошумовой) +ent-CartridgeSRifleFlash = патрон (5,56мм светошумовой) .desc = { ent-CartridgeSRifleBase.desc } .suffix = { "" } -ent-CartridgeSRifleHV = патрон (.20 винтовочный высокоскоростной) +ent-CartridgeSRifleHV = патрон (5,56мм высокоскоростной) .desc = { ent-CartridgeSRifleBase.desc } .suffix = { "" } -ent-CartridgeSRiflePractice = патрон (.20 винтовочный учебный) +ent-CartridgeSRiflePractice = патрон (5,56мм учебный) .desc = { ent-CartridgeSRifleBase.desc } .suffix = { "" } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl index d9b1ccc331..ec4a59a687 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl @@ -5,13 +5,13 @@ ent-MagazineRifleEmpty = магазин (5,56мм любые) .desc = { ent-MagazineRifle.desc } ent-MagazineRifle = магазин (5,56мм) .desc = { ent-BaseMagazineRifle.desc } -ent-MagazineRifleSP = магазин (.20 винтовочный SP) +ent-MagazineRifleSP = магазин (5,56мм SP) .desc = { ent-BaseMagazineRifle.desc } -ent-MagazineRifleHP = магазин (.20 винтовочный HP) +ent-MagazineRifleHP = магазин (5,56мм HP) .desc = { ent-BaseMagazineRifle.desc } -ent-MagazineRifleFMJ = магазин (.20 винтовочный FMJ) +ent-MagazineRifleFMJ = магазин (5,56мм FMJ) .desc = { ent-BaseMagazineRifle.desc } -ent-MagazineRifleAP = магазин (.20 винтовочный AP) +ent-MagazineRifleAP = магазин (5,56мм AP) .desc = { ent-BaseMagazineRifle.desc } ent-MagazineRifleIncendiary = магазин (5,56мм зажигательные) .desc = { ent-MagazineRifle.desc } @@ -19,7 +19,7 @@ ent-MagazineRiflePractice = магазин (5,56мм учебные) .desc = { ent-BaseMagazineRifle.desc } ent-MagazineRifleUranium = магазин (5,56мм урановые) .desc = { ent-BaseMagazineRifle.desc } -ent-MagazineLightRifleBoxSP = короб магазина L6 SAW (.20 винтовочный SP) +ent-MagazineLightRifleBoxSP = короб магазина L6 SAW (5,56мм SP) .desc = Коробка, содержащая ленту из 150 патронов калибра .20, используемая легкими пулеметами, такими как L6. Предназначена для хранения кинетических боеприпасов общего назначения. ent-MagazineLightRifleBoxIncendiary = короб патронов L6 SAW (5,56мм зажигательные) .desc = { ent-BaseMagazineLightRifle.desc } diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl index ffe61c946f..0a3f68c3b5 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl @@ -10,17 +10,17 @@ uplink-magazine-shotgun-desc = Барабан на 8 выстрелов для uplink-magazine-lmg-name = Коробка патронов (.30 винтовочные) uplink-magazine-lmg-desc = Коробка патронов на 100 выстрелов. Совместим с "L6-SAW". uplink-grenade-frag-timer-name = безконтактная Осколочная граната -uplink-grenade-frag-timer-desc = Осколочная граната. Совместима с "China-Lake" и "GL-79". Взрывается через 2 секунды после выстрела. +uplink-grenade-frag-timer-desc = Осколочная граната. Совместима с "China-Lake" и "GL-70". Взрывается через 2 секунды после выстрела. uplink-grenade-blast-timer-name = безконтактная Фугасная граната -uplink-grenade-blast-timer-desc = Фугасная граната. Совместима с "China-Lake" и "GL-79". Взрывается через 2 секунды после выстрела. +uplink-grenade-blast-timer-desc = Фугасная граната. Совместима с "China-Lake" и "GL-70". Взрывается через 2 секунды после выстрела. uplink-grenade-emp-timer-name = безконтактная ЭМИ граната -uplink-grenade-emp-timer-desc = ЭМИ граната. Совместима с "China-Lake" и "GL-79". Взрывается через 2 секунды после выстрела. +uplink-grenade-emp-timer-desc = ЭМИ граната. Совместима с "China-Lake" и "GL-70". Взрывается через 2 секунды после выстрела. uplink-grenade-frag-contact-name = контактная Осколочная граната -uplink-grenade-frag-contact-desc = Осколочная граната. Совместима с "China-Lake" и "GL-79". Взрывается при контакте с целью. +uplink-grenade-frag-contact-desc = Осколочная граната. Совместима с "China-Lake" и "GL-70". Взрывается при контакте с целью. uplink-grenade-blast-contact-name = контактная Фугасная граната -uplink-grenade-blast-contact-desc = Фугасная граната. Совместима с "China-Lake" и "GL-79". Взрывается при контакте с целью. +uplink-grenade-blast-contact-desc = Фугасная граната. Совместима с "China-Lake" и "GL-70". Взрывается при контакте с целью. uplink-grenade-emp-contact-name = контактная ЭМИ граната -uplink-grenade-emp-contact-desc = ЭМИ граната. Совместима с "China-Lake" и "GL-79". Взрывается при контакте с целью. +uplink-grenade-emp-contact-desc = ЭМИ граната. Совместима с "China-Lake" и "GL-70". Взрывается при контакте с целью. uplink-magazine-siar52-name = Магазин ПП (.25 безгильзовый) uplink-magazine-siar52-desc = Магазин ПП на 30 патронов. Совместим с SIAR-52. uplink-magazine-bauer127-extended-name = расширенный магазин Bauer127 (.60 антиматериальные) @@ -54,13 +54,18 @@ uplink-hardsuit-syndie-commander-name = скафандр Командира Си uplink-hardsuit-syndie-commander-desc = Скафандр предназначеный для командиров отрядов Горлекса. uplink-hardsuit-syndie-medic-name = скафандр Медика Синдиката uplink-hardsuit-syndie-medic-desc = Скафандр предназначеный для боевых врачей отрядов Горлекса. +uplink-hardsuit-infiltration-name = скафандр Инфильтратора Синдиката +uplink-hardsuit-infiltration-desc = Набор с новейшими технологиями Синдиката! Стандартный кроваво-красный скафандр со встроенными новейшими разработками по активной маскировки! uplink-energy-dome-personal-name = Поясной Энергетический барьер uplink-energy-dome-personal-desc = Генератор малого щита, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи. uplink-energy-dome-backpack-name = Наспинный Энергетический барьер uplink-energy-dome-backpack-desc = Генератор большого барьера, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи. uplink-armoured-jumpsuit-name = бронированный черный адвокатский костюм uplink-armoured-jumpsuit-desc = Казалось бы, простой деловой костюм... пока не отлетела пуля... - +uplink-clothing-thieving-gloves-name = Воровские перчатки +uplink-clothing-thieving-gloves-desc = Незаметно обчищайте карманы и повышайте свой навык воровства с помощью этих новых модных перчаток, которые выглядят как обычные! +uplink-clothing-chameleon-thieving-gloves-name = Воровские перчатки "Хамелеон" +uplink-clothing-chameleon-thieving-gloves-desc = Незаметно обчищайте карманы и повышайте свой навык воровства с помощью этих новых модных перчаток, которые могут менять свой облик! Учтите что волокна остануться уникальные для этих перчаток. ## Weapon uplink-syndicate-rapier-name = Рапира Синдиката @@ -79,13 +84,8 @@ uplink-weapon-dragunov-name = Набор Драгунов uplink-weapon-dragunov-desc = Культовая снайперская винтовка и два магазина на 10 патронов, известная своей меткостью и стрельбой на дальние дистанции. Использует винтовочные патроны калибра 7.62x54R. uplink-deagle-name = пистолет «Desert Eagle» uplink-deagle-desc = Cерьёзный аргумент в споре. Выгравировано: Мир благодаря превосходящей огневой мощи". -uplink-mini-energy-crossbow-name = Малый энергетический арбалет -uplink-mini-energy-crossbow-desc = Выстреливает кинетическими болтами с низким уроном на короткой дистанции. -uplink-gloves-knuckleduster-name = Синдикатовский кастет -uplink-gloves-knuckleduster-desc = Пара пластитановых кастетов, которые позволяют наносить удары достаточно сильно, чтобы разбить челюсть капитана вдребезги. -uplink-estoc-bundle-name = Эсток Марксманская винтовка -uplink-estoc-bundle-desc = Специальная стрелковая винтовка, оснащенная оптическим прицелом средней дальности для боя на дальних дистанциях. В комплекте с двумя магазинами для винтовки(5,56) - +uplink-mini-energy-crossbow-name = Мини энерго-арбалет +uplink-mini-energy-crossbow-desc = Компактное оружие скрытного действия. Выпускает маломощные кинетические болты, вызывающие паралич и малое отравление. Эффективен на близком расстоянии. ## Cyborgs diff --git a/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl index 6d7edcaddd..9e69798a8d 100644 --- a/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl @@ -19,6 +19,10 @@ uplink-fire-axe-flaming-name = Пылающий топор uplink-fire-axe-flaming-desc = Классическое оружие, оснащённое передовой атмос-технологией, позволяющей ему поджигать цели. Теперь с прочной прорезиненной рукояткой! uplink-gloves-north-star-name = Перчатки Полярной звезды uplink-gloves-north-star-desc = Пара перчаток, которые значительно сокращают время между ударами, позволяя избивать людей до смерти шквалом ударов. +uplink-gloves-knuckleduster-name = Кастеты Синдиката +uplink-gloves-knuckleduster-desc = Пара пластитановых кастетов, усиливающих силу ваших ударов. +uplink-estoc-bundle-name = Набор «Эсток» +uplink-estoc-bundle-desc = Марксманская винтовка «Эсток» с оптикой средней дальности. В комплекте два магазина (5,56 мм). # Explosives uplink-explosive-grenade-name = Разрывная граната uplink-explosive-grenade-desc = Простая граната с 3,5-секундным запалом, ориентированная на поражение личного состава. Наносит минимальные повреждения стенам и полу. @@ -65,8 +69,10 @@ uplink-pistol-magazine-caseless-name = Пистолетный магазин (.2 uplink-pistol-magazine-caseless-desc = Пистолетный магазин на 10 патронов. Совместим с "Коброй". uplink-speedloader-magnum-name = Спидлоадер (.45 магнум ББ) uplink-speedloader-magnu-desc = Спидлоадер с 6 бронебойными, полностью игнорирующими броню, патронами для револьвера. Совместим с "Питоном". -uplink-mosin-ammo-name = Коробка патронов (7,62мм) -uplink-mosin-ammo-desc = Коробка с 60 патронами 7,62х39мм для лёгкого пулемета. +uplink-mosin-ammo-name = Коробка патронов (7,62ммR) +uplink-mosin-ammo-desc = Коробка с 20 патронами 7,62х54ммR для винтовки или среднего пулемета. +uplink-mosin-speedloader-name = Обойма (7,62ммR) +uplink-mosin-speedloader-desc = Тонкая металлическая полоска удерживающая 5 патронов калибра 7,62х54ммR для винтовки Кардашев. uplink-sniper-ammo-name = Коробка патронов (.60 антиматериальные) uplink-sniper-ammo-desc = Коробка с 10 патронами для снайперской винтовки Христов. uplink-magazine-bulldog-pellet-name = Барабан (.50 дробь) @@ -161,6 +167,8 @@ uplink-thermalvision-eyes-desc = Позволяют видеть в темнот uplink-mantis-blade-arms-name = Набор с клинками-богомолами uplink-mantis-blade-arms-desc = Изначально использовались как простой строительный инструмент, теперь превращены в скрытые клинки, которые могут выдвигаться из руки, сохраняя при этом способность к разрушительному вскрытию конструкций. Поистине впечатляющее зрелище. (Внимание: Требуется помощь хирурга.) # Bundles +uplink-minotaur-name = Набор AS-12 'Минотавр' +uplink-minotaur-desc = Плавный, мощный, крайне нелегальный. Содержит дробовик Минотавр, 4 барабана дроби. uplink-observation-kit-name = Набор наблюдателя uplink-observation-kit-desc = В комплект входят консольная плата монитора камер наблюдения, и охранный визор, замаскированный под солнцезащитные очки. uplink-emp-kit-name = Набор отключения электричества @@ -174,7 +182,9 @@ uplink-knives-kit-desc = Набор из 4 фирменных метательн uplink-meds-bundle-name = Медицинский набор uplink-meds-bundle-desc = Всё, что нужно для возвращения в строй ваших товарищей: главным образом, боевая аптечка, дефибриллятор и три боевых медипена. uplink-ammo-bundle-name = Набор боеприпасов -uplink-ammo-bundle-desc = Перезаряжаю! Содержит 1 коробку с магазинами для c20r, 1 коробка с магазинами для Бульдога и 1 коробка с магазинами L6 Saw. +uplink-ammo-bundle-desc = Перезаряжаю! Содержит 4 магазина для c20r, 4 магазина для Бульдога , 4 магазина для Эсток и 2 патронных короба для L6 Saw. +uplink-ammo-bundlenew-name = Набор "Оружейная лавка" +uplink-ammo-bundlenew-desc = Большой боекомплект для всего отряда! В набор входят: коробка магазинов для C-20r, коробка барабанов для Bulldog, коробка магазинов для L6 SAW и россыпные патроны, коробка магазинов для DL6902 и дополнительная россыпь патронов, коробка магазинов для Эсток, коробка магазинов для Драгунов, а также коробка безгильзовых патронов. uplink-sniper-bundle-name = Набор снайпера uplink-sniper-bundle-desc = Неприметный чемодан, в котором находятся Христов, 10 запасных патронов и удобная маскировка. uplink-c20r-bundle-name = Набор "C-20r" @@ -242,8 +252,6 @@ uplink-chameleon-name = Набор "Хамелеон" uplink-chameleon-desc = Рюкзак, полный вещей, оснащённых технологией хамелеона, позволяющих вам маскироваться под кого угодно на станции, и даже больше! uplink-clothing-no-slips-shoes-name = Нескользящая обувь uplink-clothing-no-slips-shoes-desc = Ботинки-хамелеоны, которые защищают вас от подскальзывания. -uplink-clothing-thieving-gloves-name = Воровские перчатки -uplink-clothing-thieving-gloves-desc = Незаметно обчищайте карманы и повышайте свой навык воровства с помощью этих новых модных перчаток, которые выглядят как обычные! uplink-clothing-outer-vest-web-name = Тактический жилет uplink-clothing-outer-vest-web-desc = Синтетический бронежилет. Имеет дополнительные ремни и баллистические пластины. uplink-clothing-outer-vest-web-elite-name = Элитный тактический жилет diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index f8f80557bf..cc2060385c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -140,15 +140,15 @@ components: - type: StorageFill contents: - - id: SMGAmmoKit # Sunrise-edit + - id: MagazinePistolSubMachineGunSP # Sunrise-Edit + amount: 4 + - id: MagazineShotgun + amount: 4 + - id: MagazineRifleFMJ # Sunrise-Edit + amount: 3 + - id: MagazineShotgunSlug amount: 1 - - id: ShotGunKit # Sunrise-edit - amount: 1 - - id: LMGKit # Sunrise-edit - amount: 1 - - id: MagazineRifleSP # Sunrise-edit - amount: 2 - - id: MagazineDragunov # Sunrise-edit + - id: MagazineLightRifleBoxSP amount: 2 - type: entity diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 3964636edc..b0ddce379a 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -258,28 +258,6 @@ - AssaultOpsUplink #Sunrise-end -- type: listing - id: UplinkGrenadeLauncherM79 - name: uplink-grenade-launcher-m79-name - description: uplink-grenade-launcher-m79-desc - icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Launchers/m79/big.rsi, state: base } - productEntity: WeaponLauncherM79Biocode - discountCategory: veryRareDiscounts - discountDownTo: - Telecrystal: 8 - cost: - Telecrystal: 12 - categories: - - UplinkWeaponry -#Sunrise-start - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - LoneOpsUplink -#Sunrise-end - - type: listing id: UplinkGrenadeLauncherChinaLake name: uplink-grenade-launcher-china-lake-name @@ -288,9 +266,9 @@ productEntity: WeaponLauncherChinaLakeBiocode discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 14 + Telecrystal: 10 # Sunrise-Edit cost: - Telecrystal: 20 + Telecrystal: 12 # Sunrise-Edit categories: - UplinkWeaponry #Sunrise-start @@ -511,6 +489,8 @@ blacklist: tags: - NukeOpsUplink + - LoneOpsUplink + - AssaultOpsUplink - type: listing id: UplinkSyndicateBombNukie @@ -740,19 +720,20 @@ name: uplink-ammo-bundle-name description: uplink-ammo-bundle-desc productEntity: ClothingBackpackDuffelSyndicateAmmoFilled - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 15 cost: - Telecrystal: 24 # Sunrise-Edit + Telecrystal: 15 categories: - UplinkAmmo conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - LoneOpsUplink + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - LoneOpsUplink # Sunrise-Edit + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle #Chemicals @@ -1944,6 +1925,7 @@ whitelist: tags: - NukeOpsUplink + - LoneOpsUplink # Sunrise-Edit - type: listing id: UplinkClothingOuterHardsuitJuggernaut @@ -1976,6 +1958,7 @@ whitelist: tags: - NukeOpsUplink + - LoneOpsUplink # Sunrise-Edit - type: listing id: UplinkClothingConductingGloves @@ -1997,31 +1980,6 @@ categories: - UplinkWearables -- type: listing - id: UplinkOuterHardsuitChameleon - name: uplink-clothing-outer-hardsuit-chameleon-name - description: uplink-clothing-hardsuit-chameleon-desc - productEntity: ClothingOuterHardsuitChameleon - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 4 # Sunrise-Edit - cost: - Telecrystal: 6 # Sunrise-Edit - categories: - - UplinkWearables - -#Sunrise-Start -- type: listing - id: UplinkMiscSyndiePowercage - name: uplink-objects-power-syndie-powercell-name - description: uplink-objects-power-syndie-powercell-desc - productEntity: PowerCellSyndicate - cost: - Telecrystal: 6 - categories: - - UplinkWearables -#Sunrise-End - # Pointless - type: listing diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index f1941e6b34..13768501ff 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -3,6 +3,7 @@ # Sunrise edit start - type: entity id: BaseClothingBeltSounds + abstract: true components: - type: EmitSoundOnPickup sound: diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 9a7cee9103..b80f2bbb33 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -172,6 +172,10 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - type: Item + size: Large + shape: + - 0,0,3,2 - type: Clothing sprite: _Starlight/Objects/Weapons/Guns/Shotguns/minotaur.rsi - type: GunRequiresWield diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml index be553b4eab..a3a0d64bb7 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml @@ -22,6 +22,29 @@ - id: MagazineDragunov - id: MagazineDragunov +- type: entity + parent: ClothingBackpackDuffelSyndicateAmmo + id: ClothingBackpackDuffelSyndicateSuperAmmoFilled + name: ammo bundle + description: "Reloading! Contains 4 magazines for the C-20r, 5 drums for the Bulldog, 3 magazines for the Estoc DMR, and 2 ammo boxes for the L6 SAW." + components: + - type: StorageFill + contents: + - id: SMGAmmoKit # Sunrise-edit + amount: 1 + - id: ShotGunKit # Sunrise-edit + amount: 1 + - id: LMGKit # Sunrise-edit + amount: 1 + - id: MMGKit # Sunrise-edit + amount: 1 + - id: CaselessAmmoKit # Sunrise-edit + amount: 1 + - id: RifleAmmoKit # Sunrise-edit + amount: 1 + - id: DragunovAmmoKit # Sunrise-edit + amount: 1 + #ERT_Uplink - type: entity id: ClothingBackpackDuffelWeaponSubMachineGunMP5Filled diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml index 231868edec..7f261c9e18 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml @@ -143,6 +143,7 @@ description: Base Leader Kit created for centcomm squad members. components: - type: Sprite + sprite: _Sunrise/Objects/Storage/boxes_sunrise.rsi layers: - state: boxwidetoy - state: wide_ert @@ -170,6 +171,7 @@ description: Base Security Kit created for centcomm squad members. components: - type: Sprite + sprite: _Sunrise/Objects/Storage/boxes_sunrise.rsi layers: - state: boxwidetoy - state: wide_ert diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml index f7fadf449e..ba0624f304 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml @@ -34,39 +34,77 @@ - type: entity parent: [BoxCardboard, BaseSyndicateContraband] - id: SMGAmmoKit - name: C20r ammo kit + id: BaseSyndicateAmmoKit + abstract: true components: + - type: Sprite + sprite: _Sunrise/Objects/Storage/boxes_sunrise.rsi + layers: + - state: box_of_doom_big + - state: smg_base + - type: Item + sprite: _Sunrise/Objects/Storage/boxes_sunrise.rsi + size: Large + shape: + - 0,0,2,1 - type: Storage grid: - 0,0,3,3 + +- type: entity + parent: BaseSyndicateAmmoKit + id: BaseSyndicateAmmoKitSmall + abstract: true + components: + - type: Item + size: Large + shape: + - 0,0,1,1 + - type: Storage + grid: + - 0,0,2,3 + +- type: entity + parent: BaseSyndicateAmmoKitSmall + id: SMGAmmoKit + name: C20r ammo kit + components: - type: StorageFill contents: - id: MagazinePistolSubMachineGunSP - id: MagazinePistolSubMachineGunSP - id: MagazinePistolSubMachineGunSP - - id: MagazinePistolSubMachineGunSP - - id: MagazinePistolSubMachineGunSP - - id: MagazinePistolSubMachineGunSP - - id: MagazinePistolSubMachineGunSP - - id: MagazinePistolSubMachineGunSP + - id: MagazinePistolSubMachineGunFMJ + - id: MagazinePistolSubMachineGunFMJ + - id: MagazinePistolSubMachineGunHP - type: Sprite layers: - state: box_of_doom_big - state: smg_base - type: entity - parent: [BoxCardboard, BaseSyndicateContraband] + parent: BaseSyndicateAmmoKitSmall + id: RifleAmmoKit + name: Estoc ammo kit + components: + - type: StorageFill + contents: + - id: MagazineRifleSP + - id: MagazineRifleSP + - id: MagazineRifleSP + - id: MagazineRifleFMJ + - id: MagazineRifleFMJ + - id: MagazineRifleAP + - type: Sprite + layers: + - state: box_of_doom_big + - state: magazine + +- type: entity + parent: BaseSyndicateAmmoKitSmall id: CaselessAmmoKit name: Siar52 ammo kit components: - - type: Item - size: Large - shape: - - 0,0,2,1 - - type: Storage - grid: - - 0,0,2,3 - type: StorageFill contents: - id: MagazinePistolSubMachineGunSIAR52 @@ -75,19 +113,52 @@ - id: MagazinePistolSubMachineGunSIAR52 - id: MagazinePistolSubMachineGunSIAR52 - id: MagazinePistolSubMachineGunSIAR52 + - type: Sprite + layers: + - state: box_of_doom + - state: smg_red + +- type: entity + parent: BaseSyndicateAmmoKitSmall + id: DragunovAmmoKit + name: Dragunov ammo kit + components: + - type: StorageFill + contents: + - id: MagazineDragunov + - id: MagazineDragunov + - id: MagazineDragunov + - id: MagazineDragunovExtended + - id: MagazineDragunovExtended + - id: MagazineBoxRifleMachineFMJ + - type: Sprite + layers: + - state: box_of_doom + - state: dragunov + +- type: entity + parent: BaseSyndicateAmmoKitSmall + id: AntimaterialAmmoKit + name: Antimaterial ammo kit + components: + - type: StorageFill + contents: + - id: MagazineBauer127 + - id: MagazineBauer127 + - id: MagazineBauer127 + - id: MagazineBoxAntiMateriel + - id: MagazineBoxAntiMateriel + - id: MagazineBoxAntiMateriel - type: Sprite layers: - state: box_of_doom - state: smg_base # - type: entity -# parent: [BoxCardboard, BaseSyndicateContraband] +# parent: BaseSyndicateAmmoKit # id: SMGIncendiaryAmmoKit # name: C20r Incendiary ammo kit # components: -# - type: Storage -# grid: -# - 0,0,3,3 # - type: StorageFill # contents: # - id: MagazinePistolSubMachineGunIncendiary @@ -104,13 +175,10 @@ # - state: smg_red # - type: entity -# parent: [BoxCardboard, BaseSyndicateContraband] +# parent: BaseSyndicateAmmoKit # id: SMGUraniumAmmoKit # name: C20r Uranium ammo kit # components: -# - type: Storage -# grid: -# - 0,0,3,3 # - type: StorageFill # contents: # - id: MagazinePistolSubMachineGunUranium @@ -127,13 +195,10 @@ # - state: smg_uranium - type: entity - parent: [BoxCardboard, BaseSyndicateContraband] + parent: BaseSyndicateAmmoKit id: ShotGunKit name: Bulldog ammo kit components: - - type: Storage - grid: - - 0,0,3,3 - type: StorageFill contents: - id: MagazineShotgun @@ -150,13 +215,10 @@ - state: shotgun_base # - type: entity -# parent: [BoxCardboard, BaseSyndicateContraband] +# parent: BaseSyndicateAmmoKit # id: ShotGunIncendiaryKit # name: Bulldog Incendiary ammo kit # components: -# - type: Storage -# grid: -# - 0,0,3,3 # - type: StorageFill # contents: # - id: MagazineShotgunIncendiary @@ -173,13 +235,10 @@ # - state: shotgun_red # - type: entity -# parent: [BoxCardboard, BaseSyndicateContraband] +# parent: BaseSyndicateAmmoKit # id: ShotGunUraniumKit # name: Bulldog Uranium ammo kit # components: -# - type: Storage -# grid: -# - 0,0,3,3 # - type: StorageFill # contents: # - id: MagazineShotgunUranium @@ -192,36 +251,54 @@ # - state: shotgun_uranium - type: entity - parent: [BoxCardboard, BaseSyndicateContraband] + parent: BaseSyndicateAmmoKit id: LMGKit name: L6 Saw ammo kit components: - - type: Item - size: Large - shape: - - 0,0,2,1 - type: Storage grid: - - 0,0,3,2 + - 0,0,2,3 - type: StorageFill contents: - id: MagazineLightRifleBoxSP - id: MagazineLightRifleBoxSP - id: MagazineLightRifleBoxSP - - id: MagazineLightRifleBoxSP + - id: MagazineBoxRifleBig + - id: MagazineBoxRifleBig + - id: MagazineBoxRifleBig - type: Sprite layers: - state: box_of_doom_big - state: l6_base +- type: entity + parent: BaseSyndicateAmmoKit + id: MMGKit + name: DL6902 ammo kit + components: + - type: Item + size: Large + shape: + - 0,0,1,1 + - type: Storage + grid: + - 0,0,1,3 + - type: StorageFill + contents: + - id: MagazineDl6902 + - id: MagazineDl6902 + - id: MagazineBoxLightRifleBig + - id: MagazineBoxLightRifleBig + - type: Sprite + layers: + - state: box_of_doom_big + - state: dl6902 + # - type: entity # parent: LMGKit # id: LMGIncendiaryKit # name: L6 Saw Incendiary ammo kit # components: -# - type: Storage -# grid: -# - 0,0,3,2 # - type: StorageFill # contents: # - id: MagazineLightRifleBoxIncendiary @@ -238,9 +315,6 @@ # id: LMGUraniumKit # name: L6 Saw Uranium ammo kit # components: -# - type: Storage -# grid: -# - 0,0,3,2 # - type: StorageFill # contents: # - id: MagazineLightRifleBoxUranium diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 7bd4089319..fcc7309ee3 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -22,7 +22,7 @@ discountDownTo: Telecrystal: 8 cost: - Telecrystal: 14 + Telecrystal: 10 categories: - UplinkWearables conditions: @@ -58,7 +58,7 @@ discountDownTo: Telecrystal: 1 cost: - Telecrystal: 4 + Telecrystal: 3 categories: - UplinkWearables conditions: @@ -76,9 +76,9 @@ productEntity: ClothingEyesGlassesThermalSec discountCategory: rareDiscounts discountDownTo: - Telecrystal: 8 + Telecrystal: 6 cost: - Telecrystal: 12 + Telecrystal: 8 categories: - UplinkWearables conditions: @@ -108,6 +108,55 @@ - NukeOpsUplink - LoneOpsUplink +- type: listing + id: UplinkgClothingThievingGloves + name: uplink-clothing-thieving-gloves-name + description: uplink-clothing-thieving-gloves-desc + productEntity: ThievingGloves + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 3 + cost: + Telecrystal: 4 + categories: + - UplinkWearables + +- type: listing + id: UplinkClothingHandsChameleonThief + name: uplink-clothing-chameleon-thieving-gloves-name + description: uplink-clothing-chameleon-thieving-gloves-desc + productEntity: ClothingHandsChameleonThief + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 4 + cost: + Telecrystal: 6 + categories: + - UplinkWearables + +- type: listing + id: UplinkOuterHardsuitChameleon + name: uplink-clothing-outer-hardsuit-chameleon-name + description: uplink-clothing-hardsuit-chameleon-desc + productEntity: ClothingOuterHardsuitChameleon + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 4 + cost: + Telecrystal: 6 + categories: + - UplinkWearables + +- type: listing + id: UplinkMiscSyndiePowercage + name: uplink-objects-power-syndie-powercell-name + description: uplink-objects-power-syndie-powercell-desc + productEntity: PowerCellSyndicate + cost: + Telecrystal: 5 + categories: + - UplinkWearables + # Ammunition - type: listing id: UplinkPistolMagnumMagazine @@ -304,6 +353,44 @@ - NukeOpsUplink - LoneOpsUplink +# For the mosin +- type: listing + id: UplinkSpeedLoaderHRFMJ + name: uplink-mosin-speedloader-name + description: uplink-mosin-speedloader-desc + icon: { sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi, state: icon } + productEntity: SpeedLoaderHeavyRifleRFMJ + cost: + Telecrystal: 1 + categories: + - UplinkAmmo + #Sunrise-start + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - AssaultOpsUplink + #Sunrise-end + +- type: listing + id: UplinkAmmoBundleSuper + name: uplink-ammo-bundlenew-name + description: uplink-ammo-bundlenew-desc + productEntity: ClothingBackpackDuffelSyndicateSuperAmmoFilled + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 18 + cost: + Telecrystal: 30 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - LoneOpsUplink + # For the China-Lake - type: listing id: UplinkGrenadeFragTimer @@ -643,9 +730,8 @@ components: - SurplusBundle -# # Wearables - type: listing - id: UplinkHardsuitInfiltration + id: UplinkHardsuitInfiltrationNukie name: uplink-hardsuit-infiltration-name description: uplink-hardsuit-infiltration-desc icon: { sprite: /Textures/_Starlight/Objects/Clothing/OuterClothing/Hardsuits/infiltrationsyndie.rsi, state: icon } @@ -654,7 +740,7 @@ discountDownTo: Telecrystal: 5 cost: - Telecrystal: 11 + Telecrystal: 10 categories: - UplinkWearables conditions: @@ -663,6 +749,28 @@ tags: - NukeOpsUplink - LoneOpsUplink + - AssaultOpsUplink + +- type: listing + id: UplinkHardsuitInfiltration + name: uplink-hardsuit-infiltration-name + description: uplink-hardsuit-infiltration-desc + icon: { sprite: /Textures/_Starlight/Objects/Clothing/OuterClothing/Hardsuits/infiltrationsyndie.rsi, state: icon } + productEntity: ClothingBackpackDuffelSyndicateFilledInfiltration + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 8 + cost: + Telecrystal: 14 + categories: + - UplinkWearables + restockTime: 1800 + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + - LoneOpsUplink - type: listing id: UplinkHardsuitSyndieMedic @@ -1305,7 +1413,7 @@ discountDownTo: Telecrystal: 8 cost: - Telecrystal: 12 + Telecrystal: 10 categories: - UplinkWearables conditions: @@ -1526,9 +1634,9 @@ productEntity: WeaponMiniEnergyCrossbowBiocode discountCategory: rareDiscounts discountDownTo: - Telecrystal: 10 + Telecrystal: 8 cost: - Telecrystal: 12 + Telecrystal: 10 categories: - UplinkWeaponry conditions: @@ -1569,9 +1677,9 @@ productEntity: WeaponPistolDeagle discountCategory: rareDiscounts discountDownTo: - Telecrystal: 5 + Telecrystal: 4 cost: - Telecrystal: 8 + Telecrystal: 7 categories: - UplinkWeaponry @@ -1588,6 +1696,26 @@ # categories: # - UplinkWeaponry +- type: listing + id: UplinkGrenadeLauncherM79 + name: uplink-grenade-launcher-m79-name + description: uplink-grenade-launcher-m79-desc + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Launchers/m79/big.rsi, state: base } + productEntity: WeaponLauncherM79Biocode + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 2 # Good morning Vietnam! + cost: + Telecrystal: 6 + categories: + - UplinkWeaponry + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - LoneOpsUplink + - type: listing id: UplinkGrenadeLauncherGL70 name: uplink-grenade-launcher-gl70-name @@ -1596,9 +1724,9 @@ productEntity: WeaponGrenadeLauncherGL70Biocode discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 30 + Telecrystal: 18 cost: - Telecrystal: 40 + Telecrystal: 25 categories: - UplinkWeaponry conditions: @@ -1621,9 +1749,9 @@ } productEntity: CyberEyeNightVisionBox discountDownTo: - Telecrystal: 2 + Telecrystal: 1 cost: - Telecrystal: 4 + Telecrystal: 3 categories: - UplinkCybernetics @@ -1640,7 +1768,7 @@ discountDownTo: Telecrystal: 4 cost: - Telecrystal: 8 + Telecrystal: 7 categories: - UplinkCybernetics @@ -1656,30 +1784,30 @@ productEntity: MantisBladeArmsKit #ClothingBackpackDufelSyndicateFilledMantisBladeArms #Скучно и не практично в сумке ради 4 слота discountCategory: rareDiscounts discountDownTo: - Telecrystal: 12 + Telecrystal: 8 cost: - Telecrystal: 15 + Telecrystal: 10 categories: - UplinkCybernetics -- type: listing - id: UplinkMagillitisSerumImplant - name: uplink-magillitis-serum-implanter-name - description: uplink-magillitis-serum-implanter-desc - icon: { sprite: _Starlight/Actions/implants.rsi, state: gorilla_rampage } - productEntity: MagillitisSerumImplanter - discountDownTo: - Telecrystal: 4 - cost: - Telecrystal: 6 - categories: - - UplinkJob - conditions: - - !type:BuyerJobCondition - whitelist: - - ResearchAssistant - - Scientist - - ResearchDirector +# - type: listing +# id: UplinkMagillitisSerumImplant +# name: uplink-magillitis-serum-implanter-name +# description: uplink-magillitis-serum-implanter-desc +# icon: { sprite: _Starlight/Actions/implants.rsi, state: gorilla_rampage } +# productEntity: MagillitisSerumImplanter # Sunrise-TODO: FIX this Shit! +# discountDownTo: +# Telecrystal: 4 +# cost: +# Telecrystal: 6 +# categories: +# - UplinkJob +# conditions: +# - !type:BuyerJobCondition +# whitelist: +# - ResearchAssistant +# - Scientist +# - ResearchDirector - type: listing id: UplinkCaneShotgun diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index b984c92f51..4b941eb2f9 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -45,7 +45,7 @@ pvsIncrease: 0.4 - type: entity - name: GL-79 + name: GL-70 parent: BaseWeaponLauncher id: WeaponGrenadeLauncherGL70 components: @@ -101,7 +101,7 @@ pvsIncrease: 0.4 - type: entity - name: GL-79 + name: GL-70 parent: WeaponGrenadeLauncherGL70 id: WeaponGrenadeLauncherGL70Flash suffix: GrenadeFlash diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 713d3f789f..b4426f1596 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -209,42 +209,15 @@ { "name": "box_medical" }, - { - "name": "shotgun_red" - }, - { - "name": "smg_uranium" - }, - { - "name": "shotgun_uranium" - }, { "name": "facecast" }, - { - "name": "smg_red" - }, - { - "name": "smg_base" - }, { "name": "id" }, - { - "name": "l6_base" - }, { "name": "shrapnel" }, - { - "name": "l6_uranium" - }, - { - "name": "l6_red" - }, - { - "name": "wide_ert" - }, { "name": "stinger" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1fad9c0263bc158f42a19063cf3ed810873ea845 GIT binary patch literal 579 zcmV-J0=)f+P)Px${YgYYR9J=WmA^|HVH}5_RH2BH(&3~fL8zOC>Y-^3gMc#iFObq!_f|&_D5Q%N$C-52neS&m!Y=X1~d zeeZ=%I{9CcPb18=vF{fO&!-U=0{@y-g$4g-ChFys$fpsXHzL2m|GEhy7ZUYyN*rzt zH^9A^2zY^qV-Kk9?qJju0L;T8cOOOA+xoyvmOws@n4TOnx3xFHnXG$;6kachxE=Wb{JasZ>IkVvY&O!xRpdw<<8^b2KfDZDi++ygrk9_ z{XGFwah(UcaWG>l(KsQ8I;}s5iPD;Q-&vUJ^-_VE+&H zHxC+2?7Vz?wbeFAXCNAji@|{*bX{X&V$!#XR*beoXqBi`OIXjvho@2#*8B0NJ@z*a z9N_@n?FziweGvc}O3Xhmu^yJgEfc|8Do}J>UwR7cCF}+U2Zoqh=##>&OwSjkmR?Ht3$497C zOH3`m>THiIxaR`RB>2}egC|J>EvNhg;kzW{d4l1q=2 RImG|~002ovPDHLkV1n3k0@?ro literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json index 4b014c993e..c443a8bd72 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json @@ -7,6 +7,9 @@ "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/ammo_speed.dmi, inhands by TiniestShark", "states": [ + { + "name": "icon" + }, { "name": "base" }, diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/box.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/box.png new file mode 100644 index 0000000000000000000000000000000000000000..5d1a0a9f1364ca5b3773c134db8aa4834e3c9e25 GIT binary patch literal 382 zcmV-^0fGLBP)Px$I7vi7R9J=WmN84jFc^kk#i?d)TH&l~3dK_4Ruu>F2RR%!$PI@-NgPC750ooH z(?xKyO-ISKW1R{Pn&g7eCC}O~-}@xcd;uH|hht=ROp4Mh>1_knuW!l>tw5S3{d9U_ z6~0=%XeIV^;b-TkR^d;N&!E(Y5RJ0#Pk}T`dP;rpf^QuzL<35Fqgv$&u$Tb=c)@Xe zaHMRMe|~_)4DCijhz3CzqOK}?fnf){;2^}q`PD7)6001V3k@EX6Gun*=0Oadj8xCm3@#WQp^*iAH?!oA- c;cz&<0ZO%Bva`9WU;qFB07*qoM6N<$f}g>tzW@LL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/box_hug.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/box_hug.png new file mode 100644 index 0000000000000000000000000000000000000000..c208f68ead81677b9597dfad404e88548d9f196d GIT binary patch literal 412 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/boxwide.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/boxwide.png new file mode 100644 index 0000000000000000000000000000000000000000..538106107040e64e5d1d1bc92ad4753f6c818958 GIT binary patch literal 413 zcmV;O0b>4%P)Px$S4l)cR9J=WmN84iKp2K!#VNVDNeZ>aLAXG$MChvGApRhS(m@==pCk^Vt_7u~ zkPCv+smW!OBpu^)LQK+&DW!w=jJfZ=_u+%w9iUJs6kBGeYN78s*(L%fZ?jxxsX*U# zvcce3+HC&0K$0ZTbsfEfwzPgcel1Asm4%<4ok*K`v-h8H+c}ihKR>;|Fk0X|%6-pG zpzk`FVYH;p{tD+2L|@LM)f1pL1pqLQ;i%nf96DXhL2ZgOiNSdU)3Oi-L7^@uAS{{3 zK!}Equc)x0E`(@c9z(a=!K$eiCLlJChBuAF1-EzC&~&o0rc?j`EYpN(S&hSe->+4- z+c-hOa=F~DKwXr;)&)xcf;dhQgdu`3T&sB;r_BVYO)(r@fe>x2aB->%ejme?0)ozd zx3K{87yuwmVgSH&GA)DyCD-xA<@rY50T1_&m2VG);(zlEzJ_jDE+*g300000NkvXX Hu0mjfrJuH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/boxwidetoy.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/boxwidetoy.png new file mode 100644 index 0000000000000000000000000000000000000000..622bcc9a647856a176d788371b83b0f3965b3cee GIT binary patch literal 425 zcmV;a0apHrP)Px$V@X6oR9J=WmOVZjz*&-otj0nU$Y%0mWJ%#XRY<=1-iMFOBmjrQ;WW%#-UGu@qgez# zU%sU>nF5BTM(bNkrOo`iMFccJSMEYwdo8WMy?Dt;2(0kcZ4={?W}nv!NqB4X9b>c$ z>mSZtD5ePF`lSyNpf8)^k;pCh9Itw`4tf# zkA9{uC6HL!1d=Quyr;DVBv}Bl3G|+XqN!#k5HCJCJgXfZb8x(iv0VIaFa-cW*EDFl zUOU`zoJw`A+6g5DLC~x~Rk%Ro0?b`7q7w`}4+GEpQ}Yp>pzJ7P3MhRA`$s#F^X7p}#>f^J$oIAkZ{u`$?_BXhd2 zgNutx%7?1HDu45}AFmxP$~kVub-hjyqOJr}Hb#z6jGgMbr< z;=ecBg4Rr#wf?I_^2+a%k9%$0DwfQ%*0g~$Ap0&?aeVHDsN|l9Jr7Sa&MAH}r(fXO zt+_W3Jd$SMP&_lo_?%_c`z_Zrmi~FimDH23zVY?yCtfRG?zR7>xiq-0MZhWMvT#0! VUR1SPO$5-544$rjF6*2UngHU%S`GjJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/hug-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/hug-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a4633be563f5d12617fa22bed87a13e020520364 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=KRjI=Ln`LHy=BOC$U&g>VW>{- zn=KmzZ5k4CAIt7pYc2p}t)AOko5JeIGI5RZx$fWfzN>uVyYEcb{JPLozol=lt(Q>0i3v{Yo&7HQoI1NJ`ke$T{O1g4aA*q4?C z0tXK#Q-7M|X3=X0!Xmik9GhH|J~(?h1zkO7GU311dqWAQJo%Z1ra;|5V3Ib;>RsaP zuMa=}*`c<7dB*k|dv5nn58hNeD?9%D^lNLs)%v#c?_F5k@rL1J|Gy1CvyYYW$vuca zTl9RF?fX#K+MN8N2C4YELrd|>sO Rry#d6c)I$ztaD0e0sxdaKG^^O literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a45ce6c6938fb01f35cef1f86abbd91f7ef8eb4f GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=J)SO(Ar*7p-rC4}SV4p(Kq$4_ zo~e36{b7zXj#1?knQkc7mfu$!+f}aP&|UhaW5y&=!Ie`s zt!a75y2k3wsynLs3F_-_Hm=<|{~R+&14F~?s+ih_d>M1*t=AS>=lr&o5e(kOd|Rx* rWRud*ZYH-o`x;&{cW##OV_;Z(FVRN!pRShnB#=f=S3j3^P6V1@9@k z5{Doi>|$1^-(=lMCA|%k>|`+eR_J-qm;Fqw(gatRSrn4UT#4cI$qBPmSc8 zTRJVx@|S0<^Z6K$va63b?~|&0{^>ol-u{Mn)(Ox4%P}Y@J>q0)Rp4d(zgrHZ*VEO{ JWt~$(696HMRa5`~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/internals.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/internals.png new file mode 100644 index 0000000000000000000000000000000000000000..4a6e4da74afb5fd09f9dd7353e60ebcf5bbd067c GIT binary patch literal 420 zcmV;V0bBlwP)Px$UP(kjR9J=WmN84iKp2J}#i>)fq)kPz*sahk6)6QFLkAHjNAXX%h=a3}{t0n( z5^?BI5K1VzG!p0_=#(b6v{O3PK~gGc?s^nl?wKxkU%vPK4(`4KgTY|nm&;z|Yp>{5x6ZD+;|hr^|W zQ`WWq`i1Fq`r})5Cst-a7h~Yx4MCKrU;!xTRmF@vRTG?bQ07#Mq_-;lragem*_Th>4JD~G;r}Wk^7z|$)DP@~^5~u$F O00000`}lOaK4Hzs~V_ESl1!vgf-;)Y-Ub28ClB4)1HVYpNKZ-wCbfVD!8aHT^aFkF`8= vw{E{ywyE)?@*eX7^J6!%4oW27d&|FCK}kLN_i|I9Qy4s5{an^LB{Ts50o+XW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/meta.json new file mode 100644 index 0000000000..b06d3cfe69 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/meta.json @@ -0,0 +1,108 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), weapons magazune states created by KaiserMaus (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "internals" + }, + { + "name": "box" + }, + { + "name": "boxwide" + }, + { + "name": "boxwidetoy" + }, + { + "name": "box_hug" + }, + { + "name": "box_of_doom" + }, + { + "name": "box_of_doom_big" + }, + { + "name": "box_security" + }, + { + "name": "box_science" + }, + { + "name": "magazine" + }, + { + "name": "writing" + }, + { + "name": "writing_of_doom" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "hug-inhand-left", + "directions": 4 + }, + { + "name": "hug-inhand-right", + "directions": 4 + }, + { + "name": "shotgun_red" + }, + { + "name": "smg_uranium" + }, + { + "name": "shotgun_uranium" + }, + { + "name": "smg_red" + }, + { + "name": "smg_base" + }, + { + "name": "l6_base" + }, + { + "name": "shrapnel" + }, + { + "name": "l6_uranium" + }, + { + "name": "l6_red" + }, + { + "name": "stinger" + }, + { + "name": "incendiary" + }, + { + "name": "shotgun_base" + }, + { + "name": "dragunov" + }, + { + "name": "dl6902" + }, + { + "name": "wide_ert" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/shotgun_base.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/shotgun_base.png new file mode 100644 index 0000000000000000000000000000000000000000..e945aff1e9529cc60661f87b9bed7b6b800fba64 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|qyv0HT!FNS zv6-5xrk`(MTx^1?t80O`%C2$&DM{(K4$d_|Y0i=$zhH*{P+-n9`wCFd!qdeu#G?1@ zxr@9E1{_WYy|!%nf26c=AE(XZ>4pX8qT~&mMGjSml?OFk2^UD(oxak^wUD#>pLo^% WZiWfTrv4z;F?hQAxvXLrz}_X-E>CDTlh?opIzdP8{hr&PZqHVTk^1!I%5C; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/wide_ert.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/wide_ert.png similarity index 100% rename from Resources/Textures/Objects/Storage/boxes.rsi/wide_ert.png rename to Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/wide_ert.png diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/writing.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/writing.png new file mode 100644 index 0000000000000000000000000000000000000000..b985fbd375150ea7b5b6a9e79afe2ad0d4b3cfa5 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}{+=$5ArY-_ zFKy&)2;gXWc)wSo!BDc3F>i5tYNC76$18WPUzorxaNx|DGdY`+Z{4`-EyN($xFq`Q wnZj$UdzPmdKI;Vst0P%P@00000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/writing_of_doom.png b/Resources/Textures/_Sunrise/Objects/Storage/boxes_sunrise.rsi/writing_of_doom.png new file mode 100644 index 0000000000000000000000000000000000000000..d1e797f8702a7bade3299d38962a66fa0465671a GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}{+=$5ArY-_ zFCFAx(y5cSAX2kE$)=i#KOR^;fC4eIWwIn<*eR)J}NZ0 vIPU4kXXV##hq?SwV0=02(8J623=F5=GWtrhD3v