From 58f43daee326133bb2a92219993ec7a40c282e7a Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Sat, 27 Aug 2016 15:20:25 -0700 Subject: [PATCH] makes nuke and grav gen properly destroy when zapped --- code/game/gamemodes/nuclear/nuclearbomb.dm | 3 +++ code/modules/power/gravitygenerator.dm | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 969a310c9dc..88aed68a67e 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -401,6 +401,9 @@ var/bomb_set return . = ..() +/obj/machinery/nuclearbomb/tesla_act(var/power) + ..() + qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over #define NUKERANGE 127 /obj/machinery/nuclearbomb/proc/explode() diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index a5471f8667e..d1623868bbd 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -36,6 +36,11 @@ var/const/GRAV_NEEDS_WRENCH = 3 if(prob(20)) set_broken() +/obj/machinery/gravity_generator/tesla_act(var/power) + ..() + set_broken() + 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]"