Merge pull request #2441 from TheDZD/teleport

Bluespace crystal and tomato fix
This commit is contained in:
Fox McCloud
2015-10-31 21:26:47 -04:00
2 changed files with 7 additions and 1 deletions
+2
View File
@@ -342,6 +342,8 @@
// Bluespace tomato code copied over from grown.dm.
if(get_trait(TRAIT_TELEPORTING))
if(target.z in config.admin_levels)
return 1
//Plant potency determines radius of teleport.
var/outer_teleport_radius = get_trait(TRAIT_POTENCY)/5
+5 -1
View File
@@ -20,6 +20,10 @@
qdel(src)
/obj/item/bluespace_crystal/proc/blink_mob(var/mob/living/L)
if(L.z in config.admin_levels)
src.visible_message("<span class=warning>[src]'s fragments begin rapidly vibrating and blink out of existence.<span>")
qdel(src)
return
do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg')
/obj/item/bluespace_crystal/throw_impact(atom/hit_atom)
@@ -33,4 +37,4 @@
name = "artificial bluespace crystal"
desc = "An artificially made bluespace crystal, it looks delicate."
origin_tech = "bluespace=2"
blink_range = 4 // Not as good as the organic stuff!
blink_range = 4 // Not as good as the organic stuff!