diff --git a/Resources/Locale/en-US/_LostParadise/research.ftl b/Resources/Locale/en-US/_LostParadise/research.ftl index 1e3d61c73f3..38f23a54ac1 100644 --- a/Resources/Locale/en-US/_LostParadise/research.ftl +++ b/Resources/Locale/en-US/_LostParadise/research.ftl @@ -16,3 +16,4 @@ lppresearch-technology-combat-utility = Боевая медицина lppresearch-technology-basic-administration-of-drugs = Базовое введение препаратов lppresearch-technology-basic-tracking = Базовое отслеживание lppresearch-technology-advanced-tracking = Продвинутое отслеживание +lppresearch-combat-plasma-usage = Combat plasma usage diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl new file mode 100644 index 00000000000..91fd3bfc62f --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl @@ -0,0 +1,6 @@ +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = miruvor + .desc = { ent-DrinkGlass.desc } +ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } + .suffix = cargo gargle blaster + .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl index 1c44913e9c8..5dbaaf8ea7d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl @@ -11,4 +11,4 @@ ent-LPPFleshlightYellow = fleshlight yellow ent-LPPPillowPinkRound = pillow pink round .desc = A soft pillow that is comfortable to sit on. ent-LPPPillowTealRound = pillow teal round - .desc = A soft pillow that is comfortable to sit on. \ No newline at end of file + .desc = A soft pillow that is comfortable to sit on. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl new file mode 100644 index 00000000000..371c5885127 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl @@ -0,0 +1,10 @@ +ent-LPPPlasmaSword = Plasma sword + .desc = A prototype weapon based on plasma technology, a small injection of plasma ignited by an incendiary device forms a blade of fire as long as there is plasma. Special cartridges are required for refueling. +ent-LPPPlasmaCartridge = Plasma cartridge + .desc = Special cartridges containing high-pressure plasma for injection into a specialized container of plasma sword. Disposable. +ent-LPPExperimentalPlasmaSword = Experimental plasma sword + .desc = A prototype weapon based on plasma technology, a small injection of plasma ignited by an incendiary device forms a blade of fire as long as there is plasma. This model self-replicates the plasma after a period of time. + .suffix = ERT +ent-LPPPlasmaSwordEmpty = Plasma sword + .suffix = Empty + .desc = { ent-LPPPlasmaSword.desc } diff --git a/Resources/Locale/ru-RU/_LostParadise/flavors.ftl b/Resources/Locale/ru-RU/_LostParadise/flavors.ftl index b68a3da7155..89fdb339976 100644 --- a/Resources/Locale/ru-RU/_LostParadise/flavors.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/flavors.ftl @@ -3,4 +3,4 @@ flavor-complex-mint-tea = как вечная мерзлота flavor-complex-ginger-tea = как жгучий перец flavor-complex-berry-tea = как ягодный компот flavor-complex-orange-tea = как выжаный апельсин -flavor-complex-flower-tea = как цветочки \ No newline at end of file +flavor-complex-flower-tea = как цветочки diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl index 62f6663ff8b..139597f9cb0 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -1,6 +1,2 @@ -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = Мирувор - .desc = { ent-DrinkGlass.desc } -ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } - .suffix = Каргонский грызлодёр - .desc = { ent-DrinkGlass.desc } \ No newline at end of file + + diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/reagents/consumable.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/reagents/consumable.ftl index 7640db3c86e..408fcb559b4 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/reagents/consumable.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/reagents/consumable.ftl @@ -9,4 +9,4 @@ reagent-desc-berry-tea = Чай с добавлением различных я reagent-name-orange-tea = апельсиновый чай reagent-desc-orange-tea = Чай с добавлением апельсина, имеет цитрусовый привкус. reagent-name-flower-tea = цветочный чай -reagent-desc-flower-tea = Чай с добавлением различных цветов. \ No newline at end of file +reagent-desc-flower-tea = Чай с добавлением различных цветов. diff --git a/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl b/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl new file mode 100644 index 00000000000..408fcb559b4 --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl @@ -0,0 +1,12 @@ +reagent-name-camomile-tea = ромашковый чай +reagent-desc-camomile-tea = Чай с добавлением ромашек, отлично успакаивает. +reagent-name-mint-tea = мятный чай +reagent-desc-mint-tea = Чай с мятой, слава богу не кошачьей.. +reagent-name-ginger-tea = имбировый чай +reagent-desc-ginger-tea = Чай с добавлением имбиря, по слухам отлично согревает. +reagent-name-berry-tea = ягодный чай +reagent-desc-berry-tea = Чай с добавлением различных ягод, надеюсь среди них не было волчей ягоды. +reagent-name-orange-tea = апельсиновый чай +reagent-desc-orange-tea = Чай с добавлением апельсина, имеет цитрусовый привкус. +reagent-name-flower-tea = цветочный чай +reagent-desc-flower-tea = Чай с добавлением различных цветов. diff --git a/Resources/Locale/ru-RU/_LostParadise/research.ftl b/Resources/Locale/ru-RU/_LostParadise/research.ftl index 1e3d61c73f3..7e097b3edd7 100644 --- a/Resources/Locale/ru-RU/_LostParadise/research.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/research.ftl @@ -16,3 +16,4 @@ lppresearch-technology-combat-utility = Боевая медицина lppresearch-technology-basic-administration-of-drugs = Базовое введение препаратов lppresearch-technology-basic-tracking = Базовое отслеживание lppresearch-technology-advanced-tracking = Продвинутое отслеживание +lppresearch-combat-plasma-usage = Боевое применение плазмы diff --git a/Resources/Locale/ru-RU/accent/italian.ftl b/Resources/Locale/ru-RU/accent/italian.ftl index b1c25f83971..5245f28e9d5 100644 --- a/Resources/Locale/ru-RU/accent/italian.ftl +++ b/Resources/Locale/ru-RU/accent/italian.ftl @@ -1,7 +1,6 @@ # This should probably use the same prefix system as the mobster accent. # For the record, these do not work right now - even when uncommented. - # accent-italian-prefix-1 = Ravioli, ravioli, give me the formuoli! # accent-italian-prefix-2 = Mamma-mia! # accent-italian-prefix-3 = Mamma-mia! That's a spicy meat-ball! diff --git a/Resources/Locale/ru-RU/actions/actions/actions-commands.ftl b/Resources/Locale/ru-RU/actions/actions/actions-commands.ftl index fed57d1c1a9..8a6d41203cc 100644 --- a/Resources/Locale/ru-RU/actions/actions/actions-commands.ftl +++ b/Resources/Locale/ru-RU/actions/actions/actions-commands.ftl @@ -1,6 +1,5 @@ ## Actions Commands loc - ## Upgradeaction command loc upgradeaction-command-need-one-argument = upgradeaction needs at least one argument, the action entity uid. The second optional argument is a specified level. diff --git a/Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl b/Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl index 67482f4d42b..0278f62114f 100644 --- a/Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl +++ b/Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl @@ -1,6 +1,5 @@ # UI - ## Window air-alarm-ui-access-denied = Недостаточный уровень доступа! @@ -31,7 +30,6 @@ air-alarm-ui-mode-none = Нет ## Widgets - ### General air-alarm-ui-widget-enable = Включено diff --git a/Resources/Locale/ru-RU/atmos/gas-canister-component.ftl b/Resources/Locale/ru-RU/atmos/gas-canister-component.ftl index 99c0ad00b91..772d1d1a927 100644 --- a/Resources/Locale/ru-RU/atmos/gas-canister-component.ftl +++ b/Resources/Locale/ru-RU/atmos/gas-canister-component.ftl @@ -1,6 +1,5 @@ ## UI - # Bound Interface gas-canister-bound-user-interface-title = Газовый баллон diff --git a/Resources/Locale/ru-RU/barsign/barsign-component.ftl b/Resources/Locale/ru-RU/barsign/barsign-component.ftl index d291ae62314..be6d0da645e 100644 --- a/Resources/Locale/ru-RU/barsign/barsign-component.ftl +++ b/Resources/Locale/ru-RU/barsign/barsign-component.ftl @@ -2,7 +2,6 @@ barsign-component-name = вывеска бара # Bar signs prototypes - ## The Harmbaton barsign-prototype-name-harmbaton = Хармбатон diff --git a/Resources/Locale/ru-RU/climbing/glass-table-component.ftl b/Resources/Locale/ru-RU/climbing/glass-table-component.ftl index e22123a9698..5056cc13de9 100644 --- a/Resources/Locale/ru-RU/climbing/glass-table-component.ftl +++ b/Resources/Locale/ru-RU/climbing/glass-table-component.ftl @@ -1,6 +1,5 @@ ### Tables which take damage when a user is dragged onto them - ## Showed to users other than the climber glass-table-shattered-others = { CAPITALIZE($table) } ломается под весом { $climber }! diff --git a/Resources/Locale/ru-RU/deltav/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/deltav/interaction/interaction-popup-component.ftl index 82ef324f735..ccf1d2051a0 100644 --- a/Resources/Locale/ru-RU/deltav/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/ru-RU/deltav/interaction/interaction-popup-component.ftl @@ -1,6 +1,5 @@ ### Interaction Popup component - ## Petting animals petting-success-nukie-mouse = Вы гладите { THE($target) } по { POSS-ADJ($target) } маленькая кроваво-красная мышиная головка синдиката. diff --git a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl index 1244ce913f5..f64e828e938 100644 --- a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl @@ -255,7 +255,6 @@ flavor-complex-pilk = как сладкое молоко # Medicine/chemical-specific flavors. - ## Generic flavors. flavor-complex-medicine = как лекарство diff --git a/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl b/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl index 22190b51ea1..48e571d333c 100644 --- a/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl +++ b/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl @@ -1,6 +1,5 @@ ### Gravity Generator - ## UI gravity-generator-window-title = Генератор гравитации diff --git a/Resources/Locale/ru-RU/info/info-window.ftl b/Resources/Locale/ru-RU/info/info-window.ftl index 4d45a42bde0..722956d5dad 100644 --- a/Resources/Locale/ru-RU/info/info-window.ftl +++ b/Resources/Locale/ru-RU/info/info-window.ftl @@ -1,6 +1,5 @@ ### Info Window - ## General stuff ui-info-title = Информация diff --git a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl index c2dbb8cab8a..c8be66cfdbb 100644 --- a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl @@ -1,6 +1,5 @@ ### Interaction Popup component - ## Petting animals petting-success-generic = Вы гладите { $target } по голове. diff --git a/Resources/Locale/ru-RU/pda/Ringer/ringer-component.ftl b/Resources/Locale/ru-RU/pda/Ringer/ringer-component.ftl index a461cbd7952..b0cd8a95bc3 100644 --- a/Resources/Locale/ru-RU/pda/Ringer/ringer-component.ftl +++ b/Resources/Locale/ru-RU/pda/Ringer/ringer-component.ftl @@ -1,6 +1,5 @@ ### UI - # For the PDA Ringer screen comp-ringer-vibration-popup = Ваш КПК вибрирует diff --git a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl index 6d57e8a1d2c..958ff218c16 100644 --- a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl @@ -96,4 +96,4 @@ reagent-physical-desc-funny = смешное reagent-physical-desc-alkaline = щелочное reagent-physical-desc-holy = святое reagent-physical-desc-slimy = склизкое -reagent-physical-desc-neural = нейронное \ No newline at end of file +reagent-physical-desc-neural = нейронное diff --git a/Resources/Locale/ru-RU/robust-toolbox/commands.ftl b/Resources/Locale/ru-RU/robust-toolbox/commands.ftl index 3f0fc6778ca..1259d33e34f 100644 --- a/Resources/Locale/ru-RU/robust-toolbox/commands.ftl +++ b/Resources/Locale/ru-RU/robust-toolbox/commands.ftl @@ -1,6 +1,5 @@ ### Localization for engine console commands - ## generic command errors cmd-invalid-arg-number-error = Недопустимое число аргументов. @@ -172,7 +171,6 @@ cmd-hint-savebp-id = ## 'flushcookies' command - # Примечание: команда flushcookies взята из Robust.Client.WebView, её нет в коде основного движка. cmd-flushcookies-desc = Сброс хранилища CEF-cookie на диск diff --git a/Resources/Locale/ru-RU/shell.ftl b/Resources/Locale/ru-RU/shell.ftl index 1c2169249ef..82b1ded8554 100644 --- a/Resources/Locale/ru-RU/shell.ftl +++ b/Resources/Locale/ru-RU/shell.ftl @@ -1,6 +1,5 @@ ### for technical and/or system messages - ## General shell-server-cannot = Сервер не может выполнить это. diff --git a/Resources/Locale/ru-RU/shuttles/emergency.ftl b/Resources/Locale/ru-RU/shuttles/emergency.ftl index 598fc029c91..f11256dc036 100644 --- a/Resources/Locale/ru-RU/shuttles/emergency.ftl +++ b/Resources/Locale/ru-RU/shuttles/emergency.ftl @@ -1,6 +1,5 @@ # Commands - ## Delay shuttle round end emergency-shuttle-command-round-desc = Останавливает таймер окончания раунда, когда эвакуационный шаттл покидает гиперпространство. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl new file mode 100644 index 00000000000..91fd3bfc62f --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl @@ -0,0 +1,6 @@ +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = miruvor + .desc = { ent-DrinkGlass.desc } +ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } + .suffix = cargo gargle blaster + .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl new file mode 100644 index 00000000000..4fff83bd8aa --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl @@ -0,0 +1,16 @@ +ent-LPPDrinkCamomileTeaBottleFull = camomile tea bottle + .desc = Bottle of chamomile tea is the perfect remedy for your peace of mind. +ent-LPPDrinkMintTeaBottleFull = mint tea bottle + .desc = Bottle of refreshing peppermint tea, just looking at it makes you feel chilled. +ent-LPPDrinkGingerTeaBottleFull = ginger tea bottle + .desc = Bottle of ginger tea, great for warming your soul. +ent-LPPDrinkBerryTeaBottleFull = berry tea bottle + .desc = Bottle of berry tea with the rich flavor of summer berries. +ent-LPPDrinkOrangeTeaBottleFull = orange tea bottle + .desc = Bottle of orange tea with citrus freshness. +ent-LPPDrinkFlowerTeaBottleFull = flower tea bottle + .desc = Bottle of flower tea with subtle, delicate notes of flowers. +ent-LPPDrinkTeaBottleFull = tea bottle + .desc = Bottle of regular tea, nothing special. +ent-LPPDrinkGreenTeaBottleFull = green tea bottle + .desc = Bottle of green tea, nothing special either. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl index 35c3f40bea3..038ed4c9bc2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl @@ -11,4 +11,4 @@ ent-LPPFleshlightYellow = Желтый мастурбатор ent-LPPPillowPinkRound = розовая подушка .desc = Розовая круглая подушка с дыркой по центру. Зачем же она?.. ent-LPPPillowTealRound = бирюзовая подушка - .desc = Бирюзовая круглая подушка с дыркой по центру. Зачем же она?.. \ No newline at end of file + .desc = Бирюзовая круглая подушка с дыркой по центру. Зачем же она?.. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl new file mode 100644 index 00000000000..89eb08ae8db --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl @@ -0,0 +1,10 @@ +ent-LPPPlasmaSword = Плазменный меч + .desc = Прототип оружия, основанный на плазменной технологии. Небольшая инъекция плазмы, поджигаемая зажигательным устройством, образует огненное лезвие, пока есть плазма. Для заправки требуются специальные картриджи. +ent-LPPPlasmaCartridge = Плазменный картридж + .desc = Специальные картриджи, содержащие плазму высокого давления для введения в специализированный контейнер плазменного меча. Одноразовые. +ent-LPPExperimentalPlasmaSword = Экспериментальный плазменный меч + .desc = Прототип оружия, основанный на плазменной технологии: небольшая инъекция плазмы, воспламеняемая зажигательным устройством, образует огненное лезвие, пока есть плазма. Через некоторое время эта модель самовоспроизводит плазму. + .suffix = ОБР +ent-LPPPlasmaSwordEmpty = Плазменный меч + .suffix = Пустой + .desc = { ent-LPPPlasmaSword.desc } diff --git a/Resources/Locale/ru-RU/ui/transfer-amount.ftl b/Resources/Locale/ru-RU/ui/transfer-amount.ftl index 2b786d323df..4864b4deb3b 100644 --- a/Resources/Locale/ru-RU/ui/transfer-amount.ftl +++ b/Resources/Locale/ru-RU/ui/transfer-amount.ftl @@ -1,6 +1,5 @@ ### Loc for the transfer amount eui window - ## Title ui-transfer-amount-title = Изменить перемещаемое количество diff --git a/Resources/Locale/ru-RU/verbs/invoke-verb-command.ftl b/Resources/Locale/ru-RU/verbs/invoke-verb-command.ftl index b748505059b..e8d06c3ae58 100644 --- a/Resources/Locale/ru-RU/verbs/invoke-verb-command.ftl +++ b/Resources/Locale/ru-RU/verbs/invoke-verb-command.ftl @@ -1,6 +1,5 @@ ### Localization used for the invoke verb command. - # Mostly help + error messages. invoke-verb-command-description = Вызывает verb с заданным именем на сущности, с сущностью игрока diff --git a/Resources/Locale/ru-RU/verbs/list-verbs-command.ftl b/Resources/Locale/ru-RU/verbs/list-verbs-command.ftl index fc2330408ff..7811b4b3e5e 100644 --- a/Resources/Locale/ru-RU/verbs/list-verbs-command.ftl +++ b/Resources/Locale/ru-RU/verbs/list-verbs-command.ftl @@ -1,6 +1,5 @@ ### Localization used for the list verbs command. - # Mostly help + error messages. list-verbs-command-description = Перечисляет все verbs, которые игрок может использовать на данной сущности. diff --git a/Resources/Locale/ru-RU/voting/vote-commands.ftl b/Resources/Locale/ru-RU/voting/vote-commands.ftl index 1d333f82a5a..f2e9067437b 100644 --- a/Resources/Locale/ru-RU/voting/vote-commands.ftl +++ b/Resources/Locale/ru-RU/voting/vote-commands.ftl @@ -1,6 +1,5 @@ ### Voting system related console commands - ## 'createvote' command cmd-createvote-desc = Создаёт голосование diff --git a/Resources/Prototypes/CharacterItemGroups/securityGroups.yml b/Resources/Prototypes/CharacterItemGroups/securityGroups.yml index 01a84566dd3..03c4b62deb9 100644 --- a/Resources/Prototypes/CharacterItemGroups/securityGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/securityGroups.yml @@ -205,11 +205,5 @@ id: LoadoutCommandHoSWt550 - type: loadout id: LoadoutCommandHoSKatanaSheath - - type: loadout - id: LoadoutCommandHoSC20r - - type: loadout - id: LoadoutCommandHoSBulldog - - type: loadout - id: LoadoutCommandHoSEnergySword - type: loadout id: LoadoutCommandHoSEnergyGun \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index e0f6ef4268e..ec27d9aab46 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -43,7 +43,7 @@ layers: - state: e_sword - state: e_sword_blade - color: "#FFFFFF" + color: purple visible: false shader: unshaded map: [ "blade" ] diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 9fe0e0e62ba..ebc722d1d37 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -856,6 +856,8 @@ #LPP - LPPMagazineBoxMinigunPractice - LPPMagazineBoxMinigunRubber + - LPPRecipePlasmaSword + - LPPRecipePlasmaCartridge # End of modified code - type: MaterialStorage whitelist: diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml index bd2a03f214f..742f86c4eab 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml @@ -216,45 +216,6 @@ items: - ClothingBeltKatanaSheathFilledHoS -- type: loadout - id: LoadoutCommandHoSC20r - category: JobsCommand - cost: 0 - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon - - !type:CharacterJobRequirement - jobs: - - HeadOfSecurity - items: - - WeaponSubMachineGunC20rHoS - -- type: loadout - id: LoadoutCommandHoSBulldog - category: JobsCommand - cost: 0 - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon - - !type:CharacterJobRequirement - jobs: - - HeadOfSecurity - items: - - WeaponShotgunBulldogHoS - -- type: loadout - id: LoadoutCommandHoSEnergySword - category: JobsCommand - cost: 0 - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHoSWeapon - - !type:CharacterJobRequirement - jobs: - - HeadOfSecurity - items: - - EnergySwordHoS - - type: loadout id: LoadoutCommandHoSEnergyGun category: JobsCommand diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index f1e8fc9cf87..96035451369 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -28,7 +28,7 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: WeaponPistolN1984NonLethal - pocket2: FlashlightSeclite + pocket2: LPPExperimentalPlasmaSword - type: startingGear id: ERTLeaderGearEVA @@ -45,7 +45,7 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: WeaponPistolN1984NonLethal - pocket2: FlashlightSeclite + pocket2: LPPExperimentalPlasmaSword - type: startingGear id: ERTLeaderGearEVALecter @@ -62,7 +62,7 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: MagazineRifle - pocket2: MagazineRifle + pocket2: LPPExperimentalPlasmaSword inhand: - AirTankFilled diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml new file mode 100644 index 00000000000..8ec27591cf3 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml @@ -0,0 +1,207 @@ +- type: entity + name: Plasma sword + parent: BaseItem + id: LPPPlasmaSword + description: "A prototype weapon based on plasma technology, a small injection of plasma ignited by an incendiary device forms a blade of fire as long as there is plasma. Special cartridges are required for refueling." + components: + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/welder_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/welder_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/welder_drop.ogg + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Melee/plasma_sword.rsi + layers: + - state: icon + - state: p_sword_blade + color: orange + visible: false + shader: unshaded + map: [ "blade" ] + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: { visible: true } + False: { visible: false } + - type: Item + size: Small + sprite: _LostParadise/Objects/Weapons/Melee/plasma_sword.rsi + - type: ItemToggle + predictable: false + soundActivate: + path: /Audio/Weapons/ebladeon.ogg + params: + variation: 0.125 + soundDeactivate: + path: /Audio/Weapons/ebladeoff.ogg + params: + variation: 0.125 + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.125 + activatedSoundOnHitNoDamage: + path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg + params: + variation: 0.125 + deactivatedSoundOnHitNoDamage: + collection: MetalThud + activatedSoundOnSwing: + path: /Audio/Weapons/eblademiss.ogg + params: + variation: 0.125 + activatedDamage: + types: + Heat: 12.5 + Slash: 2.5 + - type: ItemToggleSize + activatedSize: Large + - type: ItemToggleHot + - type: ItemToggleDisarmMalus + - type: ItemToggleSharp + activatedDisarmMalus: 0.6 + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + color: orange + right: + - state: inhand-right-blade + shader: unshaded + color: orange + - type: UseDelay + - type: MeleeWeapon + wideAnimationRotation: -90 + attackRate: 0.75 + damage: + types: + Blunt: 6 + soundHit: + collection: MetalThud + - type: RefillableSolution + solution: refillable + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: Plasma + Quantity: 30 + maxVol: 30 + - type: Welder + fuelReagent: Plasma + fuelConsumption: 0.1 + fuelLitCost: 0.05 + tankSafe: true + - type: PointLight + enabled: false + radius: 2 + color: orange + netsync: false + - type: Appearance + - type: IgnitionSource + temperature: 1200 + +- type: entity + id: LPPPlasmaCartridge + parent: BaseItem + name: Plasma cartridge + description: "Special cartridges containing high-pressure plasma for injection into a specialized container of plasma sword. Disposable." + components: + - type: Item + size: Small + sprite: _LostParadise/Objects/Misc/Plasma_cartridge.rsi + - type: Sprite + sprite: _LostParadise/Objects/Misc/Plasma_cartridge.rsi + state: icon + - type: ReagentTank + tankType: Fuel + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: Plasma + Quantity: 30 + - type: InteractionOutline + - type: DrainableSolution + solution: tank + - type: ExaminableSolution + solution: tank + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/welder_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/welder_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/welder_drop.ogg + +- type: entity + name: Experimental plasma sword + parent: LPPPlasmaSword + id: LPPExperimentalPlasmaSword + description: "A prototype weapon based on plasma technology, a small injection of plasma ignited by an incendiary device forms a blade of fire as long as there is plasma. This model self-replicates the plasma after a period of time." + suffix: ERT + components: + - type: Item + size: Small + sprite: _LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi + layers: + - state: icon + - state: p_sword_blade + color: purple + visible: false + shader: unshaded + map: [ "blade" ] + - type: ItemToggleMeleeWeapon + activatedDamage: + types: + Heat: 15 + Slash: 5 + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: Plasma + Quantity: 35 + maxVol: 35 + - type: ToggleableLightVisuals + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + color: purple + right: + - state: inhand-right-blade + shader: unshaded + color: purple + - type: PointLight + enabled: false + radius: 2 + color: purple + - type: SolutionRegeneration + solution: Welder + generated: + reagents: + - ReagentId: Plasma + Quantity: 0.05 + +- type: entity + name: Plasma sword + parent: LPPPlasmaSword + id: LPPPlasmaSwordEmpty + suffix: Empty + components: + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: Plasma + Quantity: 0 + maxVol: 30 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml index 6dba2165ef4..689f789dc0f 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml @@ -143,3 +143,22 @@ completetime: 5 materials: Steel: 375 + +- type: latheRecipe + id: LPPRecipePlasmaSword + result: LPPPlasmaSwordEmpty + completetime: 20 + materials: + Steel: 1250 + Plastic: 750 + Gold: 500 + Silver: 500 + +- type: latheRecipe + id: LPPRecipePlasmaCartridge + result: LPPPlasmaCartridge + category: Ammo + completetime: 5 + materials: + Steel: 250 + Plasma: 1000 diff --git a/Resources/Prototypes/_LostParadise/Research/Arsenal.yml b/Resources/Prototypes/_LostParadise/Research/Arsenal.yml index 777e20ee59c..55a106959ac 100644 --- a/Resources/Prototypes/_LostParadise/Research/Arsenal.yml +++ b/Resources/Prototypes/_LostParadise/Research/Arsenal.yml @@ -35,4 +35,17 @@ - LPPClothingOuterHardsuitCombatRiot - LPPClothingOuterHardsuitCombatStandard - LPPClothingOuterHardsuitCombatOfficer - - LPPClothingOuterHardsuitSecurity \ No newline at end of file + - LPPClothingOuterHardsuitSecurity + +- type: technology + id: LPPCombatPlasmaUsage + name: lppresearch-combat-plasma-usage + icon: + sprite: _LostParadise/Objects/Weapons/Melee/plasma_sword.rsi + state: p_sword + discipline: Arsenal + tier: 3 + cost: 25000 + recipeUnlocks: + - LPPRecipePlasmaSword + - LPPRecipePlasmaCartridge diff --git a/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/icon.png new file mode 100644 index 00000000000..32362d5bfae Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/inhand-left.png new file mode 100644 index 00000000000..b8a40ac3cb9 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/inhand-right.png new file mode 100644 index 00000000000..0293e68042a Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/meta.json new file mode 100644 index 00000000000..0b798a4ec93 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/icon.png new file mode 100644 index 00000000000..0c8114e59ff Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-left-blade.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-left-blade.png new file mode 100644 index 00000000000..6bc304a12fd Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-left.png new file mode 100644 index 00000000000..3785f52ca66 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-right-blade.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-right-blade.png new file mode 100644 index 00000000000..456e7428927 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-right.png new file mode 100644 index 00000000000..a0b60390f30 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/meta.json new file mode 100644 index 00000000000..1b286443479 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/meta.json @@ -0,0 +1,78 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Prazat resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "p_sword" + }, + { + "name": "p_sword_blade", + "delays": [ + [ + 0.2, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/p_sword.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/p_sword.png new file mode 100644 index 00000000000..2347767232e Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/p_sword.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/p_sword_blade.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/p_sword_blade.png new file mode 100644 index 00000000000..32ff7dda9e4 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/p_sword_blade.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/icon.png new file mode 100644 index 00000000000..0b3eeca52c3 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-left-blade.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-left-blade.png new file mode 100644 index 00000000000..6bc304a12fd Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-left.png new file mode 100644 index 00000000000..362708ba2da Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-right-blade.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-right-blade.png new file mode 100644 index 00000000000..456e7428927 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-right.png new file mode 100644 index 00000000000..71bc481956a Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/meta.json new file mode 100644 index 00000000000..43375ea899a --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/meta.json @@ -0,0 +1,78 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "p_sword" + }, + { + "name": "p_sword_blade", + "delays": [ + [ + 0.2, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/p_sword.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/p_sword.png new file mode 100644 index 00000000000..2347767232e Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/p_sword.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/p_sword_blade.png b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/p_sword_blade.png new file mode 100644 index 00000000000..32ff7dda9e4 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/p_sword_blade.png differ