cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

ethereal fixes and changelog 5947

Browse Source
This commit is contained in:
DeityLink
2015-10-04 08:47:01 +02:00
parent 841cb6a56f
commit 087530a815
12 changed files with 97 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/spells/targeted/ethereal_jaunt.dm
View File

@@ -29,7 +29,7 @@
/proc/ethereal_jaunt(var/mob/living/target, duration, enteranim = "liquify", exitanim = "reappear", mist = 1)
var/mobloc = get_turf(target)
var/previncorp = target.incorporeal_move //This shouldn't ever matter under usual circumstances
if(target.incorporeal_move == 3) //they're already jaunting, we have another fix for this but this is sane)
if(target.incorporeal_move == INCORPOREAL_ETHEREAL) //they're already jaunting, we have another fix for this but this is sane)
return
target.unlock_from()
//Begin jaunting with an animation
@@ -40,9 +40,12 @@
steam.set_up(10, 0, mobloc)
steam.start()
//Turn on jaunt incorporeal movement, make him invincible and invisible
target.incorporeal_move = 3
target.incorporeal_move = INCORPOREAL_ETHEREAL
target.invisibility = INVISIBILITY_MAXIMUM
target.flags |= INVULNERABLE
var/old_density = target.density
target.density = 0
target.candrop = 0
target.alphas["etheral_jaunt"] = 125 //Spoopy mode to know you are jaunting
target.handle_alpha()
for(var/obj/screen/movable/spell_master/SM in target.spell_masters)
@@ -67,6 +70,8 @@
for(var/obj/screen/movable/spell_master/SM in target.spell_masters)
SM.silence_spells(0)
target.flags &= ~INVULNERABLE
target.density = old_density
target.candrop = 1
target.incorporeal_move = previncorp
target.alphas -= "etheral_jaunt"
target.handle_alpha()