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

This commit is contained in:
CitadelStationBot
2017-07-10 18:10:42 -05:00
committed by kevinz000
parent 5cdd069136
commit 1b70c06474
74 changed files with 113 additions and 114 deletions
+4 -4
View File
@@ -1,7 +1,7 @@
//like orange but only checks north/south/east/west for one step
/proc/cardinalrange(var/center)
var/list/things = list()
for(var/direction in GLOB.cardinal)
for(var/direction in GLOB.cardinals)
var/turf/T = get_step(center, direction)
if(!T) continue
things += T.contents
@@ -50,7 +50,7 @@
break
if(!control_unit)//No other guys nearby look for a control unit
for(var/direction in GLOB.cardinal)
for(var/direction in GLOB.cardinals)
for(var/obj/machinery/power/am_control_unit/AMC in cardinalrange(src))
if(AMC.add_shielding(src))
break
@@ -114,11 +114,11 @@
if(shield.control_unit == control_unit)
if(shield.processing)
coredirs |= direction
if(direction in GLOB.cardinal)
if(direction in GLOB.cardinals)
dirs |= direction
else
if(istype(machine, /obj/machinery/power/am_control_unit) && (direction in GLOB.cardinal))
if(istype(machine, /obj/machinery/power/am_control_unit) && (direction in GLOB.cardinals))
var/obj/machinery/power/am_control_unit/control = machine
if(control == control_unit)
dirs |= direction
+2 -2
View File
@@ -139,7 +139,7 @@
var/cdir
var/turf/T
for(var/card in GLOB.cardinal)
for(var/card in GLOB.cardinals)
T = get_step(loc,card)
cdir = get_dir(T,loc)
@@ -159,7 +159,7 @@
var/cdir
var/turf/T
for(var/card in GLOB.cardinal)
for(var/card in GLOB.cardinals)
T = get_step(loc,card)
cdir = get_dir(T,loc)
+1 -1
View File
@@ -50,7 +50,7 @@
spawn(5)
dir_loop:
for(var/d in GLOB.cardinal)
for(var/d in GLOB.cardinals)
var/turf/T = get_step(src, d)
for(var/obj/machinery/power/terminal/term in T)
if(term && term.dir == turn(d, 180))