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 00000000000..c94115c868d Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/icon.png new file mode 100644 index 00000000000..81a5c3b37af Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/icon.png differ 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 00000000000..0a10b40a889 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/inhand-right.png new file mode 100644 index 00000000000..ae13bde572a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/nanotrasen.rsi/inhand-right.png differ 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 00000000000..77d406cda86 Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/med_bundle.png differ 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 00000000000..f9d1ffde938 Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nanotrasen_back.png differ diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nanotrasen_belt.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nanotrasen_belt.png new file mode 100644 index 00000000000..cee4bc8d814 Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nanotrasen_belt.png differ