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.

Sign up for GitHub

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

Syndies & Salvagers update #314

Merged
merged 8 commits into from
Nov 3, 2024
Merged

Syndies & Salvagers update #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d6f03fd
Syndies & Salvager update
MegaDaimond Nov 1, 2024
4469e38
Merge branch 'master' into Syndies-stuff
MegaDaimond Nov 1, 2024
1cee8f7
Update LPPsmg.yml
MegaDaimond Nov 1, 2024
6b04b13
Merge branch 'Syndies-stuff' of https://github.com/MegaDaimond/Lost-O…
MegaDaimond Nov 1, 2024
659c0ac
Merge branch 'master' into Syndies-stuff
MegaDaimond Nov 1, 2024
eef8e1c
Merge branch 'master' into Syndies-stuff
BL02DL Nov 2, 2024
e301e2d
ы
MegaDaimond Nov 2, 2024
cf5d4dd
Merge branch 'master' into Syndies-stuff
MegaDaimond Nov 3, 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
4 changes: 4 additions & 0 deletions ...rces/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/duffelbags.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ ent-LPPBackpackDuffelIncendiaryGrenadeDelta = Duffel bag with incendiary grenade
.desc = Contains five incendiary grenades
ent-LPPClothingBackpackDuffelAcientSyndicateHardsuitBundle = Ancient syndicate hardsuit bundle
.desc = Contains ancient syndicate hardsuit bundle
ent-LPPClothingBackpackDuffelContractorSyndicateHardsuitBundle = Contractor syndicate hardsuit bundle
.desc = Contains contractor syndicate hardsuit bundle
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPClothingBackpackDuffelSyndicateOperative = contractor duffelbag
.desc = { ent-LPPClothingBackpackDuffelContractor.desc }
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/neck.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ent-ClothingBeltSyndieHolsterBundle = { ent-ClothingBeltSyndieHolster }
.suffix = LoneOps
.desc = { ent-ClothingBeltSyndieHolster.desc }
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/Hardsuits.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-LPPCrateLogisticsRodosHardsuit = Rodos hardsuit crate
.desc = Contains a single HpI-20a+ "Rodos" hardsuit.
ent-LPPCrateLogisticsKerateiaHardsuit = Kerateia hardsuit crate
.desc = Contains a single HpI-20a+ "Kerateia" hardsuit.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/back/duffel.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ ent-LPPClothingBackpackDuffelDelta = delta duffel bag
.desc = { ent-ClothingBackpackDuffel.desc }
ent-LPPClothingBackpackDuffelCommandDelta = command delta duffel bag
.desc = { ent-ClothingBackpackDuffel.desc }
ent-LPPClothingBackpackDuffelContractor = contractor duffel bag
.desc = { ent-ClothingBackpackDuffel.desc }
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions .../Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/glasses/glasses.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ ent-LPPClothingEyesGlassesNVG = PG nightvision goggles
.desc = Useful for special operations.
ent-LPPClothingEyesGlassesAviatorNPZ = NPZ aviators
.desc = Only for the most coolest guys in this sector.
ent-LPPClothingEyesGlassesContractor = Contractor glasses
.desc = Glasses, that provides protection from flashes and secure wearers eyes from wielding.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 8 additions & 0 deletions .../Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,11 @@ ent-LPPClothingHeadHelmetHardsuitIICCommand = IIC exosuit helmet
.desc = { ent-ClothingHeadHardsuitWithLightBase.desc }
ent-LPPClothingHeadHelmetHardsuitIICEngineer = Engineer IIC exosuit helmet
.desc = { ent-ClothingHeadHardsuitWithLightBase.desc }
ent-LPPClothingHeadHelmetHardsuitInteq = INT-05Q helmet
.desc = Stury helmet that offers flash protection for your eyes. It has two modes, just for style.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPClothingHeadHelmetHardsuitUpgradedMining = HpI-20b helmet
.desc = Good helmet for every needs.
ent-LPPClothingHeadHelmetHardsuitMiningPlus = HpI-20a+ helmet
.desc = Good helmet for every needs.
ent-LPPClothingHeadHelmetHardsuitMiningJuggernaut = HpIP-22 helmet
.desc = Good helmet for every needs.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/mask/mask.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@ ent-LPPBlueShieldClothingMaskGas = Gas mask of officer "Blue Shield"
.desc = Elite gas mask of officer "Blue Shield".
ent-LPPClothingMaskPGWrittenOff = Decommissioned balaclava PG
.desc = A decommissioned balaclava that was used by PG soldiers.
ent-LPPClothingMaskNeckGaiterLoneOps = neck gaiter
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
.desc = Stylish neck gaiter for your neck, can protect from the cosmic wind and even some projectiles.
.suffix = LoneOps
8 changes: 8 additions & 0 deletions ...cale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,11 @@ ent-LPPClothingOuterHardsuitRND = Hardsuit RHS-14s - "Lambda"
.desc = The protective suit, developed by braines from the RND, is easy to produce, and also provides, in general, good protection from various external factors, which can be found when working in RND.
ent-LPPClothingOuterHardsuitScienceNPZ = Hardsuit NPZ-34r - "Gelehrt"
.desc = A research spacesuit designed for the work of NPZ scientists, as well as technicians in outer space and harsh planetary conditions.
ent-LPPClothingOuterHardsuitInteq = Hardsuit INT-05Q - "Lochern"
.desc = A sturdy spacesuit for close quarters combat, it's generally pretty versatile. Painted in a glossy brown color.
ent-LPPClothingOuterHardsuitUpgradedMining = Hardsuit HpI-20b "Kerateia"
.desc = Hephaestus Industries porotype spacesuit designed for salvagers usage in low-pressure environments. Marked to indicate that this model has protection against most types of exposure. Looks not so heavy.
Comment on lines +37 to +38
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Опечатка в слове "prototype"

