From 35cb35c7f477839c44361b9ee85ae32168a6c2c1 Mon Sep 17 00:00:00 2001 From: QWERTY <159805128+JackTalentedCoder@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:11:59 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D0=A0=D0=B5=D0=B2=D1=91=D1=80=D1=82=20?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=95?= =?UTF-8?q?=D0=9C=D0=90=D0=93=D0=B0.=20=D0=9F=D0=B5=D1=80=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20=D0=B2=D0=B7=D0=BB=D0=BE?= =?UTF-8?q?=D0=BC=D1=89=D0=B8=D0=BA=D0=B0=20=D0=B4=D0=BE=D1=81=D1=82=D1=83?= =?UTF-8?q?=D0=BF=D0=BE=D0=B2=20=D0=B2=D0=BE=20=D1=87=D1=82=D0=BE-=D1=82?= =?UTF-8?q?=D0=BE=20=D0=B4=D1=80=D1=83=D0=B3=D0=BE=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/ADT/Objects/Tools/emag.ftl | 7 ++- .../Catalog/store/uplink-catalog.ftl | 3 ++ .../specific/robotics/borg_modules.ftl | 4 +- .../Prototypes/ADT/Catalog/uplink_catalog.yml | 13 +++++ .../ADT/Entities/Objects/Tools/e_modular.yml | 23 +++++++++ .../Prototypes/Catalog/thief_toolbox_sets.yml | 2 +- .../Prototypes/Catalog/uplink_catalog.yml | 30 ++++++------ .../Specific/Robotics/borg_modules.yml | 12 ++--- .../Entities/Objects/Tools/access_breaker.yml | 47 ++++++++++--------- .../Entities/Objects/Tools/emag.yml | 1 + .../Engineering/AccessConfigurator.xml | 2 +- 11 files changed, 96 insertions(+), 48 deletions(-) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Tools/e_modular.yml diff --git a/Resources/Locale/ru-RU/ADT/Objects/Tools/emag.ftl b/Resources/Locale/ru-RU/ADT/Objects/Tools/emag.ftl index 2a7bb6393ae..97cbacfa85f 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Tools/emag.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Tools/emag.ftl @@ -1,3 +1,8 @@ ent-ADTEmagHandMade = модифицированная ID карта .desc = Выглядит как айди карта, к которой привязали мультитул, бумагу, а так же ещё несколько инструментов. Пахнет довольно красновато. - +ent-ADTEhackUnlimited = криптографический модулятор + .desc = Устройство, способное взламывать приборы, автоматы, боргов, но не доступы. Младший брат стандартного EMAG, он же EHACK. + .suffix = Неограниченный +ent-ADTEhack = { ent-ADTEhackUnlimited } + .desc = { ent-ADTEhackUnlimited.desc } + .suffix = Ограниченный diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index 044c981f0b6..e44bcc2aa0a 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -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. Устройство, способное взламывать различные станционные устройства. Перезаряжается автоматически. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl index 9fe08c32a06..2521a6e66a5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl @@ -87,7 +87,7 @@ ent-BorgModuleAdvancedClowning = продвинутый клоунский мо ent-BorgModuleSyndicateWeapon = оружейный модуль киборга .desc = { ent-BaseBorgModule.desc } ent-BorgModuleOperative = оперативный модуль киборга - .desc = Модуль, в который входят монтировка,"Емаг", взломщик доступа и пинпоинтер Синдиката. + .desc = Модуль, в который входят монтировка,"Емаг", EMAG и пинпоинтер Синдиката. ent-BorgModuleEsword = модуль киборга c энергомечом .desc = Модуль, в который входит энергетический меч. ent-BorgModuleDoubleEsword = модуль киборга с двухклинковым энергомечом @@ -102,7 +102,7 @@ ent-XenoborgModuleBasic = базовый модуль ксеноборга .desc = Необходимые вещи для любого ксеноборга. ent-XenoborgModuleTool = инструментальный модуль ксеноборга .desc = Простые инструменты для большинства ксеноборгов. -ent-XenoborgModuleAccessBreaker = модуль ксеноборга с взломщиком доступа +ent-XenoborgModuleAccessBreaker = модуль ксеноборга с криптографическим секвенсером .desc = Модуль с разрушителем аутентификации. ent-XenoborgModuleFireExtinguisher = огнетушащий модуль ксеноборга .desc = Модуль с самозаполняющимся огнетушителем. diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index 0adcbcfdd71..80ecdd7c745 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -971,3 +971,16 @@ blacklist: tags: - NukeOpsUplink + +- type: listing + id: UplinkEhack + name: uplink-ehack-name + description: uplink-ehack-desc + productEntity: ADTEhack + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 3 # ADT-Tweak + cost: + Telecrystal: 4 # ADT-Tweak + categories: + - UplinkDisruption diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/e_modular.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/e_modular.yml new file mode 100644 index 00000000000..6763f5550de --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/e_modular.yml @@ -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 diff --git a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml index 44c143c6610..ca1b1b7cc9d 100644 --- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml +++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml @@ -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 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c394c971e93..15b560811ab 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -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 - type: listing id: UplinkEmag @@ -976,9 +976,9 @@ productEntity: Emag discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 2 # ADT-Tweak + Telecrystal: 6 # ADT-Tweak cost: - Telecrystal: 3 # ADT-Tweak + Telecrystal: 8 # ADT-Tweak categories: - UplinkDisruption diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 21572b8c334..fd2152d1f6a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseBorgModule parent: BaseItem name: borg module @@ -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. components: - type: Sprite layers: @@ -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 } @@ -1495,8 +1495,8 @@ - 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. components: - type: Sprite layers: @@ -1504,7 +1504,7 @@ - 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 } diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml b/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml index c2cba06fa06..18f317062ab 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml @@ -1,25 +1,28 @@ -- 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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/emag.yml b/Resources/Prototypes/Entities/Objects/Tools/emag.yml index a333a2fdca5..ab4cb8b4190 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/emag.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/emag.yml @@ -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 diff --git a/Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml b/Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml index 732a1adf9cf..827024dbf54 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml @@ -31,7 +31,7 @@ Этот вредоносный инструмент полностью отключает все считыватели идентификационных карт, подключенные к устройству. - + Чтобы устранить повреждение, обычно требуется частично разобрать устройство и реконструировать его. From dd94b6a9fd6db49718103e74651c9eef11955576 Mon Sep 17 00:00:00 2001 From: QWERTY <159805128+JackTalentedCoder@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:12:50 +0300 Subject: [PATCH 2/6] =?UTF-8?q?=D0=9A=D0=B0=D0=BA=20=D1=8D=D1=82=D0=BE=20?= =?UTF-8?q?=D0=B1=D0=BB=D1=8F=D1=82=D1=8C=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7?= =?UTF-8?q?=D0=BE=D1=88=D0=BB=D0=BE=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml b/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml index 18f317062ab..92ce5699be6 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml @@ -1,5 +1,3 @@ - - type: Sprite - sprite: Objects/Tools/access_breaker.rsi # ADT-Tweak - Удалён нахуй взломщик доступов. За место него кое что другое # - type: entity # parent: [BaseItem, BaseSyndicateContraband] From ec3ecbf8f04cc726f39f42fed50c6f1552a86ded Mon Sep 17 00:00:00 2001 From: QWERTY <159805128+JackTalentedCoder@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:24:10 +0300 Subject: [PATCH 3/6] Update uplink-catalog.ftl --- .../ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index e44bcc2aa0a..2ad32f9237c 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -291,5 +291,5 @@ uplink-clothing-no-sound-shoes-desc = Ботинки-хамелеоны с ос uplink-clothing-super-shoes-name = Продвинутые ботинки-хамелеоны uplink-clothing-super-shoes-desc = Ботинки-хамелеоны, обеспечивающие и бесшумную ходьбу, и защиту от поскальзывания. -uplink-ehack-name = криптографический модулятор +uplink-ehack-name = Криптографический модулятор uplink-ehack-desc = Он же EHACK. Младший брат EMAG. Устройство, способное взламывать различные станционные устройства. Перезаряжается автоматически. From c18367d0b6f3225331471cec8cd19e38c73d0523 Mon Sep 17 00:00:00 2001 From: QWERTY <159805128+JackTalentedCoder@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:31:08 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D1=81=D0=BD=D0=B8=D0=B6=D0=B0=D1=8E=20?= =?UTF-8?q?=D1=86=D0=B5=D0=BD=D1=83=20=D0=95=D0=9C=D0=90=D0=93=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D0=BD=D0=B0=20=D1=81=D0=B8=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated Telecrystal discount and cost values. --- Resources/Prototypes/Catalog/uplink_catalog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 15b560811ab..4a530ced3c6 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -976,9 +976,9 @@ productEntity: Emag discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 6 # ADT-Tweak + Telecrystal: 5 # ADT-Tweak cost: - Telecrystal: 8 # ADT-Tweak + Telecrystal: 7 # ADT-Tweak categories: - UplinkDisruption From 4afdb1f7ee5109fed8deef8d1baa3a39d3294b2f Mon Sep 17 00:00:00 2001 From: QWERTY <159805128+JackTalentedCoder@users.noreply.github.com> Date: Fri, 20 Mar 2026 01:33:37 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=A1=D0=BD=D0=B8=D0=B6=D0=B0=D1=8E=20?= =?UTF-8?q?=D1=86=D0=B5=D0=BD=D1=83=20=D0=B8=20=D0=95=D0=A5=D0=90=D0=9A?= =?UTF-8?q?=D0=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Catalog/uplink_catalog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index 80ecdd7c745..1b0c0f25270 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -979,8 +979,8 @@ productEntity: ADTEhack discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 3 # ADT-Tweak + Telecrystal: 2 # ADT-Tweak cost: - Telecrystal: 4 # ADT-Tweak + Telecrystal: 3 # ADT-Tweak categories: - UplinkDisruption From 6e9270ded50c2cc2636d9c15513abf59a929ebaf Mon Sep 17 00:00:00 2001 From: QWERTY <159805128+JackTalentedCoder@users.noreply.github.com> Date: Fri, 20 Mar 2026 13:14:56 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BB=D0=BE?= =?UTF-8?q?=D0=BA=D0=B0=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/objects/specific/robotics/borg_modules.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl index 2521a6e66a5..66dcb5fef78 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl @@ -87,7 +87,7 @@ ent-BorgModuleAdvancedClowning = продвинутый клоунский мо ent-BorgModuleSyndicateWeapon = оружейный модуль киборга .desc = { ent-BaseBorgModule.desc } ent-BorgModuleOperative = оперативный модуль киборга - .desc = Модуль, в который входят монтировка,"Емаг", EMAG и пинпоинтер Синдиката. + .desc = Модуль, в который входят монтировка,"Емаг" и пинпоинтер Синдиката. ent-BorgModuleEsword = модуль киборга c энергомечом .desc = Модуль, в который входит энергетический меч. ent-BorgModuleDoubleEsword = модуль киборга с двухклинковым энергомечом