Merge branch 'master' of github.com:Baystation12/Baystation12

code/game/objects/portals.dm

@@ -64,6 +64,7 @@
 		if (istype(M, /atom/movable))
 			var/temp = get_dir(M,src)
 			do_teleport(M, target) ///You will appear at the beacon
+			step(M,temp)
 			var/turf/target2 = get_edge_target_turf(M, temp)
 			M.throw_at(target2,100,2)
 

code/game/objects/radio/radio.dm

@@ -128,7 +128,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 
 		if(!src.loc)
 			on = 0
-		var/area/A = src.loc.loc
+		var/area/A = get_area(src)
 		if(!A || !isarea(A) || !A.master)
 			on = 0
 		else