From f64f1e296729dd67d82086205121700b222009d3 Mon Sep 17 00:00:00 2001
From: Miauw <gilles.coremans@gmail.com>
Date: Sun, 16 Aug 2015 12:55:09 +0200
Subject: [PATCH] Reverts the revert properly instead of unreverting it
 unproperly.

---
 code/datums/uplink_item.dm         |  6 ++++++
 code/modules/paperwork/pen.dm      | 24 +++++++++++++-----------
 html/changelogs/Miauw-edaggers.yml |  7 +++++++
 3 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 html/changelogs/Miauw-edaggers.yml

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index bf1edc9c372..802ce9a2c2e 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -353,6 +353,12 @@ var/list/uplink_items = list()
 	cost = 6
 	excludefrom = list(/datum/game_mode/nuclear)
 
+/datum/uplink_item/stealthy_weapons/edagger
+	name = "Energy Dagger"
+	desc = "A dagger made of energy that looks and functions as a pen when off."
+	item = /obj/item/weapon/pen/edagger
+	cost = 2
+
 /datum/uplink_item/stealthy_weapons/foampistol
 	name = "Toy Gun (with Stun Darts)"
 	desc = "An innocent-looking toy pistol designed to fire foam darts. Comes loaded with riot-grade darts, to incapacitate a target."
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index e1e38fc0ecf..219449f1228 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -3,6 +3,7 @@
  *		Pens
  *		Sleepy Pens
  *		Parapens
+ *		Edaggers
  */
 
 
@@ -48,16 +49,17 @@
 	if(!istype(M))
 		return
 
-	if(M.can_inject(user, 1) && force == initial(force))
-		user << "<span class='warning'>You stab [M] with the pen.</span>"
-		if(!stealth)
-			M << "<span class='danger'>You feel a tiny prick!</span>"
-		. = 1
+	if(!force)
+		if(M.can_inject(user, 1))
+			user << "<span class='warning'>You stab [M] with the pen.</span>"
+			if(!stealth)
+				M << "<span class='danger'>You feel a tiny prick!</span>"
+			. = 1
 
 		add_logs(user, M, "stabbed", src)
-	
+
 	else
-		..()
+		. = ..()
 
 /*
  * Sleepypens
@@ -99,17 +101,17 @@
 		hitsound = initial(hitsound)
 		embed_chance = initial(embed_chance)
 		throwforce = initial(throwforce)
-		playsound(user, 'sound/weapons/saberoff.ogg', 10, 1)
+		playsound(user, 'sound/weapons/saberoff.ogg', 5, 1)
 		user << "<span class='warning'>[src] can now be concealed.</span>"
 	else
 		on = 1
-		force = 20
+		force = 18
 		w_class = 3
 		name = "energy dagger"
 		hitsound = 'sound/weapons/blade1.ogg'
-		embed_chance = 90 //rule of cool
+		embed_chance = 100 //rule of cool
 		throwforce = 35
-		playsound(user, 'sound/weapons/saberon.ogg', 10, 1)
+		playsound(user, 'sound/weapons/saberon.ogg', 5, 1)
 		user << "<span class='warning'>[src] is now active.</span>"
 	update_icon()
 
diff --git a/html/changelogs/Miauw-edaggers.yml b/html/changelogs/Miauw-edaggers.yml
new file mode 100644
index 00000000000..2de9a6f5b65
--- /dev/null
+++ b/html/changelogs/Miauw-edaggers.yml
@@ -0,0 +1,7 @@
+#working traitor items are power creep
+author: Miauw
+
+delete-after: True
+
+changes: 
+  - tweak: "Edaggers actually work now and have been buffed to 18 brute and 2 TC."