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 7cb4cd4b7a..27d2a2d5b7 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 @@ -8,6 +8,8 @@ ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Bundle P-90 .desc = P-90 with 2 raspy magazines. ent-ClothingBackpackDuffelWeaponAMS42Filled = Bundle AMS-42 .desc = AMS-42 with 3 raspy magazines. +ent-ClothingBackpackDuffelWeaponRifleG36Filled = Bundle G36 + .desc = G36 with 2 raspy magazines. ent-ClothingBackpackDuffelWeaponShotgunZauerFilled = Bundle Zauer .desc = Zauer with 2 raspy magazines. дроби. ent-ClothingBackpackDuffelWeaponXM1014Filled = Bundle XM1014 @@ -18,5 +20,7 @@ ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Bundle BR-64 .desc = BR-64 with 2 raspy magazines. ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Bundle MG-342 .desc = MG-342 with 2 raspy magazines. +ent-ClothingBackpackDuffelWeaponSniperHristovFilled = Bundle Hristov + .desc = Hristov with 4 raspy 10-round ammo box. 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/ntuplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl index 55a9e839f7..42672152db 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl @@ -20,8 +20,10 @@ ntuplink-gun-bundlemp5-name = Bundle Mp5 ntuplink-gun-bundlelecter-name = Bundle Lecter ntuplink-gun-bundlep90-name = Bundle P-90 ntuplink-gun-bundleams42-name = Bundle AMS-42 +ntuplink-gun-bundleg36-name = Bundle G36 ntuplink-gun-bundlemg342-name = Bundle MG-342 ntuplink-gun-bundlebr64-name = Bundle BR-64 ntuplink-gun-bundlezauer-name = Bundle Zauer +ntuplink-gun-bundlehristov-name = Bundle Hristov ntuplink-gun-bundlexm1014-name = Bundle XM1014 ntuplink-gun-bundlelaw12-name = Bundle Law-12 \ No newline at end of file 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 984079326a..5ac22dc0de 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 @@ -8,6 +8,8 @@ ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Набор P-90 .desc = P-90 c 2мя магазинами. ent-ClothingBackpackDuffelWeaponAMS42Filled = Набор AMS-42 .desc = AMS-42 c 3мя магазинами. +ent-ClothingBackpackDuffelWeaponRifleG36Filled = Набор G36 + .desc = G36 c 2мя магазинами. ent-ClothingBackpackDuffelWeaponShotgunZauerFilled = Набор Zauer .desc = Zauer c 2мя магазинами дроби. ent-ClothingBackpackDuffelWeaponXM1014Filled = Набор XM1014 @@ -18,5 +20,7 @@ ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Набор BR-64 .desc = BR-64 c 2мя магазинами. ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Набор MG-342 .desc = MG-342 c 2мя магазинами. +ent-ClothingBackpackDuffelWeaponSniperHristovFilled = Набор Христов + .desc = Христов с 4мя коробками на 10 антиматериальных патрон. ent-ClothingBackpackDuffelNanotrasenMedicalBundleFilled = набор медикаментов НаноТрейзен .desc = Все, что нужно для возвращения в строй ваших товарищей: главным образом, боевые аптечки, дефибриллятор и 4 боевых медипена каждого. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl index 0b187ba14c..a30a66a22d 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl @@ -21,8 +21,10 @@ ntuplink-gun-bundlemp5-name = Набор MP-5 ntuplink-gun-bundlelecter-name = Набор Lecter ntuplink-gun-bundlep90-name = Набор P-90 ntuplink-gun-bundleams42-name = Набор AMS-42 +ntuplink-gun-bundleg36-name = Набор G36 ntuplink-gun-bundlemg342-name = Набор MG-342 ntuplink-gun-bundlebr64-name = Набор BR-64 ntuplink-gun-bundlezauer-name = Набор Zauer +ntuplink-gun-bundlehristov-name = Набор Христов ntuplink-gun-bundlexm1014-name = Набор XM1014 ntuplink-gun-bundlelaw12-name = Набор Law-12 diff --git a/Resources/Locale/ru-RU/_strings/store/currency.ftl b/Resources/Locale/ru-RU/_strings/store/currency.ftl index 5070a71694..5afd667697 100644 --- a/Resources/Locale/ru-RU/_strings/store/currency.ftl +++ b/Resources/Locale/ru-RU/_strings/store/currency.ftl @@ -9,7 +9,7 @@ store-currency-display-debugdollar = *[other] { $amount } Дебаг долларов } store-currency-display-telecrystal = ТК -store-currency-display-bluecrystal = CК +store-currency-display-bluecrystal = БК store-currency-display-crystallite = К store-currency-display-stolen-essence = Украденная эссенция store-currency-display-wizcoin = Маг₭øин™ diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml index 1f14502a81..140ee95394 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml @@ -73,6 +73,18 @@ - id: MagazineRifle amount: 3 +- type: entity + id: ClothingBackpackDuffelWeaponRifleG36Filled + parent: ClothingBackpackDuffelMilitary + name: Bundle G36 + description: G36 with 2 raspy magazines. + components: + - type: StorageFill + contents: + - id: WeaponRifleG36 + - id: MagazineG36Extended + amount: 2 + - type: entity id: ClothingBackpackDuffelWeaponShotgunZauerFilled parent: ClothingBackpackDuffelMilitary @@ -133,6 +145,18 @@ - id: MagazineMachineGunMG42 amount: 2 +- type: entity + id: ClothingBackpackDuffelWeaponSniperHristovFilled + parent: ClothingBackpackDuffelMilitary + name: Bundle Hristov + description: Hristov with 4 raspy .60 10-rounds Box. + components: + - type: StorageFill + contents: + - id: WeaponSniperHristov + - id: MagazineBoxAntiMateriel + amount: 4 + - type: entity id: ClothingBackpackDuffelNanotrasenMedicalBundleFilled parent: ClothingBackpackDuffelNanotrasenMedical diff --git a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml index ca35f1a667..64109e08bf 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml @@ -64,6 +64,19 @@ - !type:ListingLimitedStockCondition stock: 2 +- type: listing + id: NTUplinkSunriseClothingBackpackDuffelWeaponRifleG36Filled + name: ntuplink-gun-bundleg36-name + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: g36 } + productEntity: ClothingBackpackDuffelWeaponRifleG36Filled + cost: + Bluecrystal: 9 + categories: + - NTAutoGun + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + - type: listing id: NTUplinkSunriseClothingBackpackDuffelWeaponLightMachineGunMG42 name: ntuplink-gun-bundlemg342-name @@ -90,6 +103,19 @@ - !type:ListingLimitedStockCondition stock: 1 +- type: listing + id: NTUplinkSunriseClothingBackpackDuffelWeaponSniperHristovFilled + name: ntuplink-gun-bundlehristov-name + productEntity: ClothingBackpackDuffelWeaponSniperHristovFilled + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: hristov } + cost: + Bluecrystal: 18 + categories: + - NTAutoGun + conditions: + - !type:ListingLimitedStockCondition + stock: 1 + - type: listing id: NTUplinkSunriseClothingBackpackDuffelWeaponShotgunZauer name: ntuplink-gun-bundlezauer-name @@ -204,6 +230,18 @@ # Пистолеты: +- type: listing + id: NTUplinkSunriseWeaponSubMachineGunSkorpion + productEntity: WeaponSubMachineGunSkorpion + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: skorpion } + cost: + Bluecrystal: 3 + categories: + - NTPistols + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + - type: listing id: NTUplinkSunriseWeaponPulsePistol productEntity: WeaponPulsePistol @@ -355,7 +393,7 @@ productEntity: SMGIncendiaryAmmoKit icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg_red } cost: - Crystallite: 20 + Crystallite: 17 categories: - NTAmmo conditions: @@ -367,7 +405,7 @@ productEntity: SMGUraniumAmmoKit icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg_uran } cost: - Crystallite: 35 + Crystallite: 30 categories: - NTAmmo conditions: @@ -379,7 +417,7 @@ productEntity: BoxMagazineShotgun icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot } cost: - Crystallite: 8 + Crystallite: 6 categories: - NTAmmo conditions: @@ -391,7 +429,7 @@ productEntity: BoxMagazineShotgunIncendiary icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_red } cost: - Crystallite: 25 + Crystallite: 18 categories: - NTAmmo conditions: @@ -446,6 +484,18 @@ - !type:ListingLimitedStockCondition stock: 6 +- type: listing + id: NTUplinkSunrisePortableRecharger + productEntity: PortableRecharger + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: port_recharge } + cost: + Crystallite: 20 + categories: + - NTAmmo + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + # Медицина: - type: listing id: NTUplinkSunriseMaterialBiomass @@ -548,7 +598,7 @@ productEntity: ClothingBackpackDuffelNanotrasenMedicalBundleFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: med_bundle } cost: - Crystallite: 40 + Crystallite: 35 categories: - NTMedicine conditions: @@ -569,6 +619,30 @@ - !type:ListingLimitedStockCondition stock: 6 +- type: listing + id: NTUplinkSunrisePinpointerNuclear + productEntity: PinpointerNuclear + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nuke_pinpointer } + cost: + Crystallite: 5 + categories: + - NTAdditional + conditions: + - !type:ListingLimitedStockCondition + stock: 3 + +- type: listing + id: NTUplinkSunrisePinpointerUniversal + productEntity: PinpointerUniversal + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: universal_pinpointer } + cost: + Crystallite: 3 + categories: + - NTAdditional + conditions: + - !type:ListingLimitedStockCondition + stock: 8 + - type: listing id: NTUplinkSunriseBoxMRE productEntity: BoxMRE @@ -622,13 +696,25 @@ productEntity: Stunbaton icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: stunbaton } cost: - Crystallite: 1 + Crystallite: 2 categories: - NTAdditional conditions: - !type:ListingLimitedStockCondition stock: 12 +- type: listing + id: NTUplinkSunriseDeployableBarrier + productEntity: DeployableBarrier + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: deploy_barrier } + cost: + Crystallite: 6 + categories: + - NTAdditional + conditions: + - !type:ListingLimitedStockCondition + stock: 8 + # Санитария - type: listing @@ -874,19 +960,31 @@ productEntity: JetpackVoidFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: void_jet } cost: - Crystallite: 10 + Crystallite: 8 categories: - NTEquipment conditions: - !type:ListingLimitedStockCondition - stock: 2 + stock: 4 + +- type: listing + id: NTUplinkSunriseClothingEyesNVD + productEntity: ClothingEyesNVD + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: void_jet } + cost: + Crystallite: 12 + categories: + - NTEquipment + conditions: + - !type:ListingLimitedStockCondition + stock: 6 - type: listing id: NTUplinkSunriseEnergyDomeGeneratorBackpackNT productEntity: EnergyDomeGeneratorBackpackNT icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nanotrasen_back } cost: - Crystallite: 15 + Crystallite: 14 categories: - NTEquipment conditions: @@ -898,7 +996,7 @@ productEntity: EnergyDomeGeneratorPersonalNT icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nanotrasen_belt } cost: - Crystallite: 40 + Crystallite: 35 categories: - NTEquipment conditions: diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/deploy_barrier.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/deploy_barrier.png new file mode 100644 index 0000000000..b3febcebe8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/deploy_barrier.png differ diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/hristov.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/hristov.png new file mode 100644 index 0000000000..ff01052d3f Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/hristov.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 34de99d1ce..c29da88cf5 100644 --- a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json @@ -64,18 +64,39 @@ { "name": "crate_med" }, + { + "name": "deploy_barrier" + }, { "name": "energygun" }, { "name": "skorpion" }, + { + "name": "nvd" + }, + { + "name": "nuke_pinpointer" + }, + { + "name": "universal_pinpointer" + }, + { + "name": "hristov" + }, { "name": "energygun_tac" }, { "name": "mp5" }, + { + "name": "g36" + }, + { + "name": "port_recharge" + }, { "name": "p90" }, diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nuke_pinpointer.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nuke_pinpointer.png new file mode 100644 index 0000000000..f83ca1a096 Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nuke_pinpointer.png differ diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nvd.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nvd.png new file mode 100644 index 0000000000..373ad3d995 Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/nvd.png differ diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/port_recharge.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/port_recharge.png new file mode 100644 index 0000000000..094c4b6f67 Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/port_recharge.png differ diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/universal_pinpointer.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/universal_pinpointer.png new file mode 100644 index 0000000000..1ef1631338 Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/universal_pinpointer.png differ