Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27515

2017-05-23 05:17:39 -05:00
parent 1989e3d5ea e2ea28c3b8
commit bb51ed94ab
234 changed files with 61548 additions and 61182 deletions
@@ -92,9 +92,9 @@
 	if(next_move > world.time) // in the year 2000...
 		return

-	if(A.IsObscured())
-		return
-
+	if(A.IsObscured())
+		return
+
 	if(istype(loc,/obj/mecha))
 		var/obj/mecha/M = loc
 		return M.click_action(A,src,params)
@@ -144,24 +144,24 @@
 		else
 			RangedAttack(A,params)

-//Is the atom obscured by a PREVENT_CLICK_UNDER object above it
-/atom/proc/IsObscured()
-	if(!isturf(loc)) //This only makes sense for things directly on turfs for now
-		return FALSE
-	var/turf/T = get_turf_pixel(src)
-	if(!T)
-		return FALSE
-	for(var/atom/movable/AM in T)
-		if(AM.flags & PREVENT_CLICK_UNDER && AM.density && AM.layer > layer)
-			return TRUE
-	return FALSE
-
-/turf/IsObscured()
-	for(var/atom/movable/AM in src)
-		if(AM.flags & PREVENT_CLICK_UNDER && AM.density)
-			return TRUE
-	return FALSE
-
+//Is the atom obscured by a PREVENT_CLICK_UNDER object above it
+/atom/proc/IsObscured()
+	if(!isturf(loc)) //This only makes sense for things directly on turfs for now
+		return FALSE
+	var/turf/T = get_turf_pixel(src)
+	if(!T)
+		return FALSE
+	for(var/atom/movable/AM in T)
+		if(AM.flags & PREVENT_CLICK_UNDER && AM.density && AM.layer > layer)
+			return TRUE
+	return FALSE
+
+/turf/IsObscured()
+	for(var/atom/movable/AM in src)
+		if(AM.flags & PREVENT_CLICK_UNDER && AM.density)
+			return TRUE
+	return FALSE
+
 /atom/movable/proc/CanReach(atom/target,obj/item/tool,view_only = FALSE)
 	if(isturf(target) || isturf(target.loc) || DirectAccess(target)) //Directly accessible atoms
 		if(Adjacent(target) || (tool && CheckToolReach(src, target, tool.reach))) //Adjacent or reaching attacks
@@ -13,7 +13,7 @@
 /atom/proc/attack_tk(mob/user)
 	if(user.stat)
 		return
-	new /obj/effect/overlay/temp/telekinesis(loc)
+	new /obj/effect/temp_visual/telekinesis(loc)
 	user.UnarmedAttack(src,0) // attack_hand, attack_paw, etc
 	return

@@ -163,7 +163,7 @@
 /obj/item/tk_grab/proc/apply_focus_overlay()
 	if(!focus)
 		return
-	new /obj/effect/overlay/temp/telekinesis(get_turf(focus))
+	new /obj/effect/temp_visual/telekinesis(get_turf(focus))

 /obj/item/tk_grab/update_icon()
 	cut_overlays()