From c05a7d5b75d4ca3ec7c8ab98ef72e78daa7e3c7e Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 26 Jul 2016 13:23:58 -0400 Subject: [PATCH] derp --- code/game/objects/items/weapons/teleprod.dm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm index 7c9f7c14f9f..0bc1b23f6d6 100644 --- a/code/game/objects/items/weapons/teleprod.dm +++ b/code/game/objects/items/weapons/teleprod.dm @@ -15,20 +15,4 @@ deductcharge(hitcost) do_teleport(user, get_turf(user), 50)//honk honk else if(iscarbon(M) && !M.anchored) - do_teleport(M, get_turf(M), 15) - -/obj/item/weapon/melee/baton/cattleprod/attackby(obj/item/I, mob/user, params)//handles sticking a crystal onto a stunprod to make a teleprod - if(istype(I, /obj/item/weapon/ore/bluespace_crystal)) - if(!bcell) - var/obj/item/weapon/melee/baton/cattleprod/teleprod/S = new /obj/item/weapon/melee/baton/cattleprod/teleprod - if(!remove_item_from_storage(user)) - user.unEquip(src) - user.unEquip(I) - user.put_in_hands(S) - to_chat(user, "You clamp the bluespace crystal securely with the wirecutters.") - qdel(I) - qdel(src) - else - to_chat(user, "You can't put the crystal onto the stunprod while it has a power cell installed!") - else - return ..() + do_teleport(M, get_turf(M), 15) \ No newline at end of file