Merge pull request #811 from Artorp/electricchair

Electric Chair update
This commit is contained in:
Fox-McCloud
2015-04-16 00:20:10 -04:00
2 changed files with 36 additions and 28 deletions
+30 -22
View File
@@ -1,15 +1,24 @@
/obj/structure/stool/bed/chair/e_chair
name = "electric chair"
desc = "Looks absolutely SHOCKING!"
icon_state = "echair0"
var/on = 0
var/obj/item/assembly/shock_kit/part = null
var/last_time = 1.0
var/delay_time = 50
/obj/structure/stool/bed/chair/e_chair/New()
..()
overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)
spawn(2)
if(isnull(part)) //This e-chair was not custom built
part = new(src)
var/obj/item/clothing/head/helmet/part1 = new(part)
var/obj/item/device/radio/electropack/part2 = new(part)
part2.frequency = 1445
part2.code = 6
part2.master = part
part.part1 = part1
part.part2 = part2
return
/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
@@ -24,20 +33,17 @@
return
return
/obj/structure/stool/bed/chair/e_chair/verb/toggle()
set name = "Toggle Electric Chair"
/obj/structure/stool/bed/chair/e_chair/verb/activate_e_chair()
set name = "Activate Electric Chair"
set category = "Object"
set src in oview(1)
if(usr.stat || !usr.canmove || usr.restrained())
return
if(on)
on = 0
icon_state = "echair0"
else
on = 1
icon_state = "echair1"
shock()
usr << "<span class='notice'>You switch [on ? "on" : "off"] [src].</span>"
if(last_time + delay_time > world.time)
usr << "<span class='warning'>\The [src] is not ready yet!</span>"
return
usr << "<span class='notice'>You activate \the [src].</span>"
shock()
return
/obj/structure/stool/bed/chair/e_chair/rotate()
@@ -47,34 +53,36 @@
return
/obj/structure/stool/bed/chair/e_chair/proc/shock()
if(!on)
return
if(last_time + 50 > world.time)
if(last_time + delay_time > world.time)
return
last_time = world.time
icon_state = "echair1"
spawn(delay_time)
icon_state = "echair0"
// special power handling
var/area/A = get_area(src)
if(!isarea(A))
return
if(!A.powered(EQUIP))
return
A.use_power(EQUIP, 5000)
A.use_power(5000, EQUIP)
var/light = A.power_light
A.updateicon()
flick("echair1", src)
flick("echair_shock", src)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(12, 1, src)
s.start()
visible_message("<span class='danger'>The electric chair went off!</span>", "<span class='danger'>You hear a deep sharp shock!</span>")
if(buckled_mob)
buckled_mob.burn_skin(85)
buckled_mob.burn_skin(90)
buckled_mob << "<span class='danger'>You feel a deep shock course through your body!</span>"
sleep(1)
buckled_mob.burn_skin(85)
buckled_mob.Stun(600)
on = 0
visible_message("<span class='danger'>The electric chair went off!</span>", "<span class='danger'>You hear a deep sharp shock!</span>")
buckled_mob.burn_skin(90)
sleep(5)
buckled_mob.burn_skin(max(rand(5,20),rand(5,20),rand(5,20)))
A.power_light = light
A.updateicon()