From fd9e82dbed34ad3f8bc08c37f66ab7a3ec9ef1c9 Mon Sep 17 00:00:00 2001 From: MegaDaimond <158335048+MegaDaimond@users.noreply.github.com> Date: Mon, 14 Oct 2024 18:52:47 +0700 Subject: [PATCH 1/7] Plasma sword update --- .../Locale/en-US/_LostParadise/research.ftl | 1 + .../consumable/drinks/drinks_bottles.ftl | 16 ++ .../objects/weapons/melee/plasma_sword.ftl | 10 + .../structures/machines/vending_machines.ftl | 2 + .../Locale/ru-RU/_LostParadise/flavors.ftl | 2 +- .../prototypes/reagents/consumable.ftl | 2 +- .../_LostParadise/reagents/consumable.ftl | 12 + .../Locale/ru-RU/_LostParadise/research.ftl | 1 + .../objects/weapons/melee/plasma_sword.ftl | 10 + .../Objects/Weapons/Melee/e_sword.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 2 + .../Loadouts/Jobs/Heads/headOfSecurity.yml | 39 ---- .../Roles/Jobs/Fun/emergencyresponseteam.yml | 6 +- .../Objects/Weapons/Melee/plasma_sword.yml | 209 ++++++++++++++++++ .../_LostParadise/Recipes/Lathes/security.yml | 19 ++ .../_LostParadise/Research/Arsenal.yml | 15 +- .../Misc/Plasma_cartridge.rsi/icon.png | Bin 0 -> 219 bytes .../Misc/Plasma_cartridge.rsi/inhand-left.png | Bin 0 -> 192 bytes .../Plasma_cartridge.rsi/inhand-right.png | Bin 0 -> 193 bytes .../Misc/Plasma_cartridge.rsi/meta.json | 22 ++ .../Melee/exp_plasma_sword.rsi/icon.png | Bin 0 -> 341 bytes .../inhand-left-blade.png | Bin 0 -> 7094 bytes .../exp_plasma_sword.rsi/inhand-left.png | Bin 0 -> 193 bytes .../inhand-right-blade.png | Bin 0 -> 7218 bytes .../exp_plasma_sword.rsi/inhand-right.png | Bin 0 -> 200 bytes .../Melee/exp_plasma_sword.rsi/meta.json | 78 +++++++ .../Melee/exp_plasma_sword.rsi/p_sword.png | Bin 0 -> 412 bytes .../exp_plasma_sword.rsi/p_sword_blade.png | Bin 0 -> 800 bytes .../Weapons/Melee/plasma_sword.rsi/icon.png | Bin 0 -> 298 bytes .../plasma_sword.rsi/inhand-left-blade.png | Bin 0 -> 7094 bytes .../Melee/plasma_sword.rsi/inhand-left.png | Bin 0 -> 181 bytes .../plasma_sword.rsi/inhand-right-blade.png | Bin 0 -> 7218 bytes .../Melee/plasma_sword.rsi/inhand-right.png | Bin 0 -> 188 bytes .../Weapons/Melee/plasma_sword.rsi/meta.json | 78 +++++++ .../Melee/plasma_sword.rsi/p_sword.png | Bin 0 -> 412 bytes .../Melee/plasma_sword.rsi/p_sword_blade.png | Bin 0 -> 800 bytes 36 files changed, 480 insertions(+), 46 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl create mode 100644 Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl create mode 100644 Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml create mode 100644 Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-left-blade.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-right-blade.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/p_sword.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/p_sword_blade.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-left-blade.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-right-blade.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/p_sword.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/p_sword_blade.png 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_bottles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl new file mode 100644 index 00000000000..4fff83bd8aa --- /dev/null +++ b/Resources/Locale/en-US/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/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/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl index 833e802b0ad..c4e3f93ca46 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl @@ -25,3 +25,5 @@ ent-LPPUnderpantsMat = Underpants machine ent-LPPWithSoftAnimals = With soft animals machine .desc = For when you need seeds fast. Hands down the best seed selection on the station! .suffix = Unlocked +ent-LPPTeaVend = TeaVend + .desc = Perfect for those who want to cool down a bit. 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/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..ffa0907af5f --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl @@ -0,0 +1,12 @@ +reagent-name-camomile-tea = chamomile tea +reagent-desc-camomile-tea = Tea with added chamomile, great for relaxation. +reagent-name-mint-tea = mint tea +reagent-desc-mint-tea = Tea with mint, thankfully not catnip... +reagent-name-ginger-tea = ginger tea +reagent-desc-ginger-tea = Tea with added ginger, rumored to be great for warming up. +reagent-name-berry-tea = berry tea +reagent-desc-berry-tea = Tea with a mix of various berries, hopefully none of them are poisonous. +reagent-name-orange-tea = orange tea +reagent-desc-orange-tea = Tea with added orange, has a citrusy flavor. +reagent-name-flower-tea = flower tea +reagent-desc-flower-tea = Tea with a blend of various flowers. diff --git a/Resources/Locale/ru-RU/_LostParadise/research.ftl b/Resources/Locale/ru-RU/_LostParadise/research.ftl index 1e3d61c73f3..a89b152f051 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 = Боевое применение плазмы \ No newline at end of file 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/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 4ffb270203b..9bbed33b3ee 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..23f9ce01602 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml @@ -0,0 +1,209 @@ +- 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 + attackRate: 0.75 + - 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 + 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: StaticPrice + price: 40 + - 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: ItemToggle + activatedDamage: + types: + Heat: 18 + Slash: 7 + - 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 0000000000000000000000000000000000000000..32362d5bfae03aab85846f49ea889f3eca60e391 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Q$1ZALn2z= zUNq!lG8AZi7=N?QTRc(Qk;U8lz3}-b_YNv^n3YwveA!mr6v3OL{7$V=pdx;H(xE-( z3Q9_?YlGU>KR5HaKmGZRANxyBF;)w#rIcK=9;C?*G|J@((11 R_W&Kp;OXk;vd$@?2>?yvR2cvO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b8a40ac3cb9c8a9cdba4ed550d6a302c98735f9c GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zz2(T;;K0Ljp!k3|>x>7TB0^6-xbs>C6h|~%Xj4AJaU%Fx%*7n*;x2b*Sytkfr_PXh>tGN1!9sgT?evm>2hCl9K@(+lfjp@B_k!)UUb^aIc ljzu$7_e37}&%kiNSN+X=`@rKXz1D-2db;|#taD0e0sur^MbrQQ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0293e68042a60bc6a78fbf9fd695b613b2176498 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sy$sCLn`LH zy=BPTU?9MH!79O(QB7i^Q;_AG6^`s#r;Z$Rx^zjo(%<28@%6WLUO*iT2PW6bdA;Y! ze`0v`^z7py=W;dcC7mYk`M&tLRjZuS<VZ5&KLLj9K3<5DrKL2>$e#=9)F)vc7 lgk_h$l9T&^zw!(Vnz((|*as>;2q*!m^K|udS?83{1OO@tLnQzJ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0c8114e59ffbeb02e60988eaca7e00abd104e8ed GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<{GKk3ArY;~ z2@eK7LWHYX*pFNtv&z$tXI?i&zD>GZ~qRLNw4}64yIa) zi>o&??AJK_FgaR6QbI!FTW-yV`zP%?AI|x;?7!Q}=_|!#HQ0`(=Kec>;J|@`|A&0q z%=7OX#q6(~GqJI;F|n}oNxk}imA2{TW`+Tmi`dwfmJu)z4*}Q$iB}9)gr2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6bc304a12fd102d0ffdfb6de7edc53452cd3c675 GIT binary patch literal 7094 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3785f52ca66e976b6b4bffe42e7cc4f97ff7e39f GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sy$sCLn`LH zy|t0I!GMRsas5G-4#5{1k{w;85+bX zx9NRf^fUGD`Hqfc=~YLjTc+k^<-3=Cbx2~AlO zm90YdR3v3hNT^WnGwN5)`=0mw-t+mqzyF%~JTuRI-{0$dUC;NvuKRwTnQ*J!rV`?7 z#UT)ggt?iKHTZo{cr05Ae!lvHuL*%HSM;~B<64vXP!^l%M)LxoTt5~71$=345QuN* zNP<24wPw_@Zts&?i`MbKr-?_l$X_q2D*CoPETp>`U~y3 z8ZGa2^~!bD5BZ;M?pj>-bqu)s7NdHnG}m)9gzcXcKRtS>d{psGvrm^Er@Ucscx-O; zip=Tk)A1xT)m>)-5*woCRNqvfCK4t%(zd6wE=)Ac_I4aSo7=r)wD%c5?^JJ~Zm{CX zvB;$}>L#NTm-WuPSaqpkTU0J4c;a|R@0k>r6j%NzV>-G0oe2sC^pssiIQrf3?%5cV z>mff{clLdm?r42U-UH(*{L>4iw&&EtJzTcr12wS|>*BY^*)^HRQY=oLm??_$9HL44 z);{QFlOF4go>R29r@}dez%1irzZpz-RMjKLLbO;|ZS>R8t{zj>ueCFji-*g&#;!9b zWQQ%Bo44P?^rtu(8@#?lxwa=Dh5yk;W1QrQQD{+p6d`d&)5Xv-HdhdvqV1m3Y-bQ4 zIMyqp#}1*_68Fz+_Dl6^ia#5xpDp_@NdKXltZdK5i9oK?HSGdb_Q zlWn9)7LG}kwKUpUXYp$8`wI^?U)k7jp?~|75y=DQc{%w4JQ;H6m`6H{SXBjZSmAeq+(22c^77I`_bI?d>s zs&l=Rk9^S%&cg$=Hwl;r(vYA71lxjaIJdQ*=<)7X-;Wk!^ z7=otU#82+hwoWR-sD!8y%6#n}m~DEiQb)hq;moeid)j^_hvC$phHcM!(e#$Cy#E^I zxgh$ju2ND1TI~q>iPGys=OYs8b*p_uMXwGCvQ~HQTl?5&|5d|~Mt|5JNXf~{?Ai`Z zOd95Wiev4G4cLnSCBJljH15a-{*PDKJuE}R;z_S%t%6`PwXS6bf`~+t^ z@@?LsHp9|LxV23XH){v4+@a~t$n(hI103dMX%7{0?!%>z9XD{hdAZ!G;@`ZyO2(Tm z`n;8-!l5fk*~J^Pk3=P&Jk+w9v{}V7 za4M)CBDM{;c8j=$R(a&-jJ>TcswKd~?1aM0GWix&e*?vXo6KDK#XFHihKGW~4I=B05mMD6e{ z*6F(FE03d}uA#2tLB8D09|^2;?c8yc+vPZ5Se00yy0*!)fhShTju~1qV6yRIWLcYX z#O4UC=k-dlg(*%EjQWXASm3qt5X?>hSOm)*l2}a8E{XrF?qcYdsQX57I3^=NKV@R) z@(z>6``&&}>b+9z!k%fw@4RTctLwxHQ`&QE_k_RF$ctIIDLF@%eAOhbPE7l=!MpBn z9xv(HV@~mSc%5#c9Ds4WzKG+|6I3g+h@fd1YtbUNEhPTvos>44-2$zmb1gj6Ht9hZ zrt-mp?s6(D;QYzp-QFAKW;V`zT|74uQiJJ6n)#I+r-ySen67l$nieYe!K zS$EuC?dvnW*jurwVuRG!jgCX+IW`s7h@7{bO8Ty!y;r4nREfj_$%TP<)f~ah4av%S z2RT>g^nx23IL(E@~g5hpRbqprVh`Bx*UZSw|6^w3 zJB=lMAuMk*VcK%#Cn?obH(9sd-Gc}557;aEv(!6famE4XCJH0(sf`sHmP+12Ni)+F zIboL#tc-FPCp6p}eJb^%_Nsc!Ejw_(SzOHd)9x0M(wbZ0pSN9_cq4B#QH4Lpbuy;B zl0MI{vQyU7Y0gFr1O{x{2v}@N@xDwz;%$@!cS@3WZgO_gSi1+`WhrPq6`6M`_K$66 zQjlUZQ=O|ax^F(+FXeD3PTW;ypjYslk{ZR1x8bot=JiPz)P}H4tQg4AiqHh zr}Avf^G0QwU!Nz2_tIL~ulh#KmA!nogNxeaTIXtveAnN}I5g{=x-KGQ021@US&A^D zqA;+6d)bPYQ^8IpMBVlrj#RXg^X4ZgL(BpemKm{v-5M{d%xD}E?Y({0^o+a)FaL4!Bu6|y-LI@^4K61HZh0iHh1H{<)ssTm zsuq@dAzacVJuxK8#%krmfwAuA{-tNd-O`~+YsD$+-fiwWcXI|nWRD%jOhs=Bu&<)++emNPN$fo&F%sxMwQjfF}a8b}IDtnbb$P zap`lnx+v~nLvDZOt|%{kiK>#`9*`xLUY%l8ztYnnHp~v;Df8Z)`3hNnX)uc^I$6lB z*qN|nlap5ZY@XUAP^YTvqiwWy=aY%!;p3%Jvd~o~AsS-Js6Ee7O%f2jmq*s!Z7Pyn z|L*f=f|cYKQ5})%=_5-eq(hyigDY)1*IbdkUep*lS(1VK;&i{@%jLGv)DOlhk5>X2 zkurw^#wYZm8y#X^YiiqGsS|6ncrN~amBm}qaY2lQ^*z#bRI=;r97X$Pd(NQboQEuyL~9$O!#6p%7!h|!Hr<$hIDhYOF(Y_If?tu_{!RLFb`UqcpD9YXzTg1$P`b23v~tDX$&3MXh}H?N~7w) zY;i;+k!1*Y(9HbV0Lg#14aMJ+qD6)2>56On50S&D!B+=1&r1N$h201k zbRNR>)PdO%t)PZXHUPz{W7UyxV_%vN8m21_)n-%O2-Zd>-zmVB4$OngWf2evKA*47 z$EY*e?g*5YmKFkuMxfDf5CP}-F}P%3ID?}ir1-{R1aK&98jDL~GN3|EvMZCv)q%ml zap-q)aFk-~3wC~YAZ*XmbGTH5IoQC0*8>6&Xe3e-jzq)JT8M@A;3$#!! z!k5fKpwy8FI{i-;9Imm?Pk(=D!Lb3KRuI+zhsk480AnA3!Btu4l;y?aEcD6a0K%^M zxV@-u2r#I5&kJo#&52e&Y=knp)99>u3n6+Tl1ll3WAWHt^B5`x0eAs)Fc1#NjQSHE zwEto7mzOh7J}(r(h)LlISNJo?lZwIOT{S6iO*CkTMY_4d$#^VC=7z&! zFnB5!g+VQ#*u$oQsZI7;7?qHU3Q{4dcnv&21>h7UIO|v~Gyr!+YihwUSd0c)6Xi;E z(<0AP356x-Tbb*?(CWyaJyu?1t{an02kV8#pfdTKpF=h@IzZx*g|eaWSWP?ziN;~E zShR+w=1+D%s^jMes1$+;NJ$3Mhejv60|*wweSQE8nqbHV$Xq7dhRO8O zfeC|x3N7c00jm8y%?XxF3RzeV^I(7~td#GyVnB9B%r~_We+T{_Oe7B`pYea=`3e2O zqR-~?nQYHJ>^-iB01Ef-dHxFggUK3Pr8r!+pZUMJsQ-r3{+5?!pe>W_x4=IM@c!2N zwv>3$=B0u{=gXHsrU+HkfpN$_0Cj!}KpnpgQ9Q^DcK}=`zZc2B`e}cauN16?mMani z$769|mSS<5a90g79!|zla9S8m44{E@`!hR->Bi-g*?_(~SViDGgEcfi&rr4RX}0Ch zc)kZ9%poMWN`h`MNE+S--W&q z@=cZn8weQlw?1%V0{1z@kB#nomIw>!Klu8deg8oZAoVXN|483oa{ZF)A1UyUz`wHV zmt6lyfqw-4m0kaDa*6+ZR0bH}eIFlu5LRQ=>;)g9m%8pUHG+H8>%P}M)R-GN!F@6go|MG&OhHxt_S@%ci)DgxgZq+#F)o`n z9?Ly4eW4-cy-lUAhWyGmh44!;QNZ}jp`+;Zz%fSv~tMnMUU*a z>Wf)eh04UR8f8jNp?SZJN}Ew(_6l`YLcbYf65tO(Z2|teSfQ!8@ou9WgM*>}1rYkH AlK=n! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a0b60390f3061bddf60cb8a6a9cc974f069a01af GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|nmk<`Ln`LH zy|q!W*?`9(@Y)F$8RaG3CmmKss5h%km0Gc*Sm))ty^J5W$8@DK0yQ*r=hoJ3mVPI3 zOIrT-9(mn1fw|6Y7v4TS-}Y_)x5Y;d{@seK<+%DAs1gVkEbcj5xHI?bnFU4D`Hc^q tinY6T!T7&a=jKb{4_-35N-;3p`px+Kn6_%AgoFb~gQu&X%Q~loCIAZ+OPx$R!KxbR9Hvlm%mEGP!z_$J2`f&1d4;SXuDN67p0K8_Z@T-pFfo|@v{9GlRqy1JQ z@v!FIAvTVH;GX9p2m*v*m^^c_3oRj$6QIZmHv8=&iXw4%ZUm-q-k^iqn?)M6)R*V} z3$k!iI5TS!poh6-`gByp z-2czh)@G)??x6(G{pz}(<3Mm9s8wC}_tbT3XF%WuxHg;q63uDuoAhc^iyQ;t9pLh& zsVN7*)h;mnY{^`%O95JbO#?nIfc_jXa1ZpZd$Vfnto%(I6p8 zH>r@INF1$}O)|SXV_fW)ELrkc?|E&>_Mc&#wr%IY9N5N=&qjdX0$0FSWTd|w0loxo zfQw+{6Tn0ufIk4&Kp(sR&bGkCH$;_H5}6V0d=@UVCV--;8FoIIOO#MYH*Q&FQN^v esi~=%M1BD*@}|+BMt`6H0000uDm@sYHzyDue22c7Tko8H>BxjlF|NmbW%S&b^TAnDZ zkY(5uq z3#s0zKQkY3tl?vb)KgVGx}o}e9$UmB@5u>2{JGs1STKk@SGa%f-^x=T{`@SS72P+9 zBaze3D|*_(?b-S^`!b&vM|@*xXV~=g1t;GVh6z%$o-)-;6V`HBp~%n27{zXE*M3M? i@r2+OuCy9H28Od`If^M!hWCN~W$<+Mb6Mw<&;$VewsPA5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6bc304a12fd102d0ffdfb6de7edc53452cd3c675 GIT binary patch literal 7094 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..362708ba2dab90d3cc3dd70cd86e33970f46007d GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|@;zM~Ln`LH zy|t0|fC3MTgPF(d*iHUrr?vzrE>&+>d&jion*G{Xka-L|)$10!&D(w?d|~jk_il%m z>(tL*y6=9*=Vh~GjgG2=R4_0c@PBjTMcZwq^*kc$YPKsy?D%9|_A~Jv`!;rtNsJ5% Zy=*p?8l|?$d&NMCJzf1=);T3K0RV7FKPUhI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..456e7428927417116e36c9a67b822ec36a33b2ca GIT binary patch literal 7218 zcmeHMc|4Ts+aGmG6rqSj)2L_}vkxXq_9as?${LNC2NScH#URT;n@VLr6e>bx2~AlO zm90YdR3v3hNT^WnGwN5)`=0mw-t+mqzyF%~JTuRI-{0$dUC;NvuKRwTnQ*J!rV`?7 z#UT)ggt?iKHTZo{cr05Ae!lvHuL*%HSM;~B<64vXP!^l%M)LxoTt5~71$=345QuN* zNP<24wPw_@Zts&?i`MbKr-?_l$X_q2D*CoPETp>`U~y3 z8ZGa2^~!bD5BZ;M?pj>-bqu)s7NdHnG}m)9gzcXcKRtS>d{psGvrm^Er@Ucscx-O; zip=Tk)A1xT)m>)-5*woCRNqvfCK4t%(zd6wE=)Ac_I4aSo7=r)wD%c5?^JJ~Zm{CX zvB;$}>L#NTm-WuPSaqpkTU0J4c;a|R@0k>r6j%NzV>-G0oe2sC^pssiIQrf3?%5cV z>mff{clLdm?r42U-UH(*{L>4iw&&EtJzTcr12wS|>*BY^*)^HRQY=oLm??_$9HL44 z);{QFlOF4go>R29r@}dez%1irzZpz-RMjKLLbO;|ZS>R8t{zj>ueCFji-*g&#;!9b zWQQ%Bo44P?^rtu(8@#?lxwa=Dh5yk;W1QrQQD{+p6d`d&)5Xv-HdhdvqV1m3Y-bQ4 zIMyqp#}1*_68Fz+_Dl6^ia#5xpDp_@NdKXltZdK5i9oK?HSGdb_Q zlWn9)7LG}kwKUpUXYp$8`wI^?U)k7jp?~|75y=DQc{%w4JQ;H6m`6H{SXBjZSmAeq+(22c^77I`_bI?d>s zs&l=Rk9^S%&cg$=Hwl;r(vYA71lxjaIJdQ*=<)7X-;Wk!^ z7=otU#82+hwoWR-sD!8y%6#n}m~DEiQb)hq;moeid)j^_hvC$phHcM!(e#$Cy#E^I zxgh$ju2ND1TI~q>iPGys=OYs8b*p_uMXwGCvQ~HQTl?5&|5d|~Mt|5JNXf~{?Ai`Z zOd95Wiev4G4cLnSCBJljH15a-{*PDKJuE}R;z_S%t%6`PwXS6bf`~+t^ z@@?LsHp9|LxV23XH){v4+@a~t$n(hI103dMX%7{0?!%>z9XD{hdAZ!G;@`ZyO2(Tm z`n;8-!l5fk*~J^Pk3=P&Jk+w9v{}V7 za4M)CBDM{;c8j=$R(a&-jJ>TcswKd~?1aM0GWix&e*?vXo6KDK#XFHihKGW~4I=B05mMD6e{ z*6F(FE03d}uA#2tLB8D09|^2;?c8yc+vPZ5Se00yy0*!)fhShTju~1qV6yRIWLcYX z#O4UC=k-dlg(*%EjQWXASm3qt5X?>hSOm)*l2}a8E{XrF?qcYdsQX57I3^=NKV@R) z@(z>6``&&}>b+9z!k%fw@4RTctLwxHQ`&QE_k_RF$ctIIDLF@%eAOhbPE7l=!MpBn z9xv(HV@~mSc%5#c9Ds4WzKG+|6I3g+h@fd1YtbUNEhPTvos>44-2$zmb1gj6Ht9hZ zrt-mp?s6(D;QYzp-QFAKW;V`zT|74uQiJJ6n)#I+r-ySen67l$nieYe!K zS$EuC?dvnW*jurwVuRG!jgCX+IW`s7h@7{bO8Ty!y;r4nREfj_$%TP<)f~ah4av%S z2RT>g^nx23IL(E@~g5hpRbqprVh`Bx*UZSw|6^w3 zJB=lMAuMk*VcK%#Cn?obH(9sd-Gc}557;aEv(!6famE4XCJH0(sf`sHmP+12Ni)+F zIboL#tc-FPCp6p}eJb^%_Nsc!Ejw_(SzOHd)9x0M(wbZ0pSN9_cq4B#QH4Lpbuy;B zl0MI{vQyU7Y0gFr1O{x{2v}@N@xDwz;%$@!cS@3WZgO_gSi1+`WhrPq6`6M`_K$66 zQjlUZQ=O|ax^F(+FXeD3PTW;ypjYslk{ZR1x8bot=JiPz)P}H4tQg4AiqHh zr}Avf^G0QwU!Nz2_tIL~ulh#KmA!nogNxeaTIXtveAnN}I5g{=x-KGQ021@US&A^D zqA;+6d)bPYQ^8IpMBVlrj#RXg^X4ZgL(BpemKm{v-5M{d%xD}E?Y({0^o+a)FaL4!Bu6|y-LI@^4K61HZh0iHh1H{<)ssTm zsuq@dAzacVJuxK8#%krmfwAuA{-tNd-O`~+YsD$+-fiwWcXI|nWRD%jOhs=Bu&<)++emNPN$fo&F%sxMwQjfF}a8b}IDtnbb$P zap`lnx+v~nLvDZOt|%{kiK>#`9*`xLUY%l8ztYnnHp~v;Df8Z)`3hNnX)uc^I$6lB z*qN|nlap5ZY@XUAP^YTvqiwWy=aY%!;p3%Jvd~o~AsS-Js6Ee7O%f2jmq*s!Z7Pyn z|L*f=f|cYKQ5})%=_5-eq(hyigDY)1*IbdkUep*lS(1VK;&i{@%jLGv)DOlhk5>X2 zkurw^#wYZm8y#X^YiiqGsS|6ncrN~amBm}qaY2lQ^*z#bRI=;r97X$Pd(NQboQEuyL~9$O!#6p%7!h|!Hr<$hIDhYOF(Y_If?tu_{!RLFb`UqcpD9YXzTg1$P`b23v~tDX$&3MXh}H?N~7w) zY;i;+k!1*Y(9HbV0Lg#14aMJ+qD6)2>56On50S&D!B+=1&r1N$h201k zbRNR>)PdO%t)PZXHUPz{W7UyxV_%vN8m21_)n-%O2-Zd>-zmVB4$OngWf2evKA*47 z$EY*e?g*5YmKFkuMxfDf5CP}-F}P%3ID?}ir1-{R1aK&98jDL~GN3|EvMZCv)q%ml zap-q)aFk-~3wC~YAZ*XmbGTH5IoQC0*8>6&Xe3e-jzq)JT8M@A;3$#!! z!k5fKpwy8FI{i-;9Imm?Pk(=D!Lb3KRuI+zhsk480AnA3!Btu4l;y?aEcD6a0K%^M zxV@-u2r#I5&kJo#&52e&Y=knp)99>u3n6+Tl1ll3WAWHt^B5`x0eAs)Fc1#NjQSHE zwEto7mzOh7J}(r(h)LlISNJo?lZwIOT{S6iO*CkTMY_4d$#^VC=7z&! zFnB5!g+VQ#*u$oQsZI7;7?qHU3Q{4dcnv&21>h7UIO|v~Gyr!+YihwUSd0c)6Xi;E z(<0AP356x-Tbb*?(CWyaJyu?1t{an02kV8#pfdTKpF=h@IzZx*g|eaWSWP?ziN;~E zShR+w=1+D%s^jMes1$+;NJ$3Mhejv60|*wweSQE8nqbHV$Xq7dhRO8O zfeC|x3N7c00jm8y%?XxF3RzeV^I(7~td#GyVnB9B%r~_We+T{_Oe7B`pYea=`3e2O zqR-~?nQYHJ>^-iB01Ef-dHxFggUK3Pr8r!+pZUMJsQ-r3{+5?!pe>W_x4=IM@c!2N zwv>3$=B0u{=gXHsrU+HkfpN$_0Cj!}KpnpgQ9Q^DcK}=`zZc2B`e}cauN16?mMani z$769|mSS<5a90g79!|zla9S8m44{E@`!hR->Bi-g*?_(~SViDGgEcfi&rr4RX}0Ch zc)kZ9%poMWN`h`MNE+S--W&q z@=cZn8weQlw?1%V0{1z@kB#nomIw>!Klu8deg8oZAoVXN|483oa{ZF)A1UyUz`wHV zmt6lyfqw-4m0kaDa*6+ZR0bH}eIFlu5LRQ=>;)g9m%8pUHG+H8>%P}M)R-GN!F@6go|MG&OhHxt_S@%ci)DgxgZq+#F)o`n z9?Ly4eW4-cy-lUAhWyGmh44!;QNZ}jp`+;Zz%fSv~tMnMUU*a z>Wf)eh04UR8f8jNp?SZJN}Ew(_6l`YLcbYf65tO(Z2|teSfQ!8@ou9WgM*>}1rYkH AlK=n! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..71bc481956a33794669ab7ee191152bdb0a7d311 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|$~;{hLn`LH zy}6sW!GOo%V2;CSy*G#be7L7dPna-a(Gjt7W)=PU=hiX;)gCy!QTO?qHvL`SjwSuR z)uC{?xd%F6$taD0e0swIsM_vE` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2347767232eaecbe4cfd468e093b25fb0308118f GIT binary patch literal 412 zcmV;N0b~A&P)Px$R!KxbR9Hvlm%mEGP!z_$J2`f&1d4;SXuDN67p0K8_Z@T-pFfo|@v{9GlRqy1JQ z@v!FIAvTVH;GX9p2m*v*m^^c_3oRj$6QIZmHv8=&iXw4%ZUm-q-k^iqn?)M6)R*V} z3$k!iI5TS!poh6-`gByp z-2czh)@G)??x6(G{pz}(<3Mm9s8wC}_tbT3XF%WuxHg;q63uDuoAhc^iyQ;t9pLh& zsVN7*)h;mnY{^`%O95JbO#?nIfc_jXa1ZpZd$Vfnto%(I6p8 zH>r@INF1$}O)|SXV_fW)ELrkc?|E&>_Mc&#wr%IY9N5N=&qjdX0$0FSWTd|w0loxo zfQw+{6Tn0ufIk4&Kp(sR&bGkCH$;_H5}6V0d=@UVCV--;8FoIIOO#MYH*Q&FQN^v esi~=%M1BD*@}|+BMt`6H0000 Date: Mon, 14 Oct 2024 18:52:47 +0700 Subject: [PATCH 2/7] Plasma sword update --- .../Locale/en-US/_LostParadise/research.ftl | 1 + .../consumable/drinks/drinks_bottles.ftl | 16 ++ .../objects/weapons/melee/plasma_sword.ftl | 10 + .../structures/machines/vending_machines.ftl | 2 + .../Locale/ru-RU/_LostParadise/flavors.ftl | 2 +- .../prototypes/reagents/consumable.ftl | 2 +- .../_LostParadise/reagents/consumable.ftl | 12 + .../Locale/ru-RU/_LostParadise/research.ftl | 1 + .../objects/weapons/melee/plasma_sword.ftl | 10 + .../Objects/Weapons/Melee/e_sword.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 2 + .../Loadouts/Jobs/Heads/headOfSecurity.yml | 39 ---- .../Roles/Jobs/Fun/emergencyresponseteam.yml | 6 +- .../Objects/Weapons/Melee/plasma_sword.yml | 209 ++++++++++++++++++ .../_LostParadise/Recipes/Lathes/security.yml | 19 ++ .../_LostParadise/Research/Arsenal.yml | 15 +- .../Misc/Plasma_cartridge.rsi/icon.png | Bin 0 -> 219 bytes .../Misc/Plasma_cartridge.rsi/inhand-left.png | Bin 0 -> 192 bytes .../Plasma_cartridge.rsi/inhand-right.png | Bin 0 -> 193 bytes .../Misc/Plasma_cartridge.rsi/meta.json | 22 ++ .../Melee/exp_plasma_sword.rsi/icon.png | Bin 0 -> 341 bytes .../inhand-left-blade.png | Bin 0 -> 7094 bytes .../exp_plasma_sword.rsi/inhand-left.png | Bin 0 -> 193 bytes .../inhand-right-blade.png | Bin 0 -> 7218 bytes .../exp_plasma_sword.rsi/inhand-right.png | Bin 0 -> 200 bytes .../Melee/exp_plasma_sword.rsi/meta.json | 78 +++++++ .../Melee/exp_plasma_sword.rsi/p_sword.png | Bin 0 -> 412 bytes .../exp_plasma_sword.rsi/p_sword_blade.png | Bin 0 -> 800 bytes .../Weapons/Melee/plasma_sword.rsi/icon.png | Bin 0 -> 298 bytes .../plasma_sword.rsi/inhand-left-blade.png | Bin 0 -> 7094 bytes .../Melee/plasma_sword.rsi/inhand-left.png | Bin 0 -> 181 bytes .../plasma_sword.rsi/inhand-right-blade.png | Bin 0 -> 7218 bytes .../Melee/plasma_sword.rsi/inhand-right.png | Bin 0 -> 188 bytes .../Weapons/Melee/plasma_sword.rsi/meta.json | 78 +++++++ .../Melee/plasma_sword.rsi/p_sword.png | Bin 0 -> 412 bytes .../Melee/plasma_sword.rsi/p_sword_blade.png | Bin 0 -> 800 bytes 36 files changed, 480 insertions(+), 46 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl create mode 100644 Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl create mode 100644 Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml create mode 100644 Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Objects/Misc/Plasma_cartridge.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-left-blade.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-right-blade.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/p_sword.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi/p_sword_blade.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-left-blade.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-right-blade.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/p_sword.png create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Melee/plasma_sword.rsi/p_sword_blade.png 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_bottles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl new file mode 100644 index 00000000000..4fff83bd8aa --- /dev/null +++ b/Resources/Locale/en-US/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/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/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl index 833e802b0ad..c4e3f93ca46 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl @@ -25,3 +25,5 @@ ent-LPPUnderpantsMat = Underpants machine ent-LPPWithSoftAnimals = With soft animals machine .desc = For when you need seeds fast. Hands down the best seed selection on the station! .suffix = Unlocked +ent-LPPTeaVend = TeaVend + .desc = Perfect for those who want to cool down a bit. 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/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..ffa0907af5f --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl @@ -0,0 +1,12 @@ +reagent-name-camomile-tea = chamomile tea +reagent-desc-camomile-tea = Tea with added chamomile, great for relaxation. +reagent-name-mint-tea = mint tea +reagent-desc-mint-tea = Tea with mint, thankfully not catnip... +reagent-name-ginger-tea = ginger tea +reagent-desc-ginger-tea = Tea with added ginger, rumored to be great for warming up. +reagent-name-berry-tea = berry tea +reagent-desc-berry-tea = Tea with a mix of various berries, hopefully none of them are poisonous. +reagent-name-orange-tea = orange tea +reagent-desc-orange-tea = Tea with added orange, has a citrusy flavor. +reagent-name-flower-tea = flower tea +reagent-desc-flower-tea = Tea with a blend of various flowers. diff --git a/Resources/Locale/ru-RU/_LostParadise/research.ftl b/Resources/Locale/ru-RU/_LostParadise/research.ftl index 1e3d61c73f3..a89b152f051 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 = Боевое применение плазмы \ No newline at end of file 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/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 4ffb270203b..9bbed33b3ee 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..b44d99440b8 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml @@ -0,0 +1,209 @@ +- 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: StaticPrice + price: 40 + - 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 0000000000000000000000000000000000000000..32362d5bfae03aab85846f49ea889f3eca60e391 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Q$1ZALn2z= zUNq!lG8AZi7=N?QTRc(Qk;U8lz3}-b_YNv^n3YwveA!mr6v3OL{7$V=pdx;H(xE-( z3Q9_?YlGU>KR5HaKmGZRANxyBF;)w#rIcK=9;C?*G|J@((11 R_W&Kp;OXk;vd$@?2>?yvR2cvO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b8a40ac3cb9c8a9cdba4ed550d6a302c98735f9c GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zz2(T;;K0Ljp!k3|>x>7TB0^6-xbs>C6h|~%Xj4AJaU%Fx%*7n*;x2b*Sytkfr_PXh>tGN1!9sgT?evm>2hCl9K@(+lfjp@B_k!)UUb^aIc ljzu$7_e37}&%kiNSN+X=`@rKXz1D-2db;|#taD0e0sur^MbrQQ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0293e68042a60bc6a78fbf9fd695b613b2176498 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sy$sCLn`LH zy=BPTU?9MH!79O(QB7i^Q;_AG6^`s#r;Z$Rx^zjo(%<28@%6WLUO*iT2PW6bdA;Y! ze`0v`^z7py=W;dcC7mYk`M&tLRjZuS<VZ5&KLLj9K3<5DrKL2>$e#=9)F)vc7 lgk_h$l9T&^zw!(Vnz((|*as>;2q*!m^K|udS?83{1OO@tLnQzJ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0c8114e59ffbeb02e60988eaca7e00abd104e8ed GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<{GKk3ArY;~ z2@eK7LWHYX*pFNtv&z$tXI?i&zD>GZ~qRLNw4}64yIa) zi>o&??AJK_FgaR6QbI!FTW-yV`zP%?AI|x;?7!Q}=_|!#HQ0`(=Kec>;J|@`|A&0q z%=7OX#q6(~GqJI;F|n}oNxk}imA2{TW`+Tmi`dwfmJu)z4*}Q$iB}9)gr2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6bc304a12fd102d0ffdfb6de7edc53452cd3c675 GIT binary patch literal 7094 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3785f52ca66e976b6b4bffe42e7cc4f97ff7e39f GIT binary patch literal 193 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 AlK=n! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a0b60390f3061bddf60cb8a6a9cc974f069a01af GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|nmk<`Ln`LH zy|q!W*?`9(@Y)F$8RaG3CmmKss5h%km0Gc*Sm))ty^J5W$8@DK0yQ*r=hoJ3mVPI3 zOIrT-9(mn1fw|6Y7v4TS-}Y_)x5Y;d{@seK<+%DAs1gVkEbcj5xHI?bnFU4D`Hc^q tinY6T!T7&a=jKb{4_-35N-;3p`px+Kn6_%AgoFb~gQu&X%Q~loCIAZ+OPx$R!KxbR9Hvlm%mEGP!z_$J2`f&1d4;SXuDN67p0K8_Z@T-pFfo|@v{9GlRqy1JQ z@v!FIAvTVH;GX9p2m*v*m^^c_3oRj$6QIZmHv8=&iXw4%ZUm-q-k^iqn?)M6)R*V} z3$k!iI5TS!poh6-`gByp z-2czh)@G)??x6(G{pz}(<3Mm9s8wC}_tbT3XF%WuxHg;q63uDuoAhc^iyQ;t9pLh& zsVN7*)h;mnY{^`%O95JbO#?nIfc_jXa1ZpZd$Vfnto%(I6p8 zH>r@INF1$}O)|SXV_fW)ELrkc?|E&>_Mc&#wr%IY9N5N=&qjdX0$0FSWTd|w0loxo zfQw+{6Tn0ufIk4&Kp(sR&bGkCH$;_H5}6V0d=@UVCV--;8FoIIOO#MYH*Q&FQN^v esi~=%M1BD*@}|+BMt`6H0000uDm@sYHzyDue22c7Tko8H>BxjlF|NmbW%S&b^TAnDZ zkY(5uq z3#s0zKQkY3tl?vb)KgVGx}o}e9$UmB@5u>2{JGs1STKk@SGa%f-^x=T{`@SS72P+9 zBaze3D|*_(?b-S^`!b&vM|@*xXV~=g1t;GVh6z%$o-)-;6V`HBp~%n27{zXE*M3M? i@r2+OuCy9H28Od`If^M!hWCN~W$<+Mb6Mw<&;$VewsPA5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6bc304a12fd102d0ffdfb6de7edc53452cd3c675 GIT binary patch literal 7094 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..362708ba2dab90d3cc3dd70cd86e33970f46007d GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|@;zM~Ln`LH zy|t0|fC3MTgPF(d*iHUrr?vzrE>&+>d&jion*G{Xka-L|)$10!&D(w?d|~jk_il%m z>(tL*y6=9*=Vh~GjgG2=R4_0c@PBjTMcZwq^*kc$YPKsy?D%9|_A~Jv`!;rtNsJ5% Zy=*p?8l|?$d&NMCJzf1=);T3K0RV7FKPUhI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..456e7428927417116e36c9a67b822ec36a33b2ca GIT binary patch literal 7218 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 AlK=n! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..71bc481956a33794669ab7ee191152bdb0a7d311 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|$~;{hLn`LH zy}6sW!GOo%V2;CSy*G#be7L7dPna-a(Gjt7W)=PU=hiX;)gCy!QTO?qHvL`SjwSuR z)uC{?xd%F6$taD0e0swIsM_vE` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2347767232eaecbe4cfd468e093b25fb0308118f GIT binary patch literal 412 zcmV;N0b~A&P)Px$R!KxbR9Hvlm%mEGP!z_$J2`f&1d4;SXuDN67p0K8_Z@T-pFfo|@v{9GlRqy1JQ z@v!FIAvTVH;GX9p2m*v*m^^c_3oRj$6QIZmHv8=&iXw4%ZUm-q-k^iqn?)M6)R*V} z3$k!iI5TS!poh6-`gByp z-2czh)@G)??x6(G{pz}(<3Mm9s8wC}_tbT3XF%WuxHg;q63uDuoAhc^iyQ;t9pLh& zsVN7*)h;mnY{^`%O95JbO#?nIfc_jXa1ZpZd$Vfnto%(I6p8 zH>r@INF1$}O)|SXV_fW)ELrkc?|E&>_Mc&#wr%IY9N5N=&qjdX0$0FSWTd|w0loxo zfQw+{6Tn0ufIk4&Kp(sR&bGkCH$;_H5}6V0d=@UVCV--;8FoIIOO#MYH*Q&FQN^v esi~=%M1BD*@}|+BMt`6H0000 Date: Mon, 14 Oct 2024 19:27:18 +0700 Subject: [PATCH 3/7] Update plasma_sword.yml --- .../Entities/Objects/Weapons/Melee/plasma_sword.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml index b44d99440b8..cfd19cdf7cd 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml @@ -108,6 +108,8 @@ price: 40 - type: IgnitionSource temperature: 1200 + - type: StaticPrice + price: 1000 - type: entity id: LPPPlasmaCartridge @@ -141,6 +143,8 @@ - type: EmitSoundOnLand sound: path: /Audio/Items/welder_drop.ogg + - type: StaticPrice + price: 10000 - type: entity name: Experimental plasma sword @@ -193,6 +197,8 @@ reagents: - ReagentId: Plasma Quantity: 0.05 + - type: StaticPrice + price: 500 - type: entity name: Plasma sword From de8dad355475395786c4b98e19c78c05a9ee406f Mon Sep 17 00:00:00 2001 From: MegaDaimond <158335048+MegaDaimond@users.noreply.github.com> Date: Mon, 14 Oct 2024 19:33:43 +0700 Subject: [PATCH 4/7] Update plasma_sword.yml --- .../Entities/Objects/Weapons/Melee/plasma_sword.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml index cfd19cdf7cd..7a32c2a084d 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml @@ -104,8 +104,6 @@ color: orange netsync: false - type: Appearance - - type: StaticPrice - price: 40 - type: IgnitionSource temperature: 1200 - type: StaticPrice @@ -198,7 +196,7 @@ - ReagentId: Plasma Quantity: 0.05 - type: StaticPrice - price: 500 + price: 300 - type: entity name: Plasma sword From 5ed6d122a65367b47df9a2b80c5be2fdbdc9b211 Mon Sep 17 00:00:00 2001 From: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Date: Mon, 14 Oct 2024 16:10:14 +0300 Subject: [PATCH 5/7] Update consumable.ftl --- .../_LostParadise/reagents/consumable.ftl | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl b/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl index ffa0907af5f..408fcb559b4 100644 --- a/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl @@ -1,12 +1,12 @@ -reagent-name-camomile-tea = chamomile tea -reagent-desc-camomile-tea = Tea with added chamomile, great for relaxation. -reagent-name-mint-tea = mint tea -reagent-desc-mint-tea = Tea with mint, thankfully not catnip... -reagent-name-ginger-tea = ginger tea -reagent-desc-ginger-tea = Tea with added ginger, rumored to be great for warming up. -reagent-name-berry-tea = berry tea -reagent-desc-berry-tea = Tea with a mix of various berries, hopefully none of them are poisonous. -reagent-name-orange-tea = orange tea -reagent-desc-orange-tea = Tea with added orange, has a citrusy flavor. -reagent-name-flower-tea = flower tea -reagent-desc-flower-tea = Tea with a blend of various flowers. +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 = Чай с добавлением различных цветов. From d8e0a67163420d1a8fad7f7ac09bf337ad96c25d Mon Sep 17 00:00:00 2001 From: MegaDaimond <158335048+MegaDaimond@users.noreply.github.com> Date: Mon, 14 Oct 2024 22:43:02 +0700 Subject: [PATCH 6/7] HOS fix? --- .../objects/consumable/drinks/drinks.ftl | 6 ++++++ .../entities/objects/fun/erp/fleshlight.ftl | 2 +- .../objects/consumable/drinks/drinks.ftl | 8 ++------ .../Locale/ru-RU/_LostParadise/research.ftl | 2 +- Resources/Locale/ru-RU/accent/italian.ftl | 1 - .../ru-RU/actions/actions/actions-commands.ftl | 1 - Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl | 2 -- .../ru-RU/atmos/gas-canister-component.ftl | 1 - .../Locale/ru-RU/barsign/barsign-component.ftl | 1 - .../ru-RU/climbing/glass-table-component.ftl | 1 - .../interaction/interaction-popup-component.ftl | 1 - .../Locale/ru-RU/flavors/flavor-profiles.ftl | 1 - .../gravity/gravity-generator-component.ftl | 1 - Resources/Locale/ru-RU/info/info-window.ftl | 1 - .../interaction/interaction-popup-component.ftl | 1 - .../Locale/ru-RU/pda/Ringer/ringer-component.ftl | 1 - .../Locale/ru-RU/reagents/meta/physical-desc.ftl | 2 +- .../Locale/ru-RU/robust-toolbox/commands.ftl | 2 -- Resources/Locale/ru-RU/shell.ftl | 1 - Resources/Locale/ru-RU/shuttles/emergency.ftl | 1 - .../objects/consumable/drinks/drinks.ftl | 6 ++++++ .../objects/consumable/drinks/drinks_bottles.ftl | 16 ++++++++++++++++ .../entities/objects/fun/erp/fleshlight.ftl | 2 +- Resources/Locale/ru-RU/ui/transfer-amount.ftl | 1 - .../Locale/ru-RU/verbs/invoke-verb-command.ftl | 1 - .../Locale/ru-RU/verbs/list-verbs-command.ftl | 1 - Resources/Locale/ru-RU/voting/vote-commands.ftl | 1 - .../CharacterItemGroups/securityGroups.yml | 6 ------ 28 files changed, 34 insertions(+), 37 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl 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/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/research.ftl b/Resources/Locale/ru-RU/_LostParadise/research.ftl index a89b152f051..7e097b3edd7 100644 --- a/Resources/Locale/ru-RU/_LostParadise/research.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/research.ftl @@ -16,4 +16,4 @@ lppresearch-technology-combat-utility = Боевая медицина lppresearch-technology-basic-administration-of-drugs = Базовое введение препаратов lppresearch-technology-basic-tracking = Базовое отслеживание lppresearch-technology-advanced-tracking = Продвинутое отслеживание -lppresearch-combat-plasma-usage = Боевое применение плазмы \ No newline at end of file +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/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 From 25d4140c97920a4cc7d3686b72d5788270bceb4e Mon Sep 17 00:00:00 2001 From: MegaDaimond <158335048+MegaDaimond@users.noreply.github.com> Date: Mon, 14 Oct 2024 23:00:44 +0700 Subject: [PATCH 7/7] Update plasma_sword.yml --- .../Entities/Objects/Weapons/Melee/plasma_sword.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml index 7a32c2a084d..8ec27591cf3 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml @@ -106,8 +106,6 @@ - type: Appearance - type: IgnitionSource temperature: 1200 - - type: StaticPrice - price: 1000 - type: entity id: LPPPlasmaCartridge @@ -141,8 +139,6 @@ - type: EmitSoundOnLand sound: path: /Audio/Items/welder_drop.ogg - - type: StaticPrice - price: 10000 - type: entity name: Experimental plasma sword @@ -195,8 +191,6 @@ reagents: - ReagentId: Plasma Quantity: 0.05 - - type: StaticPrice - price: 300 - type: entity name: Plasma sword