В описании обнаружена опечатка в слове "porotype", что может затруднить перевод и понимание текста.

Примените следующие изменения:

-    .desc = Hephaestus Industries porotype spacesuit designed for salvagers usage in low-pressure environments.
+    .desc = Hephaestus Industries prototype spacesuit designed for salvagers usage in low-pressure environments.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
ent-LPPClothingOuterHardsuitUpgradedMining = Hardsuit HpI-20b "Kerateia"
.desc = Hephaestus Industries porotype spacesuit designed for salvagers usage in low-pressure environments. Marked to indicate that this model has protection against most types of exposure. Looks not so heavy.
ent-LPPClothingOuterHardsuitUpgradedMining = Hardsuit HpI-20b "Kerateia"
.desc = Hephaestus Industries prototype spacesuit designed for salvagers usage in low-pressure environments. Marked to indicate that this model has protection against most types of exposure. Looks not so heavy.

ent-LPPClothingOuterHardsuitMiningPlus = Hardsuit HpI-20a+ "Rodos"
.desc = Hephaestus Industries upgraded hardsuit, providing more protection from blunt and slash damages, sacrificing protection from piercing damage. Marked to indicate that this model has protection against most types of exposure. Looks pretty light.
ent-LPPClothingOuterHardsuitMiningJuggernaut = Hardsuit HpIP-22 "Argos"
.desc = Hephaestus Industries juggernaut hardsuit, providing lots of protection from different types of damages. It's desined to work in most harsh enviroments. Looks so heavy...
Comment on lines +35 to +42
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Рекомендация по структуре описаний

Для улучшения согласованности локализации рекомендуется использовать более единообразную структуру описаний для всей серии костюмов Hephaestus Industries.

Предлагаю следующий формат для описаний:

  • Сначала указывать производителя
  • Затем основное назначение
  • В конце особенности и характеристики

Пример структуры:

.desc = Защитный костюм производства Hephaestus Industries. [назначение]. [особенности].

Comment on lines +41 to +42
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Опечатки в описании Argos

В описании костюма Argos обнаружены опечатки в словах "desined" и "enviroments".

Примените следующие изменения:

