Skip to content

[TWEAK] Возвращение возможностей ЕМАГ, переработка взломщика доступов #2645

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

Open
JackTalentedCoder wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[TWEAK] Возвращение возможностей ЕМАГ, переработка взломщика доступов #2645

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35cb35c
Ревёрт изменений ЕМАГа. Переработка взломщика доступов во что-то другое
JackTalentedCoder Mar 19, 2026
dd94b6a
Как это блять произошло?
JackTalentedCoder Mar 19, 2026
ec3ecbf
Update uplink-catalog.ftl
JackTalentedCoder Mar 19, 2026
c18367d
снижаю цену ЕМАГа но не на сильно
JackTalentedCoder Mar 19, 2026
4afdb1f
Снижаю цену и ЕХАКУ
JackTalentedCoder Mar 19, 2026
6e9270d
Фикс локали
JackTalentedCoder Mar 20, 2026
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
7 changes: 6 additions & 1 deletion Resources/Locale/ru-RU/ADT/Objects/Tools/emag.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
ent-ADTEmagHandMade = модифицированная ID карта
.desc = Выглядит как айди карта, к которой привязали мультитул, бумагу, а так же ещё несколько инструментов. Пахнет довольно красновато.

ent-ADTEhackUnlimited = криптографический модулятор
.desc = Устройство, способное взламывать приборы, автоматы, боргов, но не доступы. Младший брат стандартного EMAG, он же EHACK.
.suffix = Неограниченный
ent-ADTEhack = { ent-ADTEhackUnlimited }
.desc = { ent-ADTEhackUnlimited.desc }
.suffix = Ограниченный
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,3 +290,6 @@ uplink-clothing-no-sound-shoes-desc = Ботинки-хамелеоны с ос

uplink-clothing-super-shoes-name = Продвинутые ботинки-хамелеоны
uplink-clothing-super-shoes-desc = Ботинки-хамелеоны, обеспечивающие и бесшумную ходьбу, и защиту от поскальзывания.

uplink-ehack-name = Криптографический модулятор
uplink-ehack-desc = Он же EHACK. Младший брат EMAG. Устройство, способное взламывать различные станционные устройства. Перезаряжается автоматически.
4 changes: 2 additions & 2 deletions ...urces/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ ent-BorgModuleAdvancedClowning = продвинутый клоунский мо
ent-BorgModuleSyndicateWeapon = оружейный модуль киборга
.desc = { ent-BaseBorgModule.desc }
ent-BorgModuleOperative = оперативный модуль киборга
.desc = Модуль, в который входят монтировка,"Емаг", взломщик доступа и пинпоинтер Синдиката.
.desc = Модуль, в который входят монтировка,"Емаг", EMAG и пинпоинтер Синдиката.
Copy link
Collaborator

@Red-Lis Red-Lis Mar 20, 2026

Choose a reason for hiding this comment

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

Входят монтировка, "Емаг", EMAG
Зачем об одном два раза-то?

Copy link
Collaborator Author

@JackTalentedCoder JackTalentedCoder Mar 20, 2026

Choose a reason for hiding this comment

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

Изменено

ent-BorgModuleEsword = модуль киборга c энергомечом
.desc = Модуль, в который входит энергетический меч.
ent-BorgModuleDoubleEsword = модуль киборга с двухклинковым энергомечом
Expand All @@ -102,7 +102,7 @@ ent-XenoborgModuleBasic = базовый модуль ксеноборга
.desc = Необходимые вещи для любого ксеноборга.
ent-XenoborgModuleTool = инструментальный модуль ксеноборга
.desc = Простые инструменты для большинства ксеноборгов.
ent-XenoborgModuleAccessBreaker = модуль ксеноборга с взломщиком доступа
ent-XenoborgModuleAccessBreaker = модуль ксеноборга с криптографическим секвенсером
Copy link
Contributor

@coderabbitai coderabbitai bot Mar 20, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

Унифицируйте написание термина «секвенсор».

На Line 105 используется форма «секвенсером», тогда как в EMAG-локали проекта используется «секвенсор/секвенсором».

Предлагаемая правка 
-ent-XenoborgModuleAccessBreaker = модуль ксеноборга с криптографическим секвенсером
+ent-XenoborgModuleAccessBreaker = модуль ксеноборга с криптографическим секвенсором

