cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-22 05:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9992 from Baystation12/master

Browse Source 
Master into dev-freeze
This commit is contained in:
Zuhayr
2015-07-02 19:00:00 +09:30
parent de39dbd1bb 42a1ad8b81
commit 2a32150658
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm
+6 -6
View File
@@ -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()
code/modules/supermatter/supermatter.dm
+5 -3
View File
@@ -241,9 +241,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