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

Spell channeling (#10042)

Browse Source 
* Part 2

Pmuch works

* Final part

Adding helpings to properly take charge and remove the spell channeling in certain cases like logout

* Bugfix

* This might be important too

* Addressing comments

* Removing this line

* YOU FUCKING ABSOLUTE MADMAN

* A bit of update

Drop item hotkey removes spell channeling before dropping things

* Converts matter eater to spell channeling system
Message given to dropping spell channeling with drop verb

* Modifying is valid target for matter eater

* Better animated icon
This commit is contained in:
clusterfack
2016-05-18 22:18:42 -05:00
committed by 9600bauds
parent f5df6c96f3
commit b014b30a63
12 changed files with 116 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/projectile/beams.dm
View File

@@ -427,7 +427,7 @@ var/list/beam_master = list()
break
spawn(10)
for(var/atom/thing in ouroverlays)
if(!thing.timestopped && !thing.loc.timestopped)
if(!thing.timestopped && thing.loc && !thing.loc.timestopped)
ouroverlays -= thing
returnToPool(thing)
spawn