As per coding guidelines "**/*.ftl: ... делай акцент только на орфографии. И ищи ошибки в текстах или словах и всё".

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In
`@Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl`
at line 105, Строка с ключом ent-XenoborgModuleAccessBreaker использует
несоответствующую форму «секвенсером» — приведи термин в соответствие с
проектной EMAG-локалью, заменив «секвенсером» на унифицированную форму
«секвенсором» в значении строки (обнови значение после равно, оставив остальной
текст без изменений).

.desc = Модуль с разрушителем аутентификации.
ent-XenoborgModuleFireExtinguisher = огнетушащий модуль ксеноборга
.desc = Модуль с самозаполняющимся огнетушителем.
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/ADT/Catalog/uplink_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,3 +971,16 @@
blacklist:
tags:
- NukeOpsUplink

- type: listing
id: UplinkEhack
name: uplink-ehack-name
description: uplink-ehack-desc
Comment on lines +976 to +978
Copy link
Contributor

@coderabbitai coderabbitai bot Mar 20, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
rg -n '^(uplink-ehack-name|uplink-ehack-desc)\s*=' Resources/Locale

Repository: AdventureTimeSS14/space_station_ADT

Length of output: 425

Добавьте en-US локаль для uplink-ehack-*.

Ключи uplink-ehack-name и uplink-ehack-desc добавлены только в Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl, но отсутствуют в English локализации. Без них клиенты на английском языке увидят сырые ключи в магазине. Добавьте соответствующие строки в Resources/Locale/en-US/ADT/prototypes/Catalog/store/uplink-catalog.ftl.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@Resources/Prototypes/ADT/Catalog/uplink_catalog.yml` around lines 976 - 978,
Добавьте английские локализованные строки для записи с id UplinkEhack: создайте
в en-US локализации соответствующие ключи uplink-ehack-name и uplink-ehack-desc
(те же ключи, что в ru-RU), и заполните их человекочитаемыми английскими
значениями в файле локализации для ADT prototypes Catalog/store uplink-catalog
(English locale).

productEntity: ADTEhack
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 2 # ADT-Tweak
cost:
Telecrystal: 3 # ADT-Tweak
categories:
- UplinkDisruption
23 changes: 23 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Tools/e_modular.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
parent: [BaseItem, BaseSyndicateContraband]
id: ADTEhackUnlimited
suffix: Unlimited
name: Cryptographic Modulator
description: Little brother of the EMAG. Specialized to bypass machines, borgs, but not access.
components:
- type: Emag
- type: Sprite
sprite: Objects/Tools/access_breaker.rsi
state: icon
- type: Item
sprite: Objects/Tools/access_breaker.rsi

- type: entity
parent: ADTEhackUnlimited
id: ADTEhack
suffix: Limited
components:
- type: LimitedCharges
- type: AutoRecharge
- type: StaticPrice
price: 2000
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/thief_toolbox_sets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
- RadioJammer
- TraitorCodePaper
- Emag
- AccessBreaker
# - AccessBreaker # ADT-Tweak - Удалён взломщик доступов
- Lighter
- CigPackSyndicate
- Telecrystal10 #The thief cannot use them, but it may induce communication with traitors
Expand Down
30 changes: 15 additions & 15 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,19 +955,19 @@
- UplinkDeception

# Disruption

- type: listing
id: UplinkAccessBreaker
name: uplink-access-breaker-name
description: uplink-access-breaker-desc
productEntity: AccessBreaker
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
- UplinkDisruption
# ADT-Tweak: Вместо взламывателя доступов - криптографический модулятор
# - type: listing
# id: UplinkAccessBreaker
# name: uplink-access-breaker-name
# description: uplink-access-breaker-desc
# productEntity: AccessBreaker
# discountCategory: rareDiscounts
# discountDownTo:
# Telecrystal: 2
# cost:
# Telecrystal: 4
# categories:
# - UplinkDisruption
Comment on lines +958 to +970
Copy link
Contributor

@coderabbitai coderabbitai bot Mar 20, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

Оберните этот отключённый листинг в ADT-Tweak-Start/End.

Для многострочного изменения вне /ADT/ одного # ADT-Tweak: перед блоком недостаточно. Тут нужен стандартный start/end-маркер, чтобы изменение не потерялось при подтягивании апстрима.

💡 Пример оформления 
-# ADT-Tweak: Вместо взламывателя доступов - криптографический модулятор
+# ADT-Tweak-Start
+# Вместо взламывателя доступов - криптографический модулятор
 # - type: listing
 #   id: UplinkAccessBreaker
 #   name: uplink-access-breaker-name
 #   description: uplink-access-breaker-desc
 #   productEntity: AccessBreaker
 #   discountCategory: rareDiscounts
 #   discountDownTo:
 #     Telecrystal: 2
 #   cost:
 #     Telecrystal: 4
 #   categories:
 #   - UplinkDisruption
+# ADT-Tweak-End
As per coding guidelines: `**/*.yml`: Все изменения вне папок `/ADT/` должны быть прокомментированы примерно так `# ADT-Tweak-Start` / `# ADT-Tweak-End`.
📝 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
# ADT-Tweak: Вместо взламывателя доступов - криптографический модулятор
# - type: listing
# id: UplinkAccessBreaker
# name: uplink-access-breaker-name
# description: uplink-access-breaker-desc
# productEntity: AccessBreaker
# discountCategory: rareDiscounts
# discountDownTo:
# Telecrystal: 2
# cost:
# Telecrystal: 4
# categories:
# - UplinkDisruption
# ADT-Tweak-Start
# Вместо взламывателя доступов - криптографический модулятор
# - type: listing
# id: UplinkAccessBreaker
# name: uplink-access-breaker-name
# description: uplink-access-breaker-desc
# productEntity: AccessBreaker
# discountCategory: rareDiscounts
# discountDownTo:
# Telecrystal: 2
# cost:
# Telecrystal: 4
# categories:
# - UplinkDisruption
# ADT-Tweak-End
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@Resources/Prototypes/Catalog/uplink_catalog.yml` around lines 958 - 970, Wrap
the disabled listing block that starts with the ADT-Tweak comment for
UplinkAccessBreaker in the standard start/end markers: insert a comment line "#
ADT-Tweak-Start" immediately before the "# ADT-Tweak: ..." line and a comment
line "# ADT-Tweak-End" immediately after the closing of that YAML block so the
entire UplinkAccessBreaker listing is enclosed; keep the existing inline
comments and indentation intact and ensure both markers use the exact text
"ADT-Tweak-Start" and "ADT-Tweak-End".


- type: listing
id: UplinkEmag
Expand All @@ -976,9 +976,9 @@
productEntity: Emag
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 2 # ADT-Tweak
Telecrystal: 5 # ADT-Tweak
cost:
Telecrystal: 3 # ADT-Tweak
Telecrystal: 7 # ADT-Tweak
categories:
- UplinkDisruption

Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: BaseBorgModule
parent: BaseItem
name: borg module
Expand Down Expand Up @@ -1282,7 +1282,7 @@
parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
id: BorgModuleOperative
name: operative cyborg module
description: A module that comes with a crowbar, an Emag, an Access Breaker and a syndicate pinpointer.
description: A module that comes with a crowbar, an Emag, an EMAG and a syndicate pinpointer.
Copy link
Contributor

@coderabbitai coderabbitai bot Mar 20, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Добавьте ADT-Tweak маркировку к изменённым строкам вне /ADT/.

На Line 1285 и Line 1498-1499 изменения внесены без ADT-Tweak-комментариев, хотя файл находится вне /ADT/.

Пример минимальной правки 
+  # ADT-Tweak: updated operative module description after AccessBreaker removal
   description: A module that comes with a crowbar, an Emag, an EMAG and a syndicate pinpointer.
...
+  # ADT-Tweak: switched Xenoborg access breaker module text to EMAG
   name: EMAG xenoborg module
   description: Module with a EMAG.

As per coding guidelines "**/*.yml: Все изменения вне папок /ADT/ должны быть прокомментированы ...".

