-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into Hyper-ExosuitFab
- Loading branch information
Showing
82 changed files
with
2,798 additions
and
4,222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 0 additions & 17 deletions
17
Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/chemistry.ftl
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/storage/duffelbag.ftl
This file was deleted.
Oops, something went wrong.
23 changes: 0 additions & 23 deletions
23
Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl
This file was deleted.
Oops, something went wrong.
4 changes: 0 additions & 4 deletions
4
...urces/Locale/en-US/_prototypes/_sunrise/entities/structures/interrogator/interrogator.ftl
This file was deleted.
Oops, something went wrong.
4 changes: 0 additions & 4 deletions
4
Resources/Locale/en-US/_prototypes/entities/markers/spawners/random/medical.ftl
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
Resources/Locale/en-US/_prototypes/entities/markers/spawners/random/security.ftl
This file was deleted.
Oops, something went wrong.
44 changes: 0 additions & 44 deletions
44
Resources/Locale/en-US/_prototypes/entities/objects/specific/nanotrasen.ftl
This file was deleted.
Oops, something went wrong.
12 changes: 0 additions & 12 deletions
12
Resources/Locale/en-US/_prototypes/entities/objects/specific/robotics/borg_parts.ftl
This file was deleted.
Oops, something went wrong.
19 changes: 0 additions & 19 deletions
19
Resources/Locale/en-US/_prototypes/entities/objects/weapons/throwable/clusterbang.ftl
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
Resources/Locale/en-US/_prototypes/entities/structures/cryopod.ftl
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
6 changes: 0 additions & 6 deletions
6
Resources/Locale/ru-RU/_prototypes/_sunrise/assault-ops/assault-ops.ftl
This file was deleted.
Oops, something went wrong.
4 changes: 2 additions & 2 deletions
4
Resources/Locale/ru-RU/_prototypes/_sunrise/assaultops/implanters.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
ent-IcarusKeyImplanter = icarus key implanter | ||
.desc = { ent-BaseImplantOnlyImplanter.desc } | ||
ent-IcarusKeyImplanter = имплантатор ключей "Икарус" | ||
.desc = { ent-BaseImplantOnlyImplanter.desc } |
4 changes: 2 additions & 2 deletions
4
Resources/Locale/ru-RU/_prototypes/_sunrise/assaultops/key.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
ent-IcarusKey = icarus authentication keycard | ||
.desc = A high profile authentication keycard to Nanotrasen's Icarus secured network. | ||
ent-IcarusKey = ключ авторизации "Икарус" | ||
.desc = Ключ предназначеный для получения доступа к орбитальному оружию НТ "Икарус" |
4 changes: 2 additions & 2 deletions
4
Resources/Locale/ru-RU/_prototypes/_sunrise/assaultops/pda.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
ent-AssaultOpsPDA = passenger PDA | ||
.desc = Why isn't it gray? | ||
ent-AssaultOpsPDA = КПК пассажира | ||
.desc = Почему он не серый? |
2 changes: 1 addition & 1 deletion
2
Resources/Locale/ru-RU/_prototypes/_sunrise/assaultops/pinpointer.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
ent-PinpointerIcarus = pinpointer | ||
ent-PinpointerIcarus = пинпоинтер "Икарус" | ||
.desc = { ent-PinpointerBase.desc } |
54 changes: 26 additions & 28 deletions
54
Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/backpacks/duffelbag.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,26 @@ | ||
ent-ClothingBackpackDuffelSyndicateFilledBauer = Bauer-127 bundle | ||
.desc = The iconic Bauer-127 magazine rifle with 2 raspy magazines in the set. | ||
ent-ClothingBackpackDuffelWeaponSubMachineGunWt550Filled = Bundle WT550 | ||
.desc = WT550 with 3 raspy magazines. | ||
ent-ClothingBackpackDuffelWeaponSubMachineGunMP5Filled = Bundle MP5 | ||
.desc = MP5 with 2 raspy magazines. | ||
ent-ClothingBackpackDuffelWeaponRifleLecterFilled = Bundlelecter | ||
.desc = Lecter with 3 raspy magazines. | ||
ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Bundle p90 | ||
.desc = P-90 with 2 raspy magazines. | ||
ent-ClothingBackpackDuffelWeaponAMS42Filled = Bundle ams42 | ||
.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 | ||
.desc = XM1014 with 1 Box ammo. | ||
ent-ClothingBackpackDuffelWeaponShotgun12Filled = Bundle law12 | ||
.desc = Law-12 with 1 Box ammo. | ||
ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Bundle br64 | ||
.desc = BR64 with 2 raspy magazines. | ||
ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Bundle mg342 | ||
.desc = MG-342 with 2 raspy magazines. | ||
ent-ClothingBackpackDuffelWeaponSniperHristovFilled = Bundle Hristov | ||
.desc = Hristov with 4 raspy .60 10-rounds Box. | ||
ent-ClothingBackpackDuffelNanotrasenMedicalBundleFilled = nanotrasen medical bundle | ||
.desc = A large duffel bag for holding any medical army goods. | ||
ent-ClothingBackpackDuffelWeaponSubMachineGunWt550Filled = Набор WT550 | ||
.desc = WT550 c 3мя магазинами. | ||
ent-ClothingBackpackDuffelWeaponSubMachineGunMP5Filled = Набор MP5 | ||
.desc = Mp5 c 2мя магазинами. | ||
ent-ClothingBackpackDuffelWeaponRifleLecterFilled = Набор Lecter | ||
.desc = Lecter c 3мя магазинами. | ||
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 | ||
.desc = XM1014 c пачкой патронов дроби. | ||
ent-ClothingBackpackDuffelWeaponShotgun12Filled = Набор LAW-12 | ||
.desc = LAW-12 c пачкой патронов дроби. | ||
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 боевых медипена каждого. |
5 changes: 0 additions & 5 deletions
5
Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/belt.ftl
This file was deleted.
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/effects/puddle.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ent-Footstep = Footstep | ||
.desc = Trace of liquid | ||
ent-DragMark = drag mark | ||
ent-Footstep = след | ||
.desc = След из жидкости. | ||
ent-DragMark = мазня | ||
.desc = { ent-Footstep.desc } |
11 changes: 0 additions & 11 deletions
11
.../ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl
This file was deleted.
Oops, something went wrong.
4 changes: 0 additions & 4 deletions
4
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/effects/footstep.ftl
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.