diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 1566a84e52..93b2e41572 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -505,8 +505,8 @@
     - state: icon-syndicate
   - type: ItemBorgModule
     items:
-    - WeaponAdvancedLaser
-    - Machete
+    - WeaponPistolEchis
+    - EnergyDaggerLoud
 
 - type: entity
   id: BorgModuleOperative
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index ae309661fe..8f469f87a9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -102,6 +102,41 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
 
+- type: entity
+  name: echis
+  parent: BaseItem
+  id: WeaponPistolEchis
+  description: A viper for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges.
+  components:
+  - type: Gun
+    fireRate: 5
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Pistols/viper.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletPistol
+    fireCost: 100
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 25
+  - type: AmmoCounter
+
 - type: entity
   name: cobra
   parent: BaseWeaponPistol
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index ce3545920a..1e0aaf61e5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -81,26 +81,25 @@
     temperature: 700
 
 - type: entity
-  name: pen
+  name: energy dagger
   parent: EnergySword
-  id: EnergyDagger
-  suffix: E-Dagger
-  description: 'A dark ink pen.'
+  id: EnergyDaggerLoud
+  description: A not as loud and dangerous dagger with a beam made of pure, concentrated plasma. This one is completely undisguised.
   components:
   - type: ItemToggle
     soundActivate:
       path: /Audio/Weapons/ebladeon.ogg
       params:
-        volume: -6
+        volume: -3
     soundDeactivate:
       path: /Audio/Weapons/ebladeoff.ogg
       params:
-        volume: -6
+        volume: -3
   - type: ItemToggleMeleeWeapon
     activatedSoundOnSwing:
       path: /Audio/Weapons/eblademiss.ogg
       params:
-        volume: -6
+        volume: -3
         variation: 0.250
     activatedDamage:
         types:
@@ -111,14 +110,14 @@
     activeSound:
       path: /Audio/Weapons/ebladehum.ogg
       params:
-        volume: -6
+        volume: -3
   - type: ComponentToggler
     components:
     - type: Sharp
     - type: DisarmMalus
       malus: 0.4
   - type: Sprite
-    sprite: Objects/Weapons/Melee/e_dagger.rsi
+    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
     layers:
       - state: e_sword
       - state: e_sword_blade
@@ -135,7 +134,7 @@
         Blunt: 1
   - type: Item
     size: Tiny
-    sprite: Objects/Weapons/Melee/e_dagger.rsi
+    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
   - type: UseDelay
     delay: 1.0
   - type: PointLight
@@ -154,11 +153,45 @@
       right:
       - state: inhand-right-blade
         shader: unshaded
+  - type: DisarmMalus
+    malus: 0
+
+- type: entity
+  name: pen
+  parent: EnergyDaggerLoud
+  id: EnergyDagger
+  suffix: E-Dagger
+  description: 'A dark ink pen.'
+  components:
+  - type: ItemToggle
+    soundActivate:
+      path: /Audio/Weapons/ebladeon.ogg
+      params:
+        volume: -6
+    soundDeactivate:
+      path: /Audio/Weapons/ebladeoff.ogg
+      params:
+        volume: -6
+  - type: ItemToggleActiveSound
+    activeSound:
+      path: /Audio/Weapons/ebladehum.ogg
+      params:
+        volume: -6
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/e_dagger.rsi
+    layers:
+      - state: e_sword
+      - state: e_sword_blade
+        color: "#FFFFFF"
+        visible: false
+        shader: unshaded
+        map: [ "blade" ]
+  - type: Item
+    size: Tiny
+    sprite: Objects/Weapons/Melee/e_dagger.rsi
   - type: Tag
     tags:
     - Write
-  - type: DisarmMalus
-    malus: 0
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png
new file mode 100644
index 0000000000..109a3230b9
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png
new file mode 100644
index 0000000000..8b8c9f45a7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png
new file mode 100644
index 0000000000..4111eebaab
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png
new file mode 100644
index 0000000000..03d50f98ef
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png
new file mode 100644
index 0000000000..639da1c184
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png
new file mode 100644
index 0000000000..ae7c25221e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png
new file mode 100644
index 0000000000..00d8e890aa
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json
new file mode 100644
index 0000000000..3b12fda33e
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json
@@ -0,0 +1,78 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation and modified by alzore_(Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "e_sword"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "e_sword_blade",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "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
+        ]
+      ]
+    }
+  ]
+}