diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 6321706e55..7235b8f997 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -47,12 +47,13 @@
 #  itemId: DoubleBladedESword
 #  price: 16
 
-# bug swept to make
-#- type: uplinkListing
-#  id: UplinkEnergyDagger
-#  category: Weapons
-#  itemId: EnergyDagger
-#  price: 2
+- type: uplinkListing
+  id: UplinkEnergyDagger
+  category: Weapons
+  itemId: EnergyDagger
+  listingName: Energy Dagger
+  description: A small energy blade conveniently disguised in the form of a pen.
+  price: 2
 
 # Explosives
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index aa75f3c4a6..b053cbef34 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -36,3 +36,46 @@
   - type: Appearance
     visuals:
     - type: EnergySwordVisualizer
+
+- type: entity
+  name: pen
+  parent: EnergySword
+  id: EnergyDagger
+  suffix: E-Dagger
+  description: 'A dark ink pen.'
+  components:
+  - type: EnergySword
+    litDamageBonus:
+        types:
+            Slash: 7.5
+            Heat: 7.5
+            Blunt: -1
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/e_dagger.rsi
+    layers:
+      - state: e_sword
+      - state: e_sword_blade
+        color: "#FFFFFF"
+        visible: false
+        shader: unshaded
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 1
+  - type: Item
+    size: 2
+    sprite: Objects/Weapons/Melee/e_dagger.rsi
+  - type: UseDelay
+    delay: 1.0
+  - type: PointLight
+    netsync: false
+    enabled: false
+    radius: 1.5
+    energy: 1.5
+    color: white
+  - type: Appearance
+    visuals:
+    - type: EnergySwordVisualizer
+  - type: Tag
+    tags:
+    - Write
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen.png
index fd06d6beed..e7d9fcbcbf 100644
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen.png and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_blue.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_blue.png
index 7908e1584e..bd06ca48ad 100644
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_blue.png and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_blue.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_red.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_red.png
index 7bebd69988..31fc30dabf 100644
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_red.png and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_red.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword.png
new file mode 100644
index 0000000000..e7d9fcbcbf
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword_blade.png
new file mode 100644
index 0000000000..3c03bbc789
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword_blade.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword_on.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword_on.png
new file mode 100644
index 0000000000..f1c209165f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword_on.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword_rainbow_on.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword_rainbow_on.png
new file mode 100644
index 0000000000..5a691ef5c2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/e_sword_rainbow_on.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/meta.json
new file mode 100644
index 0000000000..ace1544263
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/meta.json
@@ -0,0 +1,227 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "e_sword"
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "e_sword_rainbow_on",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+	{
+      "name": "e_sword_on",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+	{
+      "name": "e_sword_blade",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "on-rainbow-inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "on-rainbow-inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/off-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/off-inhand-left.png
new file mode 100644
index 0000000000..639da1c184
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/off-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/off-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/off-inhand-right.png
new file mode 100644
index 0000000000..00d8e890aa
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/off-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..03d50f98ef
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..afd1da1d0f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-rainbow-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-rainbow-inhand-left.png
new file mode 100644
index 0000000000..b1fa49e19d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-rainbow-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-rainbow-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-rainbow-inhand-right.png
new file mode 100644
index 0000000000..57e26517a1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger.rsi/on-rainbow-inhand-right.png differ