shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9018 from Ghommie/Ghommie-cit171

Browse Source 
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
This commit is contained in:
kevinz000
2019-08-04 19:04:59 -07:00
committed by GitHub
parent 08c74d772a d9a09d7211
commit 27b3cb6656
47 changed files with 241 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/bscrystal.dm
+1 -1
View File
@@ -33,7 +33,7 @@
use(1)
/obj/item/stack/ore/bluespace_crystal/proc/blink_mob(mob/living/L)
do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg')
do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
/obj/item/stack/ore/bluespace_crystal/throw_impact(atom/hit_atom)
if(!..()) // not caught in mid-air