-    .desc = Hephaestus Industries juggernaut hardsuit, providing lots of protection from different types of damages. It's desined to work in most harsh enviroments. Looks so heavy...
+    .desc = Hephaestus Industries juggernaut hardsuit, providing lots of protection from different types of damages. It's designed to work in most harsh environments. Looks so heavy...
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
ent-LPPClothingOuterHardsuitMiningJuggernaut = Hardsuit HpIP-22 "Argos"
.desc = Hephaestus Industries juggernaut hardsuit, providing lots of protection from different types of damages. It's desined to work in most harsh enviroments. Looks so heavy...
ent-LPPClothingOuterHardsuitMiningJuggernaut = Hardsuit HpIP-22 "Argos"
.desc = Hephaestus Industries juggernaut hardsuit, providing lots of protection from different types of damages. It's designed to work in most harsh environments. Looks so heavy...

2 changes: 2 additions & 0 deletions ...es/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,5 @@ ent-LPPClothingUniformRedTracksuit = red tracksuit
.desc = red tracksuit for sports in any situation.
ent-LPPClothingUniformGreenTracksuit = green tracksuit
.desc = greeb tracksuit for sports in any situation.
ent-LPPClothingUniformJumpsuitInteq = contractor jumpsuit
.desc = Elite clothing for elite mercs.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 0 additions & 8 deletions ...ale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
ent-LPPCandy = candy
.desc = This is my kingdom come, this is my kingdom come...
ent-LPPCandy2 = { ent-LPPCandy }
.desc = { ent-LPPCandy.desc }
ent-LPPCandy3 = { ent-LPPCandy }
.desc = { ent-LPPCandy.desc }
ent-LPPCandy4 = { ent-LPPCandy }
.desc = { ent-LPPCandy.desc }
ent-LPPLolipop = lolipop
.desc = This is my kingdom come, this is my kingdom come...
8 changes: 4 additions & 4 deletions ...le/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ent-HalloweenTree01 = dead tree
ent-LPPHalloweenTree01 = dead tree
.desc = Dead tree with leaves on it, looks creepy.
ent-HalloweenTree02 = dead tree
ent-LPPHalloweenTree02 = dead tree
.desc = Dead tree with leaves on it, looks creepy.
ent-HalloweenTree03 = dead tree
ent-LPPHalloweenTree03 = dead tree
.desc = Dead tree with leaves on it, looks creepy.
ent-HalloweenTree04 = dead tree
ent-LPPHalloweenTree04 = dead tree
.desc = Dead tree with leaves on it, looks creepy.
12 changes: 12 additions & 0 deletions ...s/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
ent-LPPPSpiderDeco = spiders
.desc = Fake spiders that look like they're ready to bite you.
ent-LPPPumpkinDeco = pumpkin
.desc = Small decorative pumpkin with brush marks on it
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPPumpkinBigDeco = pumpkin
.desc = Decorative pumpkins with brush marks on it
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPPottedPlantHalloween1 = { ent-PottedPlantBase }
.desc = Withered houseplant, looks dead.
ent-LPPPottedPlantHalloween2 = { ent-LPPPottedPlantHalloween1 }
.desc = { ent-LPPPottedPlantHalloween1.desc }
ent-LPPPottedPlantHalloween3 = { ent-LPPPottedPlantHalloween1 }
.desc = { ent-LPPPottedPlantHalloween1.desc }
ent-LPPPottedPlantHalloween4 = { ent-LPPPottedPlantHalloween1 }
.desc = { ent-LPPPottedPlantHalloween1.desc }
2 changes: 1 addition & 1 deletion ...totypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazine/rifle/LPPMags.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ent-LPPMagazineRifleM4A1Rubber = Magazine (calibre 5,56x45 rubber)
.desc = { ent-LPPBaseMagazineRifle.desc }
ent-LPPMagazineRifleM4A1Practice = Magazine (calibre 5,56x45 practice)
.desc = { ent-LPPBaseMagazineRifle.desc }
ent-LPPagazineRifleM4A1Uranium = Magazine (calibre 5,56x45 uranium)
ent-LPPMagazineRifleM4A1Uranium = Magazine (calibre 5,56x45 uranium)
.desc = { ent-LPPBaseMagazineRifle.desc }
ent-LPPMagazineRifleMars = Magazine from rifle "Mars"
.desc = { ent-BaseItem.desc }
Expand Down
4 changes: 4 additions & 0 deletions ...rces/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/duffelbags.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ ent-LPPBackpackDuffelIncendiaryGrenadeDelta = Вещвещмешок с зажи
.desc = Содержит 5 зажигательных гранат
ent-LPPClothingBackpackDuffelAcientSyndicateHardsuitBundle = Набор древнего скафандра
.desc = Содержит набор с древним скафандром.
ent-LPPClothingBackpackDuffelContractorSyndicateHardsuitBundle = Набор скафандра контрактника
.desc = Содержит набор скафандра контрактника
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPClothingBackpackDuffelSyndicateOperative = Вещмешок контрактника
.desc = { ent-LPPClothingBackpackDuffelContractor.desc }
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/neck.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ent-ClothingBeltSyndieHolsterBundle = { ent-ClothingBeltSyndieHolster }
.suffix = Лонопс
.desc = { ent-ClothingBeltSyndieHolster.desc }
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/Hardsuits.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-LPPCrateLogisticsRodosHardsuit = Ящик со скафандром HpI-20a+ "Rodos"
.desc = Содержит один скафандр HpI-20a+ "Rodos".
ent-LPPCrateLogisticsKerateiaHardsuit = Ящик со скафандром HpI-20a+ "Kerateia"
.desc = Содержит один скафандр HpI-20a+ "Kerateia".
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/duffel.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ ent-LPPClothingBackpackDuffelDelta = Спортивная сумка "Дельт
.desc = { ent-ClothingBackpackDuffel.desc }
ent-LPPClothingBackpackDuffelCommandDelta = Спортивная сумка командира "Дельта"
.desc = { ent-ClothingBackpackDuffel.desc }
ent-LPPClothingBackpackDuffelContractor = Вещмешок контрактника
.desc = { ent-ClothingBackpackDuffel.desc }
2 changes: 2 additions & 0 deletions .../Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/glasses/glasses.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ ent-LPPClothingEyesGlassesNVG = ПНВ ПГ
.desc = Помогают лучше видеть в ночи. Полезно для Специальных операций.
ent-LPPClothingEyesGlassesAviatorNPZ = НПЗ Авиаторы
.desc = Только для самых крутых парней в этом секторе.
ent-LPPClothingEyesGlassesContractor = Очки контрактника
.desc = Очки, обеспечивающие защиту от вспышек и предохраняющие глаза пользователя от сварки.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 8 additions & 0 deletions .../Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,11 @@ ent-LPPClothingHeadHelmetHardsuitIICCommand = Шлем экзоскелета И
.desc = { ent-ClothingHeadHardsuitWithLightBase.desc }
ent-LPPClothingHeadHelmetHardsuitIICEngineer = Шлем экзоскелета инженера ИРЦ
.desc = { ent-ClothingHeadHardsuitWithLightBase.desc }
ent-LPPClothingHeadHelmetHardsuitInteq = Шлем INT-05Q
.desc = Шлем Stury, который обеспечивает защиту глаз от вспышек. У него есть два режима, просто для стиля.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPClothingHeadHelmetHardsuitUpgradedMining = Шлем HpI-20b
.desc = Хороший шлем для любых нужд.
ent-LPPClothingHeadHelmetHardsuitMiningPlus = Шлем HpI-20a+
.desc = Хороший шлем для любых нужд.
ent-LPPClothingHeadHelmetHardsuitMiningJuggernaut = Шлем HpIP-22
.desc = Хороший шлем для любых нужд.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/mask/mask.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,6 @@ ent-LPPBlueShieldClothingMaskGas = Противогаз офицера "сини
.desc = Элитный противогаз офицера "синий щит".
ent-LPPClothingMaskPGWrittenOff = Списанная балаклава ПГ
.desc = Списанная балаклава которая использовалась солдатами ПГ.
ent-LPPClothingMaskNeckGaiterLoneOps = шейный гетр
.desc = Стильный гетр для шеи, способный защитить от космического ветра и даже некоторых снарядов.
.suffix = Лонопс
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 8 additions & 0 deletions ...cale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,11 @@ ent-LPPClothingOuterHardsuitRND = Скафандр RHS-14s - "Lambda"
.desc = Защитный скафандр, разработанный головастиками из отдела НИО, лёгкий для производства, а так же предоставляющий, в целом, хорошую защиту от разных внешних факторов, что можно встретить при работе в НИО.
ent-LPPClothingOuterHardsuitScienceNPZ = Скафандр NPZ-34r - "Gelehrt"
.desc = Научно исследовательский скафандр, разработанный для работы учёных НПЗ, а так же техников в открытом космосе и тяжёлых условиях планет.
ent-LPPClothingOuterHardsuitInteq = Боевой скафандр INT-05Q - "Lochern"
.desc = Прочный скафандр для ближнего боя, в целом довольно универсальный. Окрашен в глянцевый коричневый цвет.
Comment on lines +37 to +38
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Рекомендуется уточнить описание защитных свойств

