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..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 @@ -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..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 = Модуль, в который входят монтировка,"Емаг", взломщик доступа и пинпоинтер Синдиката. + .desc = Модуль, в который входят монтировка,"Емаг" и пинпоинтер Синдиката. 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..1b0c0f25270 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: 2 # ADT-Tweak + cost: + Telecrystal: 3 # 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..4a530ced3c6 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: 5 # ADT-Tweak cost: - Telecrystal: 3 # ADT-Tweak + Telecrystal: 7 # 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..92ce5699be6 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml @@ -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 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 @@ Этот вредоносный инструмент полностью отключает все считыватели идентификационных карт, подключенные к устройству. - + Чтобы устранить повреждение, обычно требуется частично разобрать устройство и реконструировать его.