Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970)

2017-07-10 18:10:42 -05:00
parent 5cdd069136
commit 1b70c06474
74 changed files with 113 additions and 114 deletions
@@ -61,7 +61,7 @@
 	..()
 	SSair.hotspots += src
 	perform_exposure()
-	setDir(pick(GLOB.cardinal))
+	setDir(pick(GLOB.cardinals))
 	air_update_turf()

 /obj/effect/hotspot/make_frozen_visual()
@@ -39,7 +39,7 @@

 /turf/proc/CalculateAdjacentTurfs()
 	var/list/atmos_adjacent_turfs = src.atmos_adjacent_turfs
-	for(var/direction in GLOB.cardinal)
+	for(var/direction in GLOB.cardinals)
 		var/turf/T = get_step(src, direction)
 		if(!T)
 			continue
@@ -76,7 +76,7 @@
 		var/matchingDirections = 0
 		var/turf/S = get_step(curloc, direction)

-		for (var/checkDirection in GLOB.cardinal)
+		for (var/checkDirection in GLOB.cardinals)
 			var/turf/checkTurf = get_step(S, checkDirection)
 			if(!S.atmos_adjacent_turfs || !S.atmos_adjacent_turfs[checkTurf])
 				continue
@@ -364,7 +364,7 @@
 /turf/open/conductivity_directions()
 	if(blocks_air)
 		return ..()
-	for(var/direction in GLOB.cardinal)
+	for(var/direction in GLOB.cardinals)
 		var/turf/T = get_step(src, direction)
 		if(!(T in atmos_adjacent_turfs) && !(atmos_supeconductivity & direction))
 			. |= direction
@@ -393,7 +393,7 @@

 	if(conductivity_directions)
 		//Conduct with tiles around me
-		for(var/direction in GLOB.cardinal)
+		for(var/direction in GLOB.cardinals)
 			if(conductivity_directions & direction)
 				var/turf/neighbor = get_step(src,direction)

@@ -67,7 +67,7 @@ Pipelines + Other Objects -> Pipe network
 	node_connects.len = device_type

 	for(DEVICE_TYPE_LOOP)
-		for(var/D in GLOB.cardinal)
+		for(var/D in GLOB.cardinals)
 			if(D & GetInitDirections())
 				if(D in node_connects)
 					continue
@@ -177,7 +177,7 @@ Pipelines + Other Objects -> Pipe network

 	var/fuck_you_dir = get_dir(src, user) // Because fuck you...
 	if(!fuck_you_dir)
-		fuck_you_dir = pick(GLOB.cardinal)
+		fuck_you_dir = pick(GLOB.cardinals)
 	var/turf/target = get_edge_target_turf(user, fuck_you_dir)
 	var/range = pressures/250
 	var/speed = range/5
@@ -308,7 +308,7 @@ Pipelines + Other Objects -> Pipe network
 		if(src.nodes[I])
 			var/obj/machinery/atmospherics/node = src.nodes[I]
 			var/connected = FALSE
-			for(var/D in GLOB.cardinal)
+			for(var/D in GLOB.cardinals)
 				if(node in get_step(src, D))
 					connected = TRUE
 					break
@@ -31,7 +31,7 @@ Iconnery

 /obj/machinery/atmospherics/components/proc/icon_addbroken(var/connected = 0)
 	var/unconnected = (~connected) & initialize_directions
-	for(var/direction in GLOB.cardinal)
+	for(var/direction in GLOB.cardinals)
 		if(unconnected & direction)
 			underlays += getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_exposed", direction)

@@ -12,12 +12,12 @@
 /obj/machinery/atmospherics/components/trinary/filter/flipped
 	icon_state = "filter_off_f"
 	flipped = 1
-	
+
 // These two filter types have critical_machine flagged to on and thus causes the area they are in to be exempt from the Grid Check event.
-	
+
 /obj/machinery/atmospherics/components/trinary/filter/critical
 	critical_machine = TRUE
-	
+
 /obj/machinery/atmospherics/components/trinary/filter/flipped/critical
 	critical_machine = TRUE

@@ -34,7 +34,7 @@

 /obj/machinery/atmospherics/components/trinary/filter/update_icon()
 	cut_overlays()
-	for(var/direction in GLOB.cardinal)
+	for(var/direction in GLOB.cardinals)
 		if(direction & initialize_directions)
 			var/obj/machinery/atmospherics/node = findConnecting(direction)
 			if(node)
@@ -19,7 +19,7 @@

 /obj/machinery/atmospherics/components/trinary/mixer/update_icon()
 	cut_overlays()
-	for(var/direction in GLOB.cardinal)
+	for(var/direction in GLOB.cardinals)
 		if(direction & initialize_directions)
 			var/obj/machinery/atmospherics/node = findConnecting(direction)
 			if(node)