В описании скафандра "Lochern" используется размытая формулировка "довольно универсальный". Желательно конкретизировать защитные свойства для лучшего понимания игроками.

-    .desc = Прочный скафандр для ближнего боя, в целом довольно универсальный. Окрашен в глянцевый коричневый цвет.
+    .desc = Прочный скафандр для ближнего боя, обеспечивающий сбалансированную защиту от механических и энергетических повреждений. Окрашен в глянцевый коричневый цвет.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
ent-LPPClothingOuterHardsuitInteq = Боевой скафандр INT-05Q - "Lochern"
.desc = Прочный скафандр для ближнего боя, в целом довольно универсальный. Окрашен в глянцевый коричневый цвет.
ent-LPPClothingOuterHardsuitInteq = Боевой скафандр INT-05Q - "Lochern"
.desc = Прочный скафандр для ближнего боя, обеспечивающий сбалансированную защиту от механических и энергетических повреждений. Окрашен в глянцевый коричневый цвет.

ent-LPPClothingOuterHardsuitUpgradedMining = скафандр HpI-20b "Kerateia"
.desc = Портотип космического скафандра Hephaestus Industries, предназначенный для использования спасателями в условиях низкого давления. Маркировка указывает на то, что эта модель защищает от большинства видов воздействия. Выглядит не очень тяжелым.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPClothingOuterHardsuitMiningPlus = Скафандр HpI-20a+ "Rodos"
.desc = Модернизированный скафандр от Hephaestus Industries, обеспечивающий повышенную защиту от тупых и режущих повреждений, но не дающий защиты от колющих повреждений. Маркировка указывает на то, что эта модель защищает от большинства видов воздействия. Выглядит довольно легким.
Comment on lines +41 to +42
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Исправьте опечатку в описании

