From 168c38a4fb4ca614422a8d09d849a2733193cc92 Mon Sep 17 00:00:00 2001 From: Remuchi <72476615+Remuchi@users.noreply.github.com> Date: Fri, 29 Sep 2023 16:34:43 +0700 Subject: [PATCH] =?UTF-8?q?[Tweak]=20=D0=A0=D0=B0=D0=B7=D0=BB=D0=B8=D1=87?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20(#452)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: хальт для масок СВАТа, ОБР и Дедсквада * fix: доступы у карты медицинского офицера теперь можно менять * feat: возвращен калак в аплинк * feat: звук калака из кс 1.6 * fix: в интеркомы теперь можно говорить не стоя вплотную * feat: портативная рация теперь имеет радиус слышимости в 1 тайл * fix: интеркомы теперь настраиваются через компоненты на радиус слышимости * fix: суперматерия больше не издает эмбиент после удаления * style: ааа отступы * fix: а куда пропал компонент разговора у интеркома? * style: отступы сосали * style: еще отступы --- .../Radio/EntitySystems/RadioDeviceSystem.cs | 2 +- Resources/Audio/Weapons/Guns/Gunshots/ak.ogg | Bin 0 -> 12406 bytes .../Locale/en-US/store/uplink-catalog.ftl | 6 + .../Locale/ru-RU/store/uplink-catalog.ftl | 33 +++- .../Prototypes/Catalog/uplink_catalog.yml | 178 ++++++++++-------- .../Entities/Clothing/Masks/masks.yml | 4 + .../Entities/Objects/Devices/radio.yml | 1 + .../Objects/Weapons/Guns/Rifles/rifles.yml | 44 ++--- .../Structures/Wallmounts/intercom.yml | 12 +- 9 files changed, 170 insertions(+), 110 deletions(-) create mode 100644 Resources/Audio/Weapons/Guns/Gunshots/ak.ogg diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs index 2cd3777c52..362a379e97 100644 --- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs @@ -193,7 +193,7 @@ public sealed class RadioDeviceSystem : EntitySystem private void OnAttemptListen(EntityUid uid, RadioMicrophoneComponent component, ListenAttemptEvent args) { if (component.PowerRequired && !this.IsPowered(uid, EntityManager) - || component.UnobstructedRequired && !_interaction.InRangeUnobstructed(args.Source, uid, 0)) + || component.UnobstructedRequired && !_interaction.InRangeUnobstructed(args.Source, uid, component.ListenRange)) { args.Cancel(); } diff --git a/Resources/Audio/Weapons/Guns/Gunshots/ak.ogg b/Resources/Audio/Weapons/Guns/Gunshots/ak.ogg new file mode 100644 index 0000000000000000000000000000000000000000..1b8b9e7de75a18e51929a07e56a0e441f4620565 GIT binary patch literal 12406 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 literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 33bcdb22f6..9368fb3923 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -2,6 +2,9 @@ uplink-pistol-viper-name = Viper uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto). +uplink-rifle-ak-name = AK-74 +uplink-rifle-ak-description = A powerfull automatic rifle. Uses rifle magazines (.30 rifle) + uplink-revolver-python-name = Python uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .45 magnum. @@ -94,6 +97,9 @@ uplink-mosin-ammo-desc = A box of 50 cartridges for the surplus rifle. uplink-sniper-ammo-name = Ammunition box (.60 antimateriel) uplink-sniper-ammo-desc = A box of 10 cartridges for the Hristov sniper rifle. +uplink-ak-ammo-name = magazine (.30 rifle) +uplink-ak-ammo-desc = a magazine of .30 rifle ammo suited best for AK-74 + # Utility uplink-holopara-kit-name = Holoparasite Kit uplink-holopara-kit-desc = The pride and joy of Cybersun. Contains an injector that hosts a sentient metaphysical guardian made of hard light which resides in the user's body when not active. diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index 9159e9b6ce..d3eb3938f2 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -1,22 +1,33 @@ -# Weapons +# Оружие uplink-pistol-viper-name = Гадюка uplink-pistol-viper-desc = Маленький, легко скрываемый, но несколько маломощный пистолет. Использует пистолетные магазины (.35 авто). + +uplink-rifle-ak-name = АК-74 +uplink-rifle-ak-description = Мощная штурмовая винтовка. Использует магазины для штурмовой винтовки (.30 винтовочные) + uplink-revolver-python-name = Питон uplink-revolver-python-desc = Громкий и смертоносный револьвер. Использует "Магнум" 40-го калибра. uplink-pistol-cobra-name = Кобра uplink-pistol-cobra-desc = Прочный, безотказный пистолет для оператора со встроенным глушителем. Используйте пистолетные магазины (безгильзовый 25 калибра). + uplink-rifle-mosin-name = Винтовка Мосина uplink-rifle-mosin-desc = Служебная винтовка с затвором, повидавшая много войн. Не современная ни по каким стандартам, заряжается вручную и с ужасной отдачей, однако дешевая. + uplink-esword-name = Энергетический меч uplink-esword-desc = Очень опасный энергетический меч. В выключенном состоянии можно хранить в карманах. Издает много шума при использовании или включении. + uplink-esword-double-name = Двойной энергетический меч uplink-esword-double-desc = Гораздо более дорогой аналог обычного энергетического меча: с гораздо более высоким шансом отражения, большим углом атаки, более высоким структурным повреждением и более быстрым замахом, и все это за счет меньшего нагрева и рубящего урона. Издает много шума при использовании или включении. + uplink-edagger-name = Энергетический кинжал uplink-edagger-desc = Маленькое энергетическое лезвие, удобно замаскированное в виде ручки. + uplink-fire-axe-flaming-name = Пожарный топор uplink-fire-axe-flaming-desc = Оружие в классическом стиле, оснащенное передовой технологией атмос, позволяющей ему поджигать цели. + uplink-gloves-north-star-name = Перчатки Полярной звезды uplink-gloves-north-star-desc = Пара перчаток, которые резко сокращают время восстановления ваших ударов, позволяя вам избивать людей до смерти шквалом ударов. + # Explosives uplink-explosive-grenade-name = Разрывная граната uplink-explosive-grenade-desc = Граната, которая производит небольшой, но разрушительный взрыв. @@ -34,22 +45,32 @@ uplink-grenadier-rig-name = гренадерский нагрудник uplink-grenadier-rig-desc = Все, что нужно для шумной вечеринки: 4 разрывные гранаты, 2 ЭМИ-гранаты и 2 мини-бомбы в сундуке. uplink-emp-grenade-name = Электромагнитная граната uplink-emp-grenade-desc = Испускает электромагнитные импульсы, которые выводят из строя или повреждают многие электронные устройства или разряжают элементы питания. -# Ammo + +# Патроны uplink-pistol-magazine-name = Пистолетный магазин (.35 авто) uplink-pistol-magazine-desc = Пистолетный магазин на 10 патронов. Совместим с Гадюкой. + uplink-pistol-magazine-caseless-name = Пистолетный магазин (безгильзовые .25) uplink-pistol-magazine-caseless-desc = Пистолетный магазин на 10 патронов. Совместим с Коброй. + uplink-speedloader-magnum-name = Спидлоадер (.40 магнум) uplink-speedloader-magnu-desc = Револьверный спидлоадер с 6 патронами. Совместим с Питоном. -uplink-mosin-ammo-name = Коробка магазинов для винтовки 30-го калибра -uplink-mosin-ammo-desc = Коробка патронов для винтовки CV-47. + +uplink-mosin-ammo-name = Коробка патронов (.30 винтовочные) +uplink-mosin-ammo-desc = Коробка с 50 патронами калибра .30 винтовочные. Совместимы с винтовкой Мосина и АК-74. + +uplink-ak-ammo-name = Магазин (.30 винтовчные) +uplink-ak-ammo-desc = Магазин с 30 патронами калибра .30 винтовочные. Совместим с АК-74. + +uplink-sniper-ammo-name = Коробка патронов (.60 антиматериальные) +uplink-sniper-ammo-desc = Коробка с 10 патронами для снайперской винтовки Христова. + # Utility uplink-holopara-kit-name = Набор Голопаразита uplink-holopara-kit-desc = Гордость и радость Cybersyn. Содержит инжектор, в котором находится разумный метафизический страж, сделанный из жесткого света, который находится в теле пользователя, когда он не активен. Страж может быстро наносить удары и невосприимчив к опасным средам и пулям, но любой наносимый им урон делится с пользователем. -uplink-sniper-ammo-name = коробка патрон (антиматериальная .60) -uplink-sniper-ammo-desc = коробка 10 патронов для снайперской винтовки Христова + uplink-holster-name = Наплечная кобура uplink-holster-desc = Глубокая наплечная кобура, способная вместить множество видов баллистического оружия. uplink-emag-name = Криптографический секвенсор (емаг) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index bdc6e9c9ab..198cae1966 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -9,15 +9,28 @@ cost: Telecrystal: 8 categories: - - UplinkWeapons + - UplinkWeapons conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - NukeOpsUplink + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink saleLimit: 1 +# WD ADDED - type: listing + id: UplinkRifleAk + name: uplink-rifle-ak-name + description: uplink-rifle-ak-description + productEntity: WeaponRifleAk + cost: + Telecrystal: 16 + categories: + - UplinkWeapons + saleLimit: 1 +- type: listing + # END WD ADDED + id: UplinkPistolViper name: uplink-pistol-viper-name description: uplink-pistol-viper-desc @@ -74,10 +87,10 @@ categories: - UplinkWeapons conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - NukeOpsUplink + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink saleLimit: 1 - type: listing @@ -181,7 +194,7 @@ cost: Telecrystal: 6 categories: - - UplinkExplosives + - UplinkExplosives - type: listing id: UplinkSupermatterGrenade @@ -211,7 +224,7 @@ cost: Telecrystal: 4 categories: - - UplinkExplosives + - UplinkExplosives conditions: - !type:BuyerWhitelistCondition blacklist: @@ -383,8 +396,20 @@ categories: - UplinkAmmo -# for the hristov +# WD ADDED - type: listing + id: UplinkAkAmmo + name: uplink-ak-ammo-name + description: uplink-ak-ammo-desc + productEntity: MagazineLightRifle + cost: + Telecrystal: 1 + categories: + - UplinkAmmo +- type: listing + # END WD ADDED + # for the hristov + id: UplinkHristovAmmo name: uplink-sniper-ammo-name description: uplink-sniper-ammo-desc @@ -464,10 +489,10 @@ categories: - UplinkUtility conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - NukeOpsUplink + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink saleLimit: 2 - type: listing @@ -481,10 +506,10 @@ categories: - UplinkUtility conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink saleLimit: 1 - type: listing @@ -594,12 +619,12 @@ cost: Telecrystal: 8 categories: - - UplinkImplants + - UplinkImplants conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - NukeOpsUplink + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink - type: listing id: UplinkFreedomImplanter @@ -643,7 +668,7 @@ cost: Telecrystal: 2 categories: - - UplinkImplants + - UplinkImplants - type: listing id: UplinkMicroBombImplanter @@ -674,16 +699,16 @@ cost: Telecrystal: 20 categories: - - UplinkImplants + - UplinkImplants conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle - type: listing id: UplinkDeathAcidifierImplanter @@ -707,10 +732,10 @@ categories: - UplinkImplants conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - NukeOpsUplink + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink saleBlacklist: true - type: listing @@ -723,14 +748,14 @@ categories: - UplinkImplants conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle # Bundles @@ -765,14 +790,14 @@ categories: - UplinkBundles conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle saleLimit: 1 - type: listing @@ -796,14 +821,14 @@ categories: - UplinkBundles conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle saleLimit: 1 - type: listing @@ -969,10 +994,10 @@ categories: - UplinkTools conditions: - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle - type: listing id: UplinkCarpDehydrated @@ -1027,11 +1052,12 @@ cost: Telecrystal: 5 categories: - - UplinkJob + - UplinkJob conditions: - - !type:BuyerJobCondition - whitelist: - - Boxer + - !type:BuyerJobCondition + whitelist: + - Passenger + - Boxer - type: listing id: uplinkNecronomicon @@ -1152,9 +1178,9 @@ categories: - UplinkJob conditions: - - !type:BuyerDepartmentCondition - whitelist: - - Science + - !type:BuyerDepartmentCondition + whitelist: + - Science - type: listing id: uplinkProximityMine @@ -1178,7 +1204,7 @@ id: UplinkSyndicateSpongeBox name: uplink-syndicate-sponge-box-name description: uplink-syndicate-sponge-box-desc - icon: { sprite: Objects/Misc/monkeycube.rsi, state: box} + icon: { sprite: Objects/Misc/monkeycube.rsi, state: box } productEntity: SyndicateSpongeBox cost: Telecrystal: 7 @@ -1215,7 +1241,7 @@ cost: Telecrystal: 4 categories: - - UplinkArmor + - UplinkArmor - type: listing id: UplinkClothingNoSlipsShoes diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index bf3e9fcd20..fe2a4f3500 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -323,6 +323,7 @@ sprite: Clothing/Mask/swat.rsi - type: Clothing sprite: Clothing/Mask/swat.rsi + - type: Halt - type: entity parent: ClothingMaskGasExplorer @@ -345,6 +346,9 @@ sprite: Clothing/Mask/ert.rsi - type: Clothing sprite: Clothing/Mask/ert.rsi + - type: FlashImmunity + - type: EyeProtection + - type: Halt - type: entity parent: ClothingMaskGasERT diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index 74c2865d07..5228821403 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -6,6 +6,7 @@ components: - type: RadioMicrophone broadcastChannel: Handheld + listenRange: 1 - type: RadioSpeaker channels: - Handheld diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 5bc8125eba..82c0770c7f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -19,7 +19,7 @@ fireRate: 5 selectedMode: FullAuto availableModes: - - FullAuto + - FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - type: ChamberMagazineAmmoProvider @@ -35,14 +35,14 @@ priority: 2 whitelist: tags: - - MagazineLightRifle + - MagazineLightRifle gun_chamber: name: Chamber startingItem: CartridgeLightRifle priority: 1 whitelist: tags: - - CartridgeLightRifle + - CartridgeLightRifle - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -59,14 +59,14 @@ - type: Sprite sprite: Objects/Weapons/Guns/Rifles/ak.rsi layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] - type: Gun fireRate: 5 soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + path: /Audio/Weapons/Guns/Gunshots/ak.ogg - type: ChamberMagazineAmmoProvider soundRack: path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg @@ -80,14 +80,14 @@ priority: 2 whitelist: tags: - - MagazineLightRifle + - MagazineLightRifle gun_chamber: name: Chamber startingItem: CartridgeLightRifle priority: 1 whitelist: tags: - - CartridgeLightRifle + - CartridgeLightRifle - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -107,10 +107,10 @@ - type: Sprite sprite: Objects/Weapons/Guns/Rifles/carbine.rsi layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] - type: Clothing sprite: Objects/Weapons/Guns/Rifles/carbine.rsi - type: ItemSlots @@ -123,14 +123,14 @@ priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifle gun_chamber: name: Chamber startingItem: CartridgeRifle priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -150,10 +150,10 @@ - type: Sprite sprite: Objects/Weapons/Guns/Rifles/lecter.rsi layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] - type: Clothing sprite: Objects/Weapons/Guns/Rifles/lecter.rsi - type: Gun @@ -169,14 +169,14 @@ priority: 2 whitelist: tags: - - MagazineRifle + - MagazineRifle gun_chamber: name: Chamber startingItem: CartridgeRifle priority: 1 whitelist: tags: - - CartridgeRifle + - CartridgeRifle - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index 375cd359c6..c616471ec8 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -9,6 +9,8 @@ - type: Electrified enabled: false usesApcPower: true + - type: ActiveListener + range: 10 - type: RadioMicrophone powerRequired: true unobstructedRequired: true @@ -35,14 +37,14 @@ layers: - state: base - state: unshaded - map: ["enum.PowerDeviceVisualLayers.Powered"] + map: [ "enum.PowerDeviceVisualLayers.Powered" ] shader: unshaded - state: broadcasting - map: ["enum.RadioDeviceVisualLayers.Broadcasting"] + map: [ "enum.RadioDeviceVisualLayers.Broadcasting" ] shader: unshaded visible: false - state: speaker - map: ["enum.RadioDeviceVisualLayers.Speaker"] + map: [ "enum.RadioDeviceVisualLayers.Speaker" ] shader: unshaded visible: false - type: Transform @@ -57,8 +59,8 @@ key: enum.IntercomUiKey.Key - type: UserInterface interfaces: - - key: enum.IntercomUiKey.Key - type: IntercomBoundUserInterface + - key: enum.IntercomUiKey.Key + type: IntercomBoundUserInterface - type: Construction graph: Intercom node: intercom