From 5ec5fdeb463b6dd3870088f70c60e0b1b0c00bb3 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 1 Jul 2015 01:11:00 -0400 Subject: [PATCH 1/2] Fixes #9591 Adjusts supermatter radiation range and intensity --- code/modules/supermatter/supermatter.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index 43ff63833d6..cdcd59e7ee4 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -234,9 +234,11 @@ if(!istype(l.glasses, /obj/item/clothing/glasses/meson)) l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) ) - //adjusted range so that a power of 300 (pretty high) results in 8 tiles, roughly the distance from the core to the engine monitoring room. - for(var/mob/living/l in range(src, round(sqrt(power / 5)))) - var/rads = (power / 10) * sqrt( 1 / get_dist(l, src) ) + //adjusted range so that a power of 170 (pretty high) results in 9 tiles, roughly the distance from the core to the engine monitoring room. + //note that the rads given at the maximum range is a constant 0.2 - as power increases the maximum range merely increases. + for(var/mob/living/l in range(src, round(sqrt(power / 2)))) + var/radius = max(get_dist(l, src), 1) + var/rads = (power / 10) * ( 1 / (radius**2) ) l.apply_effect(rads, IRRADIATE) power -= (power/DECAY_FACTOR)**3 //energy losses due to radiation From 7b1d9a54beffb8928d4fe0aff6e0bf2598469247 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Thu, 2 Jul 2015 06:36:30 +0100 Subject: [PATCH 2/2] Fixes the third teleportation effect why isn't this a proc --- .../artifact/effects/unknown_effect_teleport.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm index 6f6d7f88f35..5df1a33f66d 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm @@ -33,10 +33,10 @@ var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(M)) sparks.start() - // - M.Move(pick(trange(50, get_turf(holder)))) + + M.Move(pick(trange(50, T))) sparks = new /datum/effect/effect/system/spark_spread() - sparks.set_up(3, 0, get_turf(M)) + sparks.set_up(3, 0, M.loc) sparks.start() /datum/artifact_effect/teleport/DoEffectPulse() @@ -52,8 +52,8 @@ var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(M)) sparks.start() - // - M.loc = pick(orange(get_turf(T), 50)) + + M.Move(pick(trange(50, T))) sparks = new /datum/effect/effect/system/spark_spread() - sparks.set_up(3, 0, get_turf(M)) + sparks.set_up(3, 0, M.loc) sparks.start()