В описании скафандра "Rodos" присутствует опечатка.

-    .desc = Модернизированный скафандр от Hephaestus Industries, обеспечивающий повышенную защиту от тупых и режущих повреждений, но не дающий защиты от колющих повреждений. Маркировка указывает на то, что эта модель защищает от большинства видов воздействия. Выглядит довольно легким.
+    .desc = Модернизированный скафандр от Hephaestus Industries, обеспечивающий повышенную защиту от тупых и режущих повреждений, но не дающий защиты от колющих повреждений. Маркировка указывает на то, что эта модель защищает от большинства видов воздействия. Выглядит довольно лёгким.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
ent-LPPClothingOuterHardsuitMiningPlus = Скафандр HpI-20a+ "Rodos"
.desc = Модернизированный скафандр от Hephaestus Industries, обеспечивающий повышенную защиту от тупых и режущих повреждений, но не дающий защиты от колющих повреждений. Маркировка указывает на то, что эта модель защищает от большинства видов воздействия. Выглядит довольно легким.
ent-LPPClothingOuterHardsuitMiningPlus = Скафандр HpI-20a+ "Rodos"
.desc = Модернизированный скафандр от Hephaestus Industries, обеспечивающий повышенную защиту от тупых и режущих повреждений, но не дающий защиты от колющих повреждений. Маркировка указывает на то, что эта модель защищает от большинства видов воздействия. Выглядит довольно лёгким.

