Merge pull request #9018 from Ghommie/Ghommie-cit171

Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
parent 08c74d772a d9a09d7211
commit 27b3cb6656
47 changed files with 241 additions and 121 deletions
@@ -131,7 +131,7 @@
 	no_den_usage = 1

 /obj/item/gun/magic/wand/teleport/zap_self(mob/living/user)
-	if(do_teleport(user, user, 10))
+	if(do_teleport(user, user, 10, channel = TELEPORT_CHANNEL_MAGIC))
 		var/datum/effect_system/smoke_spread/smoke = new
 		smoke.set_up(3, user.loc)
 		smoke.start()