Also applies to: 1498-1499

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml` at
line 1285, The changed YAML description line "description: A module that comes
with a crowbar, an Emag, an EMAG and a syndicate pinpointer." (and the other
modified entries around the same item referenced by the subsequent changes) are
outside the /ADT/ folder and thus must be annotated with an ADT-Tweak comment;
update those modified lines to include the ADT-Tweak marker/comment format used
across the repo (add the ADT-Tweak comment immediately above or inline with the
changed key(s) for the module entry), and do the same for the other two modified
lines referenced (the two other changed entries near the same module) so every
non-/ADT/ change is accompanied by an ADT-Tweak comment.

components:
- type: Sprite
layers:
Expand All @@ -1292,7 +1292,7 @@
hands:
- item: Crowbar
- item: Emag
- item: AccessBreaker
# - item: AccessBreaker # ADT tweak
- item: PinpointerSyndicateNuclear
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-operative-module }
Expand Down Expand Up @@ -1495,16 +1495,16 @@
- type: entity
parent: [ BaseXenoborgModuleEngi, BaseProviderBorgModule, BaseXenoborgContraband ]
id: XenoborgModuleAccessBreaker
name: access breaker xenoborg module
description: Module with a access breaker.
name: EMAG xenoborg module
description: Module with a EMAG.
Copy link
Contributor

@coderabbitai coderabbitai bot Mar 20, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

Исправьте артикль в английском описании.

На Line 1499 должно быть an EMAG, а не a EMAG.

Предлагаемая правка 
-  description: Module with a EMAG.
+  description: Module with an EMAG.
📝 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
description: Module with a EMAG.
description: Module with an EMAG.
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml` at
line 1499, The English article in the description field is incorrect: change the
string "Module with a EMAG." to "Module with an EMAG." in the borg_modules.yml
entry where the description key contains that value (search for the description
key with "Module with a EMAG." and replace the leading article "a" with "an").

