From 3045eb25b02f163ac7511a658f309216c8e1ac57 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Thu, 26 Dec 2024 03:38:12 +0000 Subject: [PATCH] =?UTF-8?q?ERTuplink:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BD=D0=B0=D0=B1=D0=BE=D1=80=20=D0=BC?= =?UTF-8?q?=D0=B5=D0=B4=D0=B8=D0=BA=D0=B0=D0=BC=D0=B5=D0=BD=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20,=20BR-50c=20"=D0=91=D0=B0=D1=81=D1=82=D0=B8=D0=BE?= =?UTF-8?q?=D0=BD"=20,=20BT-21b=20"=D0=91=D0=B0=D1=80=D1=8C=D0=B5=D1=80"?= =?UTF-8?q?=20=20(#926)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ERT Amber * Краски в техи и доработка Визора ОБР * Update * Debuff mech * Mech Fix. Chang Fix * Change * Debuff * 1st Phase * Hmmm * New Icons * ERT * Heat to SecHard + Raid-Amber Suit Eva * Few Locale + fix EVA Amber * Fix * merge * EVA Engi head * Locale 02 * Locale 3 * ERT Borg * Fix * fix 1984 * Ha ha..No * Fix Cringe * Update * Бэланс * Energy Fix * Nerf Swat, Add FlareGun to ERTUplink * Dec Buff * Med Bundle Nt + EnergyDomeNt * Locale Fix * fix dublicate * fix * AAAAAA * Fix 3 * ERTuplink locale fix * secpod locale --- .../entities/clothing/back/duffel.ftl | 2 + .../entities/objects/storage/duffelbag.ftl | 22 ++- .../_strings/_sunrise/store/categories.ftl | 11 ++ .../entities/clothing/back/duffel.ftl | 2 + .../entities/objects/storage/duffelbag.ftl | 22 ++- .../entities/markers/spawners/mechs.ftl | 2 +- .../_strings/_sunrise/store/categories.ftl | 11 ++ .../Catalog/Fills/Backpacks/duffelbag.yml | 22 +++ .../_Sunrise/Catalog/ert_uplink_catalog.yml | 185 +++++++++++------- .../Entities/Clothing/Back/duffel.yml | 15 ++ .../Entities/Objects/Specific/crystallite.yml | 16 +- .../Guns/Ammunition/Magazines/light_rifle.yml | 2 +- .../Prototypes/_Sunrise/Store/categories.yml | 22 +-- .../nanotrasen.rsi/equipped-BACKPACK.png | Bin 0 -> 1063 bytes .../Back/Duffels/nanotrasen.rsi/icon.png | Bin 0 -> 866 bytes .../Duffels/nanotrasen.rsi/inhand-left.png | Bin 0 -> 1115 bytes .../Duffels/nanotrasen.rsi/inhand-right.png | Bin 0 -> 1082 bytes .../Back/Duffels/nanotrasen.rsi/meta.json | 27 +++ .../Misc/nt_icons.rsi/med_bundle.png | Bin 0 -> 1871 bytes .../Interface/Misc/nt_icons.rsi/meta.json | 9 + .../Misc/nt_icons.rsi/nanotrasen_back.png | Bin 0 -> 1701 bytes .../Misc/nt_icons.rsi/nanotrasen_belt.png | Bin 0 -> 1679 bytes 22 files changed, 254 insertions(+), 116 deletions(-) create mode 100644 Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/med_bundle.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nanotrasen_back.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nanotrasen_belt.png diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/back/duffel.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/back/duffel.ftl index c330000a093..ab30c724cfb 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/back/duffel.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/back/duffel.ftl @@ -8,3 +8,5 @@ ent-ClothingBackpackDuffelPrisonGuard = prison guard's duffel bag .desc = On style. ent-ClothingBackpackDuffelAdjutant = adjutant duffel .desc = It looks redundantly empty, with only a crumpled piece of paper lying lonely at the bottom. +ent-ClothingBackpackDuffelNanotrasenMedical = nanotrasen duffel + .desc = A large duffel bag for holding any medical army goods. diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl index 3f96665bd5a..7cb4cd4b7a5 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl @@ -1,20 +1,22 @@ ent-ClothingBackpackDuffelWeaponSubMachineGunWt550Filled = Bundle WT550 -.desc = WT550 with 3 raspy magazines. + .desc = WT550 with 3 raspy magazines. ent-ClothingBackpackDuffelWeaponSubMachineGunMP5Filled = Bundle MP5 -.desc = Mp5 with 2 raspy magazines. + .desc = Mp5 with 2 raspy magazines. ent-ClothingBackpackDuffelWeaponRifleLecterFilled = Bundle Lecter -.desc = Lecter with 3 raspy magazines. + .desc = Lecter with 3 raspy magazines. ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Bundle P-90 -.desc = P-90 with 2 raspy magazines. + .desc = P-90 with 2 raspy magazines. ent-ClothingBackpackDuffelWeaponAMS42Filled = Bundle AMS-42 -.desc = AMS-42 with 3 raspy magazines. + .desc = AMS-42 with 3 raspy magazines. ent-ClothingBackpackDuffelWeaponShotgunZauerFilled = Bundle Zauer -.desc = Zauer with 2 raspy magazines. дроби. + .desc = Zauer with 2 raspy magazines. дроби. ent-ClothingBackpackDuffelWeaponXM1014Filled = Bundle XM1014 -.desc = XM1014 with 1 Box ammo. + .desc = XM1014 with 1 Box ammo. ent-ClothingBackpackDuffelWeaponShotgun12Filled = Bundle LAW-12 -.desc = LAW-12 with 1 Box ammo. + .desc = LAW-12 with 1 Box ammo. ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Bundle BR-64 -.desc = BR-64 with 2 raspy magazines. + .desc = BR-64 with 2 raspy magazines. ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Bundle MG-342 -.desc = MG-342 with 2 raspy magazines. \ No newline at end of file + .desc = MG-342 with 2 raspy magazines. +ent-ClothingBackpackDuffelNanotrasenMedicalBundleFilled = nanotrasen medical bundle + .desc = A large duffel bag for holding any medical army goods. \ No newline at end of file diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl index 32c804093e8..76e5343d8e3 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl @@ -24,3 +24,14 @@ shop-disease-category-symptoms = Symptoms shop-disease-category-evolution = Evolution # Uplink store-category-objectives = Objectives +# ntUplink +store-category-ntautogun = AutoGun +store-category-ntlasers = Lasers +store-category-ntmedicine = Medicine +store-category-ntpistols = Pistols +store-category-ntadditional = Additional +store-category-ntsanitary = Sanitary +store-category-ntengineering = Engineering +store-category-ntmechs = Mechs +store-category-ntammo = Ammo +store-category-ntequipment = Equipment Экипировка diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/back/duffel.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/back/duffel.ftl index 9629d652a8b..780796f2563 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/back/duffel.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/back/duffel.ftl @@ -8,3 +8,5 @@ ent-ClothingBackpackDuffelPrisonGuard = вещмешок сотрудника к .desc = На стиле. ent-ClothingBackpackDuffelAdjutant = вещмешок адъютанта .desc = Выглядит избыточно пустым, лишь на дне одиноко валяется скомканный лист бумаги. +ent-ClothingBackpackDuffelNanotrasenMedical = набор медикаментов НТ + .desc = Большой вещмешок для хранения любых медикаментов отряда. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl index 2cb46a9ec83..984079326ae 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl @@ -1,20 +1,22 @@ ent-ClothingBackpackDuffelWeaponSubMachineGunWt550Filled = Набор WT550 -.desc = WT550 c 3мя магазинами. + .desc = WT550 c 3мя магазинами. ent-ClothingBackpackDuffelWeaponSubMachineGunMP5Filled = Набор MP5 -.desc = Mp5 c 2мя магазинами. + .desc = Mp5 c 2мя магазинами. ent-ClothingBackpackDuffelWeaponRifleLecterFilled = Набор Lecter -.desc = Lecter c 3мя магазинами. + .desc = Lecter c 3мя магазинами. ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Набор P-90 -.desc = P-90 c 2мя магазинами. + .desc = P-90 c 2мя магазинами. ent-ClothingBackpackDuffelWeaponAMS42Filled = Набор AMS-42 -.desc = AMS-42 c 3мя магазинами. + .desc = AMS-42 c 3мя магазинами. ent-ClothingBackpackDuffelWeaponShotgunZauerFilled = Набор Zauer -.desc = Zauer c 2мя магазинами дроби. + .desc = Zauer c 2мя магазинами дроби. ent-ClothingBackpackDuffelWeaponXM1014Filled = Набор XM1014 -.desc = XM1014 c пачкой патронов дроби. + .desc = XM1014 c пачкой патронов дроби. ent-ClothingBackpackDuffelWeaponShotgun12Filled = Набор LAW-12 -.desc = LAW-12 c пачкой патронов дроби. + .desc = LAW-12 c пачкой патронов дроби. ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Набор BR-64 -.desc = BR-64 c 2мя магазинами. + .desc = BR-64 c 2мя магазинами. ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Набор MG-342 -.desc = MG-342 c 2мя магазинами. \ No newline at end of file + .desc = MG-342 c 2мя магазинами. +ent-ClothingBackpackDuffelNanotrasenMedicalBundleFilled = набор медикаментов НаноТрейзен + .desc = Все, что нужно для возвращения в строй ваших товарищей: главным образом, боевые аптечки, дефибриллятор и 4 боевых медипена каждого. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/entities/markers/spawners/mechs.ftl b/Resources/Locale/ru-RU/_prototypes/entities/markers/spawners/mechs.ftl index 9a5f4947cef..0ba868b35e7 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/markers/spawners/mechs.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/markers/spawners/mechs.ftl @@ -39,5 +39,5 @@ ent-SpawnMechMaulerSyndieFilled = спавнер Маулер .desc = { ent-MarkerBase.desc } .suffix = Заполнен ent-SpawnMechSecPodFilled = спавнер Патрульного Пода - .suffix = Filled + .suffix = Заполнен .desc = { ent-MarkerBase.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl index 1f9dc06cefc..2c2d8df85a5 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl @@ -25,3 +25,14 @@ shop-disease-category-evolution = Улучшение # Uplink store-category-objectives = Цели store-category-mechs = Мехи +# ntUplink +store-category-ntautogun = Автоматы +store-category-ntlasers = Лазерное оружие +store-category-ntmedicine = Медицина +store-category-ntpistols = Пистолеты +store-category-ntadditional = Дополнительное +store-category-ntsanitary = Санитария +store-category-ntengineering = Инженерия +store-category-ntmechs = Мехи +store-category-ntammo = Боеприпасы +store-category-ntequipment = Экипировка \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml index 4ea61e403cc..1f14502a81f 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml @@ -132,3 +132,25 @@ - id: WeaponMachineGunMG42 - id: MagazineMachineGunMG42 amount: 2 + +- type: entity + id: ClothingBackpackDuffelNanotrasenMedicalBundleFilled + parent: ClothingBackpackDuffelNanotrasenMedical + name: nanotrasen medical bundle + description: A large duffel bag for holding any medical army goods. + components: + - type: StorageFill + contents: + - id: DefibrillatorCompact + - id: MedkitCombatFilled + amount: 3 + - id: Tourniquet + amount: 4 + - id: CombatMedipen + amount: 4 + - id: PunctAutoInjector + amount: 4 + - id: PyraAutoInjector + amount: 4 + - id: AirlossAutoInjector + amount: 4 diff --git a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml index a28ada096b0..ca35f1a6671 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml @@ -22,8 +22,8 @@ categories: - NTAutoGun conditions: - - !type:ListingLimitedStockCondition - stock: 4 + - !type:ListingLimitedStockCondition + stock: 4 - type: listing id: NTUplinkSunriseClothingBackpackDuffelWeaponRifleLecter @@ -74,8 +74,8 @@ categories: - NTAutoGun conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing id: NTUplinkSunriseClothingBackpackDuffelWeaponRifleBR64Filled @@ -163,8 +163,8 @@ categories: - NTLasers conditions: - - !type:ListingLimitedStockCondition - stock: 2 + - !type:ListingLimitedStockCondition + stock: 2 - type: listing id: NTUplinkSunriseWeaponPulseCarbine @@ -175,8 +175,8 @@ categories: - NTLasers conditions: - - !type:ListingLimitedStockCondition - stock: 4 + - !type:ListingLimitedStockCondition + stock: 4 - type: listing id: NTUplinkSunriseWeaponEnergyGunTactical @@ -213,8 +213,8 @@ categories: - NTPistols conditions: - - !type:ListingLimitedStockCondition - stock: 4 + - !type:ListingLimitedStockCondition + stock: 4 - type: listing id: NTUplinkSunriseWeaponEnergyGunPistolSecurity @@ -246,7 +246,7 @@ productEntity: WeaponFlareGunSecurity icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: sec_flaregun } cost: - Bluecrystal: 1 + Bluecrystal: 2 categories: - NTPistols conditions: @@ -299,8 +299,8 @@ categories: - NTAmmo conditions: - - !type:ListingLimitedStockCondition - stock: 12 + - !type:ListingLimitedStockCondition + stock: 12 - type: listing id: NTUplinkSunriseMagazineBoxMagnumIncendiary @@ -311,8 +311,8 @@ categories: - NTAmmo conditions: - - !type:ListingLimitedStockCondition - stock: 6 + - !type:ListingLimitedStockCondition + stock: 6 - type: listing id: NTUplinkSunriseMagazineBoxMagnumUranium @@ -323,8 +323,8 @@ categories: - NTAmmo conditions: - - !type:ListingLimitedStockCondition - stock: 6 + - !type:ListingLimitedStockCondition + stock: 6 - type: listing id: NTUplinkSunriseMagazineP90 @@ -335,8 +335,8 @@ categories: - NTAmmo conditions: - - !type:ListingLimitedStockCondition - stock: 6 + - !type:ListingLimitedStockCondition + stock: 6 - type: listing id: NTUplinkSunriseSMGAmmoKit @@ -454,10 +454,10 @@ cost: Crystallite: 5 categories: - - NTMedicine + - NTMedicine conditions: - - !type:ListingLimitedStockCondition - stock: 6 + - !type:ListingLimitedStockCondition + stock: 6 - type: listing id: NTUplinkSunriseDefibrillator @@ -468,8 +468,8 @@ categories: - NTMedicine conditions: - - !type:ListingLimitedStockCondition - stock: 2 + - !type:ListingLimitedStockCondition + stock: 2 - type: listing id: NTUplinkSunriseMedkitOxygenFilled @@ -543,6 +543,18 @@ - !type:ListingLimitedStockCondition stock: 8 +- type: listing + id: NTUplinkSunriseDuffelNanotrasenMedicalBundleFilled + productEntity: ClothingBackpackDuffelNanotrasenMedicalBundleFilled + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: med_bundle } + cost: + Crystallite: 40 + categories: + - NTMedicine + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + # Дополнительное: - type: listing @@ -578,8 +590,8 @@ categories: - NTAdditional conditions: - - !type:ListingLimitedStockCondition - stock: 8 + - !type:ListingLimitedStockCondition + stock: 8 - type: listing id: NTUplinkSunriseBoxFlashbang @@ -590,8 +602,8 @@ categories: - NTAdditional conditions: - - !type:ListingLimitedStockCondition - stock: 6 + - !type:ListingLimitedStockCondition + stock: 6 - type: listing id: NTUplinkSunriseFlash @@ -602,8 +614,8 @@ categories: - NTAdditional conditions: - - !type:ListingLimitedStockCondition - stock: 8 + - !type:ListingLimitedStockCondition + stock: 8 - type: listing id: NTUplinkSunriseStunbaton @@ -614,8 +626,8 @@ categories: - NTAdditional conditions: - - !type:ListingLimitedStockCondition - stock: 12 + - !type:ListingLimitedStockCondition + stock: 12 # Санитария @@ -628,8 +640,8 @@ categories: - NTSanitary conditions: - - !type:ListingLimitedStockCondition - stock: 12 + - !type:ListingLimitedStockCondition + stock: 12 - type: listing id: NTUplinkSunriseWeedSpray @@ -640,8 +652,8 @@ categories: - NTSanitary conditions: - - !type:ListingLimitedStockCondition - stock: 12 + - !type:ListingLimitedStockCondition + stock: 12 - type: listing id: NTUplinkSunriseSprayBottleSpaceCleaner @@ -652,8 +664,8 @@ categories: - NTSanitary conditions: - - !type:ListingLimitedStockCondition - stock: 12 + - !type:ListingLimitedStockCondition + stock: 12 - type: listing id: NTUplinkSunriseTrashBagBlue @@ -664,8 +676,8 @@ categories: - NTSanitary conditions: - - !type:ListingLimitedStockCondition - stock: 3 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing id: NTUplinkSunriseBoxBodyBag @@ -676,8 +688,8 @@ categories: - NTSanitary conditions: - - !type:ListingLimitedStockCondition - stock: 3 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing id: NTUplinkSunriseAdvMopItem @@ -701,8 +713,8 @@ categories: - NTEngineering conditions: - - !type:ListingLimitedStockCondition - stock: 4 + - !type:ListingLimitedStockCondition + stock: 4 - type: listing id: NTUplinkSunriseJawsOfLife @@ -713,8 +725,8 @@ categories: - NTEngineering conditions: - - !type:ListingLimitedStockCondition - stock: 6 + - !type:ListingLimitedStockCondition + stock: 6 - type: listing id: NTUplinkSunriseOmnitool @@ -725,8 +737,8 @@ categories: - NTEngineering conditions: - - !type:ListingLimitedStockCondition - stock: 4 + - !type:ListingLimitedStockCondition + stock: 4 - type: listing id: NTUplinkSunrisePowerCellHigh @@ -737,8 +749,8 @@ categories: - NTEngineering conditions: - - !type:ListingLimitedStockCondition - stock: 8 + - !type:ListingLimitedStockCondition + stock: 8 - type: listing id: NTUplinkSunrisePowerCellNanoTrasen @@ -751,8 +763,8 @@ categories: - NTEngineering conditions: - - !type:ListingLimitedStockCondition - stock: 4 + - !type:ListingLimitedStockCondition + stock: 4 - type: listing id: NTUplinkSunriseNetworkConfigurator @@ -763,9 +775,8 @@ categories: - NTEngineering conditions: - - !type:ListingLimitedStockCondition - stock: 4 - + - !type:ListingLimitedStockCondition + stock: 4 - type: listing id: NTUplinkSunriseMultitool productEntity: Multitool @@ -775,8 +786,8 @@ categories: - NTEngineering conditions: - - !type:ListingLimitedStockCondition - stock: 4 + - !type:ListingLimitedStockCondition + stock: 4 # Экипировка: - type: listing @@ -789,8 +800,8 @@ categories: - NTEquipment conditions: - - !type:ListingLimitedStockCondition - stock: 8 + - !type:ListingLimitedStockCondition + stock: 8 - type: listing id: NTUplinkSunriseRiotBulletShield @@ -802,8 +813,8 @@ categories: - NTEquipment conditions: - - !type:ListingLimitedStockCondition - stock: 8 + - !type:ListingLimitedStockCondition + stock: 8 - type: listing id: NTUplinkSunriseRiotLaserShield @@ -815,8 +826,8 @@ categories: - NTEquipment conditions: - - !type:ListingLimitedStockCondition - stock: 8 + - !type:ListingLimitedStockCondition + stock: 8 - type: listing id: NTUplinkSunriseRiotShield @@ -828,8 +839,8 @@ categories: - NTEquipment conditions: - - !type:ListingLimitedStockCondition - stock: 8 + - !type:ListingLimitedStockCondition + stock: 8 - type: listing id: NTUplinkSunriseJetpackBlueFilled @@ -841,8 +852,8 @@ categories: - NTEquipment conditions: - - !type:ListingLimitedStockCondition - stock: 4 + - !type:ListingLimitedStockCondition + stock: 4 - type: listing id: NTUplinkSunriseJetpackMiniFilled @@ -854,8 +865,8 @@ categories: - NTEquipment conditions: - - !type:ListingLimitedStockCondition - stock: 4 + - !type:ListingLimitedStockCondition + stock: 4 - type: listing id: NTUplinkSunriseJetpackVoidFilled @@ -867,8 +878,32 @@ categories: - NTEquipment conditions: - - !type:ListingLimitedStockCondition - stock: 2 + - !type:ListingLimitedStockCondition + stock: 2 + +- type: listing + id: NTUplinkSunriseEnergyDomeGeneratorBackpackNT + productEntity: EnergyDomeGeneratorBackpackNT + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nanotrasen_back } + cost: + Crystallite: 15 + categories: + - NTEquipment + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + +- type: listing + id: NTUplinkSunriseEnergyDomeGeneratorPersonalNT + productEntity: EnergyDomeGeneratorPersonalNT + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nanotrasen_belt } + cost: + Crystallite: 40 + categories: + - NTEquipment + conditions: + - !type:ListingLimitedStockCondition + stock: 2 # Mechs - type: listing @@ -882,8 +917,8 @@ categories: - NTMechs conditions: - - !type:ListingLimitedStockCondition - stock: 2 + - !type:ListingLimitedStockCondition + stock: 2 - type: listing id: NTUplinkSunriseBorgERT @@ -894,8 +929,8 @@ categories: - NTMechs conditions: - - !type:ListingLimitedStockCondition - stock: 2 + - !type:ListingLimitedStockCondition + stock: 2 - type: listing id: NTUplinkSunriseNTGygax diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml index 4779bcca7f5..4302e0f083b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml @@ -49,3 +49,18 @@ components: - type: Sprite sprite: _Sunrise/Clothing/Back/Duffels/adjutant.rsi + +- type: entity + parent: [ ClothingBackpackDuffel, BaseCentcommContraband ] + id: ClothingBackpackDuffelNanotrasenMedical + name: nanotrasen duffel bag + description: A duffel bag containing a variety of biological containment equipment. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Back/Duffels/nanotrasen.rsi + - type: Storage + maxItemSize: Huge + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1 + - type: HeldSpeedModifier diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/crystallite.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/crystallite.yml index 55553f5e112..275664a02a1 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/crystallite.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/crystallite.yml @@ -1,9 +1,9 @@ - type: entity - name: сrystallite + name: crystallite parent: BaseItem id: Crystallite - suffix: 100 С + suffix: 100 C description: It seems to shimmer with a attractive energy. components: - type: Sprite @@ -26,8 +26,8 @@ - type: entity parent: Crystallite id: Crystallite1 - suffix: 1 С - name: сrystallite + suffix: 1 C + name: crystallite description: It seems to shimmer with a attractive energy. components: - type: Stack @@ -36,8 +36,8 @@ - type: entity parent: Crystallite id: Crystallite25 - suffix: 25 С - name: сrystallite + suffix: 25 C + name: crystallite description: It seems to shimmer with a attractive energy. components: - type: Stack @@ -46,8 +46,8 @@ - type: entity parent: Crystallite id: Crystallite50 - suffix: 50 С - name: сrystallite + suffix: 50 C + name: crystallite description: It seems to shimmer with a attractive energy. components: - type: Stack diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index 2098c42ffd2..158ab26181e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -177,7 +177,7 @@ whitelist: tags: - CartridgeRifle # 556 - capacity: 75 + capacity: 150 - type: Item size: Normal - type: ContainerContainer diff --git a/Resources/Prototypes/_Sunrise/Store/categories.yml b/Resources/Prototypes/_Sunrise/Store/categories.yml index 5cc0d3df503..ee82e7e488e 100644 --- a/Resources/Prototypes/_Sunrise/Store/categories.yml +++ b/Resources/Prototypes/_Sunrise/Store/categories.yml @@ -127,53 +127,53 @@ name: store-category-lootbox priority: 11 -#ERTuplink categoires #KaiserEdit +#ERTuplink categoires - type: storeCategory id: NTAutoGun - name: Автоматы + name: store-category-ntautogun priority: 0 - type: storeCategory id: NTLasers - name: Лазерное оружие + name: store-category-ntlasers priority: 1 - type: storeCategory id: NTMedicine - name: Медицина + name: store-category-ntmedicine priority: 4 - type: storeCategory id: NTPistols - name: Пистолеты + name: store-category-ntpistols priority: 2 - type: storeCategory id: NTAdditional - name: Дополнительное + name: store-category-ntadditional priority: 5 - type: storeCategory id: NTSanitary - name: Санитария + name: store-category-ntsanitary priority: 6 - type: storeCategory id: NTEngineering - name: Инженерия + name: store-category-ntengineering priority: 7 - type: storeCategory id: NTMechs - name: Мехи + name: store-category-ntmechs priority: 9 - type: storeCategory id: NTAmmo - name: Боеприпасы + name: store-category-ntammo priority: 3 - type: storeCategory id: NTEquipment - name: Экипировка + name: store-category-ntequipment priority: 8 \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..c94115c868d9fc9b897b3c848be8d4e91cdd5e25 GIT binary patch literal 1063 zcmV+?1laqDP)Px&;Ymb6RCt{2n!#(^b`;0I9)ZZO32|h_ki;Z5bIjVXbb}U>d6-_(gBcih2$aGO z9pt)W|Ao=(ZrydIFna05m%tc>yU|I2){Ih&$-wvHLrM2Zqw&i5| zeZW{?>HVI5zvuU)-}eC$i9{liNF)+TPjZD#9<>i{h=}bE0IcLUeEav2-wT$nub+!a zAR>+`gy|_2(^D#lh~KnMeA^itf^VUrj4Pl^1WlU(s=yzw${->ZLPXAL!&d}sm+nVm zGwG2>0TFRAmcqTnBn-pAQMHPN#YL#9>f4s@zksGqEWwN}snj1+J5D}ZE$t8e^i05aM99K2|KJ%%Q4E^9c0svtD<%@`} z*D$I{SX@ZqyG#}Ukp4IYWn96ocoV)OM8sj{gSe{kN`8Zj-`r&);<&2uQYOnKfKAin zTXR=@+YA%|HbMv|DTXl-ElZ%jzXM%=SMEMp{TiYvkT*>{nV1M<^UUSK3-<%kcIo~= zY`zZ>@%&s8nl=MnuR$~guC3pOuAiX%>re1g`rHh~**XBj*h+t3V@eF9alAeaP{)3_L**U)dp=Lq8LlzxH*QKN&-Q| z$5C)oN#M9ShGHy*s6q%72}H!V=B_weyqEeKb`qNg_aMd1$Wvq@MBDc>DfqkxEbaUlg|Hi>xQ4glcc>*pY%j^}rr03k%g zPJ)vYF{IaT0|2%j{m^yb%CoIV7)=t5+5sxhwmcW%%dfr#0O#Bf+HIqI=j?|^3xXj#J1Px&97#k$R9J=WmQ83AX&A?UO|+SOR40>hsb;hXYc)hlD;Ab@&4SRQUn>-EF04lp z6!EYpkAf%NJ+FB2u&|4Zmt_SHvWl>xt5&M9q3X6OZ8E7gGnurcvxoS;X6j6BMA%FI zmp9Dw%=7%`|9rfGHri;TjsF=PtvIJN-BltA0I_(?V|zNDZz-0*s#cSW#JaxDW4A5a zoq9FdGKm$xkkWJ)K#3?gHOFHU#B9r^RT3>T7D_lZhmu+BXeI~9XP<>Ydc7e73+Zjk zCbi`&>eVvy<>vsrnKkME<}my3Uj^WtQzugi0Wca}TvnApLwdd8HaD86c|QMyzP_z| z(f2g~)A_%Mrw6%m=`1%A338PR7YDNZ99KETJOHPs=K@LiJ`~Aq%a-*HhhVL$q3i2D zAo1ePdWp2w!^NdOj&9ssPVhW)Z`kbdX0@m&e9AUibdKKlEbrwqO&5a`}K zNN;8b^=g^f$uR(m#TjYud^^srtr|vmHwX9b^F60VzT=El|8xZe!r}M7otneKg2T)C z6u;jrFr9zMKcf!;Jm-(+FHrj71ZU!5j+>5OSbqYmI~7zTLvLmW<70QF^rA1IF%ff> zS%ARi{Ql@savf`y{V?AWh;26UY(gg1G>uq1hH08;nnrZPK*RUxt-#Fs-b zeS8(j4h_5EXp(xhEWf^a|92*PJT^by-qh%IPfrLqHAl)V-q-ac z6VE1iaO0N`@-2HA_2))hkr*HxP12Q6d3^gfc?CEBFDMpgHM#V sz*1y~hUM+}x^VBK3M?&M8*TXEKZhJg=GiwaOaK4?07*qoM6N<$g2ZE#H2?qr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0a10b40a8891b6901a172e2f7ed7e5384f6495fb GIT binary patch literal 1115 zcmV-h1f=_kP)Px(6-h)vRCt{2n$K$+M-<1uYdLr|Yp2p`Rjid2$ZjHAp1@;HW!sxd+c>su6kivs7uGD67s(N00j zWElXMrYRxB;QcZi#n>KTL(SoLdWO4J3w?{?+m68i;LFWDoc6l->$e{mAq14tsh`9a z^3r=-SeQ>aLKO5R93CA6p0U#iJp%|KEGZM@^#YpOMQmjm8fp%$Rto^I-s|Df{W~ZX zODJ#bA}JG0n-R9p^2RPo#S$LfzXN$rM*1}sL?K~Aok*k^u((`C_wY|Zd-|?+?FLY( z!g%Lh$aAvuUY?Wf_8=??sS~g0U6XCK47{;;l`|QbM%r6k6)f5lcNUJH#FA$tP zdCbM%D3Jt6B-5}47H%mC9GJ7XjR6uf7tlMUIO%kU+FAq4m(S65C!H>Orxb~q3sFKH zOQd6v5W+swmz@pJJ$x za|{NCF*bCT@93+{J_fxW`);sywZ`1`UXQz-m(NMI|llSeq;BHyr~% z0lV9K_03a&$TvZI;LYwn%j*UFdvu7}C!fMFP8^$iKYlHZ+It4$nzGf+J*T0jrSbhY zUj>fU&k_hNz{|i3y9&R|2m#^_AZ~;JaR(4LLV&mfh#Mh5+yTUm5FqXV;zkG%cK~rC z1c*C;xDf)x9YEX&0pboIZeDo-LS+s{{}|OWSs3kO`!{QMjA#5t`7H_@q=~auc-s=GXTCG;#S_B(zGvLDy zK4PPJd}>lGE|+Pu& zFtrE|fBoq>6bQgOP3=_|u%oZ~N{jnVa|f+O@B_CcKq-~%r=BWGE0t{^VE*Fi;uumf z=k2Vs+0yP3$L4R8*(7yy<(8<{il=5m?+)HjTk9ozXP1OGXP^Aan`)!vP}L>|luzP06-`XhmLubCK%W2ZAVOg&d}^;QzY z^Et1A0?J;=aeZFB!n<+)Dn46bro!gMGtMNQm0^57$B*}ww%gn9oD7jKc|@OuPn^4} zeV2&rRyH1>fp;EgoLR3l|8#PGwd~U(Nd|-P)j&-LgW5JE-gUSp=X&SC3v=O$Cgrd5 zI3Mq7-21llNpYpfvvBLI+?$NYN|itC{P0ozM_rm2cYK}b3-y@B=;YS!j)!YEtl_cS zQ7dh8FghvI{dzhB!;&*9ZEco*ar-~rmU+H_JxIT8^7ZuwCTAuZO`iB`yM%(YQ9*r# zt<&2G1+xNP{|g89S$DX1N~Aa|iTQtZE9LLxjd6Y(@nA!hNCyA$r-B}tlP`0B`Tnk$ z;XwO*y~GNQ&b@EH9{4tqx6}2pn%yHq8@<1*iY%{}n^gP~Xvy*DIj{40M_G$~{clNz z3G?S1eRnSG_LcX>mU|r-CYb4dn)l_Qc5c*`B>x|Q!h!c=-fl5FF4}2b%x_f|w^7}o z`oH4Z8^U$7UoDuue)F-*h1O^8)xY51v_@pxyuS@=Y`f~c^#gsLNif*x?)|{~LVe%A zXVFD-od5s(sc&D_WBkE&KWmYof!LQvy_p|k-K7^qHDqmJT*bP=jX37IJ&etPR+aif z`kV6<{(SmWQd^|Oes81soKudcXKY?4d9uO4clnw%daRYXh0WVdALV+^7OVWqDfjTf zdG9Ct8@hHe=C3m?W;vR|SJ?d9J$|p!Bu1@QY~ff$n)=~qdi<9h@j2GqF==-lKJU5rvwnR?4$#2H2piU$6Dp>3B;J=j zB5d;K^Zz)(mpKKm-aT4+o!8*l0n6p@-x&VU^V^_#y76n=v~SUy&R)6e`s?xav+E)? z=ENyW9*{WvL#;P$%m$UjdpyPVZOHV z-QkOO=jxWFzhewt#V72vCFW>KU+;Mx=GeYF=Q*Y4N4go#mdugzauzvjCTQ~Hnj{gws)O4^o~01E>KPgg&ebxsLQ0J^;WQ~&?~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/meta.json new file mode 100644 index 00000000000..76b1f59d533 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/med_bundle.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/med_bundle.png new file mode 100644 index 0000000000000000000000000000000000000000..77d406cda865187fd3123d5875deb5a2ebfc2161 GIT binary patch literal 1871 zcmV-V2e9~wP)Px+2}wjjRCt{2olk5PMHs+;ZH32!qEIR!P;CqdREeSyV-zv*z)^{M@J6B}CI*cf zgT#wHqF&Gv6JwNk@n|q!32px5+=Rc67v9j+}`3WONj$5P+<3VS3sV zzI(xfM5UKB<_LhUu#lCCo9ZWIy`H*$nbQD`et=mK2opvDIIko~hfQp6Z})@`kBF-`P%4+L;#EWL4HDP3Tv4Rgi1OREr-`FCZUD0yK!&u)R{&(e&H&q7-2<)=-gURr=m0u`ACkOmH_!fcU-(G?A<`ol`kmayAN zV=Vx2^pG$cI|>yWwy;zqr~qZo4$$aEkK-XmN#+D#Z^;=07ZnzHt}k9vdo{DCG!a^v zl1%0VpwVbmnl+7(83E8eU-$UV&O2+~-+SI!FZZ@KmwQBJ1RyN3*5fsq6M)H^lU2i` zuH{RkHAe45b7_KXi+7GMMhzf)0CA|mQn_rMuf*L~^x7%*mYkk1JzO-wdj)6xFP6=N z?scs>DEiwyY|9y>K8-^1^V`d@9s=fTnbPFsx>_X@(uI-n!WeTM7}f$XUlkT~Yt$Go8WXuSjUEDmv{NH63V`e*YmbyDs8;#jatmO#=;?L-!02fJ zmP`!+u(D^X`^&=s3=jMOK=*^&0XX#KJ^+ri9{^yRc;0NjAAm1bECb+erabxV8NTk6 zug0n&&ZVS0N7Gy&Uj;NdRzpBF-?pgGJ^zNgPS>;cf8DYCj%AK#)B5!r02mlJ?TNQ? z{Z`N43n#tDiy`tp;pUo?P(2i>`VEm2SADhcwud<9^>((Km& zriMyWFRF!K{cPJOEQ|smv;Vjs#PpQcq9;gCU)I$Fz}Ur8z+8GfhXB~I)BWN3-N0ha!w`=C8od);Pr4j}0I+4g)LU#Pd;HAW2}XV8M43<{f7 zYaaq&U5{hYJA3L^V0I25$e6ELcr1OH(TV_~zIk0K)?(0rRo-rDZsfUFvpt2TLKp>bk^}Q%hzMSp7m>cfgpPX z*T=^^*Jmt;mb|=c7XaH@ZVz-{lmvNRxdv!*e0>7rLi_sdcdwuO>zpT^=^TJ~0n462 zarI`;?;~e^tgBqQ=O3ON24Kymr-50|qe|lN2^13J6If3=X|@H-*S9b1Js2VJmO!zr ziN#NPm>&D*c=ft0T;5&tK3g6sJ3VO>$3F5)t21{HyF^+E-6v4*dIi}9OS3JYvg|f> zskfcxi?2^$T;~IHeoNaOpS1Ss7W%(H9(V-cnu&(&+1$Igy*`R1GFhk@#jxp19R;KruPNtT}06w8y|blz0a#z z#3DIo?vWC54bbGIMgs_bW30>p#$3%H>vX;TzcArFBdF1H0NFzryX>_@rnTn_xdv!* ztTjL!J^}R@L$oj6%)K+`{hgCLzHbT@d%>Bb)zh;ejJ%f@CeVr2;#xI6wvT}4Q|7uuFUkr(g zMtzx5=91Y7VS+AdvI6FX8H1YvAgRr#ZUk`6?@>M{S^FIU38XK6?t-=5R002ov JPDHLkV1l6^hD-ne literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json index 863e680602c..34de99d1cef 100644 --- a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json @@ -133,6 +133,15 @@ { "name": "box_shot_flare" }, + { + "name": "nanotrasen_belt" + }, + { + "name": "nanotrasen_back" + }, + { + "name": "med_bundle" + }, { "name": "power_cell_nt" }, diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nanotrasen_back.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nanotrasen_back.png new file mode 100644 index 0000000000000000000000000000000000000000..f9d1ffde938abda181134ec466627ce832f92a89 GIT binary patch literal 1701 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 Z^FJjr6JN463dsNf002ovPDHLkV1mrYC076d literal 0 HcmV?d00001