diff --git a/Content.Server/_Erida/ItemCombiner/ItemCombinerSystem.cs b/Content.Server/_Erida/ItemCombiner/ItemCombinerSystem.cs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl index db636df773e..d4dcbe22fce 100644 --- a/Resources/Locale/en-US/recipes/tags.ftl +++ b/Resources/Locale/en-US/recipes/tags.ftl @@ -157,3 +157,6 @@ construction-graph-tag-backpack = backpack # chemistry construction-graph-tag-centrifuge-compatible = centrifugable container + +# Erida +construction-graph-tag-energy-sword = energy sword diff --git a/Resources/Locale/ru-RU/recipes/tags.ftl b/Resources/Locale/ru-RU/recipes/tags.ftl index 4c24acb9a16..616b83bdb8b 100644 --- a/Resources/Locale/ru-RU/recipes/tags.ftl +++ b/Resources/Locale/ru-RU/recipes/tags.ftl @@ -134,3 +134,5 @@ construction-graph-tag-fire-helmet = пожарный шлем construction-graph-tag-spationaut-hardsuit = лёгкий скафандр утилизатора # clothing construction-graph-tag-backpack = рюкзак +# Erida +construction-graph-tag-energy-sword = Лазерный меч diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 3d7fd9680b1..5a2bc8cd2e7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -92,6 +92,13 @@ sprite: Objects/Weapons/Melee/e_sword-inhands.rsi - type: StaticPrice price: 2500 + - type: Construction # WD EDIT + deconstructionTarget: null + graph: EnergyDoubleSwordGraph + node: esword + - type: Tag # WD EDIT + tags: + - EnergySword - type: entity name: energy dagger @@ -343,6 +350,10 @@ - type: Reflect reflectProb: .75 spread: 75 + - type: Construction # WD EDIT + deconstructionTarget: null + graph: EnergyDoubleSwordGraph + node: desword # Item will look weird in handslot. Will need to adjust handstorage visuals in a future PR - type: entity diff --git a/Resources/Prototypes/_White/Recipes/hidden_crafts.yml b/Resources/Prototypes/_White/Recipes/hidden_crafts.yml new file mode 100644 index 00000000000..24b3c974a96 --- /dev/null +++ b/Resources/Prototypes/_White/Recipes/hidden_crafts.yml @@ -0,0 +1,12 @@ +- type: constructionGraph + id: EnergyDoubleSwordGraph + start: esword + graph: + - node: esword + edges: + - to: desword + steps: + - tag: EnergySword + name: construction-graph-tag-energy-sword + - node: desword + entity: EnergySwordDouble diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml new file mode 100644 index 00000000000..066e87a1489 --- /dev/null +++ b/Resources/Prototypes/_White/tags.yml @@ -0,0 +1,2 @@ +- type: Tag + id: EnergySword