components:
- type: Sprite
layers:
- state: xenoborg_engi
- state: icon-xenoborg-access-breaker
- type: ItemBorgModule
hands:
- item: AccessBreaker
- item: Emag # ADT-Tweak
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-access-breaker-module }

Expand Down
49 changes: 25 additions & 24 deletions Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
- type: entity
parent: [BaseItem, BaseSyndicateContraband]
id: AccessBreakerUnlimited
suffix: Unlimited
name: authentication disruptor
description: A hacked access configurator, specialized to unlock and erase access from digital locks.
components:
- type: Emag
emagImmuneTag: AccessBreakerImmune
emagType: Access
- type: Sprite
sprite: Objects/Tools/access_breaker.rsi
state: icon
- type: Item
sprite: Objects/Tools/access_breaker.rsi
# ADT-Tweak - Удалён нахуй взломщик доступов. За место него кое что другое
# - type: entity
# parent: [BaseItem, BaseSyndicateContraband]
# id: AccessBreakerUnlimited
# suffix: Unlimited
# name: authentication disruptor
# description: A hacked access configurator, specialized to unlock and erase access from digital locks.
# components:
# - type: Emag
# emagImmuneTag: AccessBreakerImmune
# emagType: Access
# - type: Sprite
# sprite: Objects/Tools/access_breaker.rsi
# state: icon
# - type: Item
# sprite: Objects/Tools/access_breaker.rsi

- type: entity
parent: AccessBreakerUnlimited
id: AccessBreaker
suffix: Limited
components:
- type: LimitedCharges
- type: AutoRecharge
- type: StaticPrice
price: 2000
# - type: entity
# parent: AccessBreakerUnlimited
# id: AccessBreaker
# suffix: Limited
# components:
# - type: LimitedCharges
# - type: AutoRecharge
# - type: StaticPrice
# price: 2000
Comment on lines +1 to +26
Copy link
Contributor

@coderabbitai coderabbitai bot Mar 20, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

Оформите этот закомментированный прототип как полноценный ADT-Tweak-блок.

Сейчас это многострочное изменение вне /ADT/, но помечена только первая строка. Для таких отключений здесь нужны # ADT-Tweak-Start / # ADT-Tweak-End, иначе границы правки теряются при апстрим-мержах.

As per coding guidelines: **/*.yml: Все изменения вне папок /ADT/ должны быть прокомментированы примерно так # ADT-Tweak-Start / # ADT-Tweak-End.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml` around lines
1 - 26, The commented prototype block for AccessBreakerUnlimited and
AccessBreaker is missing the required ADT-Tweak boundary markers; wrap the
entire multi-line commented section (the lines that define
AccessBreakerUnlimited and AccessBreaker) with a `# ADT-Tweak-Start` comment
above and a `# ADT-Tweak-End` comment below so the tweak is treated as a single
ADT-Tweak block during merges; keep the existing comments and content intact but
add the start/end markers around the whole commented YAML section (references:
AccessBreakerUnlimited, AccessBreaker).

1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Tools/emag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
description: The all-in-one hacking solution. Friend of any syndicate. The iconic EMAG.
components:
- type: Emag
emagType: All # ADT-Tweak - ревёртаю нахуй емаг.
- type: Sprite
sprite: Objects/Tools/emag.rsi
state: icon
Expand Down
2 changes: 1 addition & 1 deletion Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
Этот вредоносный инструмент полностью отключает все считыватели идентификационных карт, подключенные к устройству.

<Box>
<GuideEntityEmbed Entity="AccessBreaker"/>
<GuideEntityEmbed Entity="Emag"/>
</Box>

Чтобы устранить повреждение, обычно требуется частично разобрать устройство и реконструировать его.
Expand Down
Loading