ent-LPPClothingOuterHardsuitMiningJuggernaut = Скафандр HpIP-22 "Argos"
.desc = Защитный костюм джаггернаута от Hephaestus Industries, обеспечивающий надежную защиту от различных видов повреждений. Он предназначен для работы в самых суровых условиях. Выглядит таким тяжелым...
Comment on lines +43 to +44
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Улучшите согласованность описания

В описании скафандра "Argos" рекомендуется объединить последнее предложение с основным текстом для лучшей читаемости.

-    .desc = Защитный костюм джаггернаута от Hephaestus Industries, обеспечивающий надежную защиту от различных видов повреждений. Он предназначен для работы в самых суровых условиях. Выглядит таким тяжелым...
+    .desc = Тяжёлый защитный костюм джаггернаута от Hephaestus Industries, обеспечивающий надёжную защиту от различных видов повреждений. Предназначен для работы в самых суровых условиях.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
ent-LPPClothingOuterHardsuitMiningJuggernaut = Скафандр HpIP-22 "Argos"
.desc = Защитный костюм джаггернаута от Hephaestus Industries, обеспечивающий надежную защиту от различных видов повреждений. Он предназначен для работы в самых суровых условиях. Выглядит таким тяжелым...
ent-LPPClothingOuterHardsuitMiningJuggernaut = Скафандр HpIP-22 "Argos"
.desc = Тяжёлый защитный костюм джаггернаута от Hephaestus Industries, обеспечивающий надёжную защиту от различных видов повреждений. Предназначен для работы в самых суровых условиях.

