diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 1a863f36146..bf1edc9c372 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -353,12 +353,6 @@ 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 = 3 - /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 d62a13018ed..6e0f9b5e979 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -78,41 +78,3 @@ reagents.add_reagent("mutetoxin", 15) reagents.add_reagent("tirizene", 10) ..() - -/* - * (Alan) Edaggers - */ -/obj/item/weapon/pen/edagger - origin_tech = "combat=3;syndicate=5" - var/on = 0 - -/obj/item/weapon/pen/edagger/attack_self(mob/living/user) - if(on) - on = 0 - force = initial(force) - w_class = initial(w_class) - name = initial(name) - hitsound = initial(hitsound) - embed_chance = initial(embed_chance) - throwforce = initial(throwforce) - playsound(user, 'sound/weapons/saberoff.ogg', 10, 1) - user << "[src] can now be concealed." - else - on = 1 - force = 15 - w_class = 3 - name = "energy dagger" - hitsound = 'sound/weapons/blade1.ogg' - embed_chance = 90 //rule of cool - throwforce = 35 - playsound(user, 'sound/weapons/saberon.ogg', 10, 1) - user << "[src] is now active." - update_icon() - -/obj/item/weapon/pen/edagger/update_icon() - if(on) - icon_state = "edagger" - item_state = "edagger" - else - icon_state = initial(icon_state) //looks like a normal pen when off. - item_state = initial(item_state) diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index f3510784ba3..d4b7e0ae9c6 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 40da98ba7f0..a74d2ce1271 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 2b2b6702fe7..830fac5dea8 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