From 45b314bd603da678d2b8f91cb486db38c3755cef Mon Sep 17 00:00:00 2001 From: Amunak Date: Sun, 30 Nov 2014 00:16:54 +0100 Subject: [PATCH] Moved shard to the bottom of the file, tweaked its values. Also added the time between delamination and actual explosion (pull time) as a separate val and lowered it for the shard. --- code/modules/supermatter/supermatter.dm | 36 +++++++++++++------------ 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index 1629ccc2d1..6df30be1ec 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -58,6 +58,8 @@ var/grav_pulling = 0 var/pull_radius = 14 + // Time in ticks between delamination ('exploding') and exploding (as in the actual boom) + var/pull_time = 100 var/explosion_power = 8 var/emergency_issued = 0 @@ -81,22 +83,6 @@ var/debug = 0 - shard //Small subtype, less efficient and more sensitive, but less boom. - name = "Supermatter Shard" - desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. \red You get headaches just from looking at it." - icon_state = "darkmatter_shard" - base_icon_state = "darkmatter_shard" - - warning_point = 50 - emergency_point = 500 - explosion_point = 900 - - gasefficency = 0.125 - - pull_radius = 5 - explosion_power = 3 //3,6,9,12? Or is that too small? - - /obj/machinery/power/supermatter/New() . = ..() radio = new (src) @@ -109,7 +95,7 @@ /obj/machinery/power/supermatter/proc/explode() anchored = 1 grav_pulling = 1 - spawn(100) + spawn(pull_time) explosion(get_turf(src), explosion_power, explosion_power * 2, explosion_power * 3, explosion_power * 4, 1) del src return @@ -364,3 +350,19 @@ /obj/machinery/power/supermatter/RepelAirflowDest(n) return + +/obj/machinery/power/supermatter/shard //Small subtype, less efficient and more sensitive, but less boom. + name = "Supermatter Shard" + desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. \red You get headaches just from looking at it." + icon_state = "darkmatter_shard" + base_icon_state = "darkmatter_shard" + + warning_point = 50 + emergency_point = 400 + explosion_point = 600 + + gasefficency = 0.125 + + pull_radius = 5 + pull_time = 45 + explosion_power = 3 \ No newline at end of file