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

code/game/atom_procs.dm

@@ -332,6 +332,8 @@
 
 /atom/Click(location,control,params)
 	//world << "atom.Click() on [src] by [usr] : src.type is [src.type]"
+	if(!istype(src,/obj/item/weapon/gun))
+		usr.last_target_click = world.time
 	var/list/pram = params2list(params)
 	if((pram["alt"] != null && pram["ctrl"] != null && pram["left"] != null) && istype(src,/atom/movable))
 		src:pull()

code/game/hud.dm

@@ -44,6 +44,11 @@
 #define ui_inv3 "SOUTH-1,3"
 
 
+#define ui_gun1 "WEST,NORTH"
+#define ui_gun2 "WEST+1,NORTH"
+#define ui_gun3 "WEST+2,NORTH"
+
+
 
 obj/hud/New(var/type = 0)
 	instantiate(type)

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