Revert "Adds 15-force edaggers that look and function like pens when off."

This commit is contained in:
phil235
2015-08-16 00:36:08 +02:00
parent df758d2fff
commit 8a4f8a4482
5 changed files with 0 additions and 44 deletions
-6
View File
@@ -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."
-38
View File
@@ -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 << "<span class='warning'>[src] can now be concealed.</span>"
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 << "<span class='warning'>[src] is now active.</span>"
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)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB