Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ERTuplink: добавлен набор медикаментов , BR-50c "Бастион" , BT-21b "Барьер" #926

Merged
merged 47 commits into from
Dec 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
b641bd5
ERT Amber
KaiserMaus Dec 15, 2024
461331e
Краски в техи и доработка Визора ОБР
KaiserMaus Dec 16, 2024
8ec50ed
Merge branch 'space-sunrise:master' into ERT-Tweaks
KaiserMaus Dec 16, 2024
ca87cc9
Merge branch 'ERT-Tweaks' of https://github.com/KaiserMaus/space-stat…
KaiserMaus Dec 16, 2024
afb400e
Update
KaiserMaus Dec 16, 2024
60d9358
Merge branch 'space-sunrise:master' into ERT-Tweaks
KaiserMaus Dec 16, 2024
a66f49e
Debuff mech
KaiserMaus Dec 17, 2024
44f037f
Mech Fix. Chang Fix
KaiserMaus Dec 17, 2024
9341bf6
Change
KaiserMaus Dec 17, 2024
b7a4488
Debuff
KaiserMaus Dec 17, 2024
f767ac4
Merge branch 'space-sunrise:master' into ERT-Tweaks
KaiserMaus Dec 18, 2024
d18d052
Merge branch 'ERT-Tweaks' of https://github.com/KaiserMaus/space-stat…
KaiserMaus Dec 19, 2024
31653fc
1st Phase
KaiserMaus Dec 20, 2024
92f43aa
Hmmm
KaiserMaus Dec 20, 2024
783a715
New Icons
KaiserMaus Dec 21, 2024
3d09ed0
ERT
KaiserMaus Dec 21, 2024
de2ca5e
Heat to SecHard + Raid-Amber Suit Eva
KaiserMaus Dec 21, 2024
22a13bb
Few Locale + fix EVA Amber
KaiserMaus Dec 22, 2024
dae097d
Fix
KaiserMaus Dec 22, 2024
8308c8b
merge
KaiserMaus Dec 22, 2024
d9df35f
EVA Engi head
KaiserMaus Dec 22, 2024
6d1116a
Locale 02
KaiserMaus Dec 22, 2024
9900d25
Merge branch 'master' into ERT-Uplink
KaiserMaus Dec 22, 2024
1ed6efc
Locale 3
KaiserMaus Dec 22, 2024
6e591cc
ERT Borg
KaiserMaus Dec 22, 2024
edb3c3f
Fix
KaiserMaus Dec 22, 2024
5c916fe
Merge branch 'space-sunrise:master' into ERT-Uplink
KaiserMaus Dec 22, 2024
968337b
fix 1984
KaiserMaus Dec 22, 2024
f34906f
Ha ha..No
KaiserMaus Dec 22, 2024
d11771b
Fix Cringe
KaiserMaus Dec 22, 2024
0d5b0e0
Update
KaiserMaus Dec 22, 2024
fdd518e
Merge branch 'space-sunrise:master' into ERT-Uplink
KaiserMaus Dec 23, 2024
563b664
Бэланс
KaiserMaus Dec 24, 2024
762c8a2
Energy Fix
KaiserMaus Dec 24, 2024
387686e
Nerf Swat, Add FlareGun to ERTUplink
KaiserMaus Dec 24, 2024
88dd56c
Merge branch 'space-sunrise:master' into ERT-Uplink
KaiserMaus Dec 24, 2024
6279d71
Merge branch 'ERT-Uplink' of https://github.com/KaiserMaus/space-stat…
KaiserMaus Dec 24, 2024
c458a53
Dec Buff
KaiserMaus Dec 24, 2024
f8f8ed1
Med Bundle Nt + EnergyDomeNt
KaiserMaus Dec 25, 2024
064bdef
Merge branch 'master' into ERT-Uplink
KaiserMaus Dec 25, 2024
ca5e911
Locale Fix
KaiserMaus Dec 25, 2024
c452067
fix dublicate
KaiserMaus Dec 25, 2024
9e9f2c2
fix
KaiserMaus Dec 25, 2024
983b500
AAAAAA
KaiserMaus Dec 25, 2024
4ce9062
Fix 3
KaiserMaus Dec 25, 2024
ce74927
ERTuplink locale fix
KaiserMaus Dec 25, 2024
da4eed5
secpod locale
KaiserMaus Dec 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
@@ -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.
.desc = MG-342 with 2 raspy magazines.
ent-ClothingBackpackDuffelNanotrasenMedicalBundleFilled = nanotrasen medical bundle
.desc = A large duffel bag for holding any medical army goods.
11 changes: 11 additions & 0 deletions Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 Экипировка
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ ent-ClothingBackpackDuffelPrisonGuard = вещмешок сотрудника к
.desc = На стиле.
ent-ClothingBackpackDuffelAdjutant = вещмешок адъютанта
.desc = Выглядит избыточно пустым, лишь на дне одиноко валяется скомканный лист бумаги.
ent-ClothingBackpackDuffelNanotrasenMedical = набор медикаментов НТ
.desc = Большой вещмешок для хранения любых медикаментов отряда.
Original file line number Diff line number Diff line change
@@ -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мя магазинами.
.desc = MG-342 c 2мя магазинами.
ent-ClothingBackpackDuffelNanotrasenMedicalBundleFilled = набор медикаментов НаноТрейзен
.desc = Все, что нужно для возвращения в строй ваших товарищей: главным образом, боевые аптечки, дефибриллятор и 4 боевых медипена каждого.
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ ent-SpawnMechMaulerSyndieFilled = спавнер Маулер
.desc = { ent-MarkerBase.desc }
.suffix = Заполнен
ent-SpawnMechSecPodFilled = спавнер Патрульного Пода
.suffix = Filled
.suffix = Заполнен
.desc = { ent-MarkerBase.desc }
11 changes: 11 additions & 0 deletions Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Экипировка
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Loading