Merge pull request #9303 from Kyep/teleport_fixes

Teleportation Fixes

code/modules/hydroponics/plant_genes.dm

@@ -315,12 +315,16 @@
 /datum/plant_gene/trait/teleport/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
 	var/teleport_radius = max(round(G.seed.potency / 10), 1)
 	var/turf/T = get_turf(C)
-	to_chat(C, "<span class='warning'>You slip through spacetime!</span>")
-	do_teleport(C, T, teleport_radius)
-	if(prob(50))
-		do_teleport(G, T, teleport_radius)
+	if(do_teleport(C, T, teleport_radius))
+		to_chat(C, "<span class='warning'>You slip through spacetime!</span>")
+		if(prob(50))
+			do_teleport(G, T, teleport_radius)
+		else
+			new /obj/effect/decal/cleanable/molten_object(T) //Leave a pile of goo behind for dramatic effect...
+			qdel(G)
 	else
-		new /obj/effect/decal/cleanable/molten_object(T) //Leave a pile of goo behind for dramatic effect...
+		to_chat(C, "<span class='warning'>[src] sparks, and burns up!</span>")
+		new /obj/effect/decal/cleanable/molten_object(T)
 		qdel(G)
 
 

code/modules/mining/equipment_locker.dm

@@ -664,6 +664,9 @@
 							var/turf/T = get_turf(H)
 							T.add_vomit_floor(H)
 							playsound(H, 'sound/effects/splat.ogg', 50, 1)
+		else
+			visible_message("<span class='warning'>[src] flickers and fails, due to bluespace interference!</span>")
+			qdel(src)
 
 /**********************Resonator**********************/
 

code/modules/telesci/telesci_computer.dm

@@ -311,7 +311,10 @@
 		return
 
 	if(teles_left > 0)
-		doteleport(user)
+		if(!doteleport(user))
+			telefail()
+			temp_msg = "ERROR! Target destination unreachable due to interference."
+			return
 	else
 		telefail()
 		temp_msg = "ERROR!<BR>Calibration required."