Teleprods fixes (#17965)

* fixes teleprods creating igniters

* undoes rogue dme change
This commit is contained in:
PKPenguin321
2016-05-27 19:32:01 -07:00
committed by KorPhaeron
parent b18bbf309c
commit 263afa7df4
+4 -27
View File
@@ -29,33 +29,10 @@
user.unEquip(src)
user.unEquip(I)
user.put_in_hands(S)
user << "<span class='notice'>You clamp the bluespace crystal securely with the wirecutters.</span>"
I.loc = S//places the crystal into the contents of the prod for later removal
qdel(src)
else
user.visible_message("<span class='warning'>You can't install the crystal onto the stunprod while it has a powercell installed!</span>")
else
return ..()
/obj/item/weapon/melee/baton/cattleprod/teleprod/attack_self(mob/user, obj/item/I)//handles removing the bluespace crystal + turning the prod on and off
if(bcell && bcell.charge > hitcost)
status = !status
user << "<span class='notice'>[src] is now [status ? "on" : "off"].</span>"
playsound(loc, "sparks", 75, 1, -1)
else
status = 0
if(!bcell)
var/obj/item/weapon/melee/baton/cattleprod/S = new /obj/item/weapon/melee/baton/cattleprod
if(!remove_item_from_storage(user))
user.unEquip(src)
var/turf/open/floorloc = get_turf(user)
floorloc.contents += contents//drops the contents of the prod (the only content should be the crystal) at the user's feet
user.unEquip(I)
user.put_in_hands(S)
user << "<span class='notice'>You carefully remove the bluespace crystal from the teleprod.</span>"
user << "<span class='notice'>You place the bluespace crystal firmly into the igniter.</span>"
qdel(I)
qdel(src)
else
user << "<span class='warning'>[src] is out of charge.</span>"
update_icon()
add_fingerprint(user)
user.visible_message("<span class='warning'>You can't put the crystal onto the stunprod while it has a power cell installed!</span>")
else
return ..()