2 changes: 2 additions & 0 deletions ...es/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,5 @@ ent-LPPClothingUniformRedTracksuit = Красный спортивный кос
.desc = Погодите, на нём три полоски?
ent-LPPClothingUniformGreenTracksuit = Зелёный спортивный костюм
.desc = Погодите, на нём три полоски?
ent-LPPClothingUniformJumpsuitInteq = Комбинезон контрактника
.desc = Элитная одежда для элитных наёмников.
2 changes: 1 addition & 1 deletion ...ale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-LPPCandy = конфета
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
.desc = Обычная конфета состоящия из сахара и других вещей
.desc = Обычная конфета состоящия из сахара и других вещей
4 changes: 4 additions & 0 deletions ...s/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
ent-LPPPSpiderDeco = паучки
.desc = Муляжи паучков которые выглядят так, будто готовы вас покусать.
ent-LPPPumpkinDeco = pumpkin
.desc = Small decorative pumpkin with brush marks on it
ent-LPPPumpkinBigDeco = pumpkin
.desc = Decorative pumpkins with brush marks on it
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPPPumpkinDeco = тыква
.desc = Маленькая декоративная тыква.
ent-LPPPPumpkinBigDeco = тыква
Expand Down
2 changes: 1 addition & 1 deletion ...totypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazine/rifle/LPPMags.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ent-LPPMagazineRifleM4A1Rubber = Магазин (калибр 5,56х45 рези
.desc = { ent-LPPBaseMagazineRifle.desc }
ent-LPPMagazineRifleM4A1Practice = Магазин (калибр 5,56х45 учебный)
.desc = { ent-LPPBaseMagazineRifle.desc }
ent-LPPagazineRifleM4A1Uranium = Магазин (калибр 5,56х45 урановый)
ent-LPPMagazineRifleM4A1Uranium = Магазин (калибр 5,56x45 урановый)
.desc = { ent-LPPBaseMagazineRifle.desc }
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPMagazineRifleMars = Обойма винтовки "Марс"
.desc = { ent-BaseItem.desc }
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
sprite: Clothing/Head/Hardsuits/luxury.rsi
state: icon
product: CrateCargoLuxuryHardsuit
cost: 6500
cost: 9000
category: cargoproduct-category-name-cargo
group: market
24 changes: 7 additions & 17 deletions Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi
state: icon
product: CrateEngineeringFotiaHardsuit
cost: 2250
cost: 4500
category: cargoproduct-category-name-hardsuits
group: market

Expand All @@ -15,7 +15,7 @@
sprite: Clothing/OuterClothing/Hardsuits/engineering.rsi
state: icon
product: CrateEngineeringLampsiHardsuit
cost: 2250
cost: 3500
category: cargoproduct-category-name-hardsuits
group: market

Expand All @@ -26,7 +26,7 @@
sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi
state: icon
product: CrateLogisticsKritiHardsuit
cost: 1250
cost: 3000
category: cargoproduct-category-name-hardsuits
group: market

Expand All @@ -36,7 +36,7 @@
sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
state: icon
product: CrateLogisticsLavrionHardsuit
cost: 3500
cost: 9000
category: cargoproduct-category-name-hardsuits
group: market

Expand All @@ -47,16 +47,6 @@
sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
state: icon
product: CrateSecurityShanlinTacsuit
cost: 17500
category: cargoproduct-category-name-hardsuits
group: market

- type: cargoProduct
id: SecurityGuanYuTacsuit
icon:
sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
state: icon
product: CrateSecurityGuanYuTacsuit
cost: 30000
category: cargoproduct-category-name-hardsuits
group: market
Expand All @@ -67,7 +57,7 @@
sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi
state: icon
product: CrateSecurityBaghaturTacsuit
cost: 5000
cost: 7500
category: cargoproduct-category-name-hardsuits
group: market

Expand All @@ -77,7 +67,7 @@
sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi
state: icon
product: CrateSecuritySuldeTacsuit
cost: 7500
cost: 9500
category: cargoproduct-category-name-hardsuits
group: market

Expand All @@ -87,6 +77,6 @@
sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi
state: icon
product: CrateSecurityTsagaanTacsuit
cost: 5500
cost: 8000
category: cargoproduct-category-name-hardsuits
group: market
18 changes: 9 additions & 9 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,15 +1620,15 @@
categories:
- UplinkPointless

# - type: listing # DeltaV - Move cat ears out of syndicate uplink into the AutoDrobe
# id: UplinkCatEars
# name: uplink-cat-ears-name
# description: uplink-cat-ears-desc
# productEntity: ClothingHeadHatCatEars
# cost:
# Telecrystal: 4 # Nyanotrasen - Make Cat Ears 4TC instead of 26TC
# categories:
# - UplinkPointless
- type: listing # DeltaV - Move cat ears out of syndicate uplink into the AutoDrobe
id: UplinkCatEars
name: uplink-cat-ears-name
description: uplink-cat-ears-desc
productEntity: ClothingHeadHatCatEars
cost:
Telecrystal: 4 # Nyanotrasen - Make Cat Ears 4TC instead of 26TC
categories:
- UplinkPointless

- type: listing
id: UplinkOutlawHat
Expand Down
18 changes: 14 additions & 4 deletions Resources/Prototypes/Entities/Clothing/Belt/belts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,26 +591,36 @@
- 0,0,3,1

- type: entity
parent: ClothingBeltStorageBase
parent: ClothingNeckBase
id: ClothingBeltSyndieHolster
name: syndicate shoulder holster
description: A deep shoulder holster capable of holding many types of ballistics.
components:
- type: Sprite
sprite: Clothing/Belt/syndieholster.rsi
sprite: Clothing/Neck/Misc/syndieholster.rsi
- type: Clothing
sprite: Clothing/Belt/syndieholster.rsi
sprite: Clothing/Neck/Misc/syndieholster.rsi
equipSound:
path: /Audio/SimpleStation14/Items/Equip/toolbelt_equip.ogg
- type: Item
size: Ginormous
- type: Storage
maxItemSize: Huge
grid:
- 0,0,3,3
- 0,0,3,4
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
whitelist:
components:
- Gun
- BallisticAmmoProvider
- CartridgeAmmo
- type: UserInterface
interfaces:
- key: enum.StorageUiKey.Key
type: StorageBoundUserInterface
- type: ContainerContainer
containers:
storagebase: !type:Container
ents: []

- type: entity
parent: ClothingBeltStorageBase
Expand Down
Loading
Loading