Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476

[MIRROR] [s] Fix launchpads creating way too many sparks
This commit is contained in:
LetterJay
2018-06-18 10:09:42 -05:00
committed by GitHub
3 changed files with 74 additions and 166 deletions
@@ -960,9 +960,12 @@
to_chat(M, "<span class='warning'>You feel unstable...</span>")
M.Jitter(2)
current_cycle = 1
addtimer(CALLBACK(GLOBAL_PROC, .proc/do_teleport, M, get_turf(M), 5, null, null, null, 'sound/effects/phasein.ogg'), 30)
addtimer(CALLBACK(M, /mob/living/proc/bluespace_shuffle), 30)
..()
/mob/living/proc/bluespace_shuffle()
do_teleport(src, get_turf(src), 5, asoundin = 'sound/effects/phasein.ogg')
/datum/reagent/aluminium
name = "Aluminium"
id = "aluminium"