From: TheKittehJesus <29379890+SamGithubAccount@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:13:18 +0000 (-0500) Subject: Fix: Syndie borg can now wield DEsword (#30229) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1f29a5ad3640e24746e788209cbec1c596611a77;p=space-station-14.git Fix: Syndie borg can now wield DEsword (#30229) * Syndie borg can now wield DEsword * Made child of EnergySwordDouble for borgs * Made ESword borg module use this new borg DESword * Removed name property of CyborgDESword so that it now inherits from DESword and added a suffix to differentiate the two in spawn menu --- diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 93b2e41572..92c2af3de4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -536,7 +536,7 @@ - state: icon-syndicate - type: ItemBorgModule items: - - EnergySwordDouble + - CyborgEnergySwordDouble - PinpointerSyndicateNuclear - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 1e0aaf61e5..fead3f8c02 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -317,3 +317,12 @@ right: - state: inhand-right-blade shader: unshaded + +- type: entity + suffix: One-Handed, For Borgs + parent: EnergySwordDouble + id: CyborgEnergySwordDouble # why is this invalid if ID is BorgEnergySwordDouble + description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. Specially designed for syndicate cyborgs. + components: # could add energy-draining like the L6C + - type: Wieldable + freeHandsRequired: 0 # because borg has no off-hand to wield with. Without this, it will be unable to activate the esword