Merge pull request #20083 from PKPenguin321/explosive-tesla

[READY] Explosive Tesla, Take 2
This commit is contained in:
oranges
2016-08-28 12:42:22 +12:00
committed by GitHub
9 changed files with 46 additions and 11 deletions

View File

@@ -36,6 +36,10 @@ var/const/GRAV_NEEDS_WRENCH = 3
if(prob(20))
set_broken()
/obj/machinery/gravity_generator/tesla_act(var/power)
..()
qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over
/obj/machinery/gravity_generator/update_icon()
..()
icon_state = "[get_status()]_[sprite_number]"

View File

@@ -535,6 +535,10 @@
else
flicker()
/obj/machinery/light/tesla_act(var/power)
explosion(src.loc,0,0,0,flame_range = 5, adminlog = 0)
qdel(src)
// called when area power state changes
/obj/machinery/light/power_change()
var/area/A = get_area(src)

View File

@@ -38,6 +38,9 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
var/energy_to_raise = 32
var/energy_to_lower = -20
/obj/singularity/energy_ball/ex_act(severity, target)
return
/obj/singularity/energy_ball/Destroy()
if(orbiting && istype(orbiting, /obj/singularity/energy_ball))
var/obj/singularity/energy_ball/EB = orbiting