shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/blob/powers.dm
+1 -1
View File
@@ -267,7 +267,7 @@
var/list/diagonalblobs = list()
for(var/I in possibleblobs)
var/obj/structure/blob/IB = I
if(get_dir(IB, T) in GLOB.cardinal)
if(get_dir(IB, T) in GLOB.cardinals)
cardinalblobs += IB
else
diagonalblobs += IB
code/game/gamemodes/blob/theblob.dm
+1 -1
View File
@@ -25,7 +25,7 @@
if(Ablob.blob_allowed) //Is this area allowed for winning as blob?
GLOB.blobs_legit += src
GLOB.blobs += src //Keep track of the blob in the normal list either way
setDir(pick(GLOB.cardinal))
setDir(pick(GLOB.cardinals))
update_icon()
.= ..()
ConsumeTile()
code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm
+1 -1
View File
@@ -101,7 +101,7 @@
if(prob(50))
visible_message("<span class='notice'>[src][pick(idle_messages)]</span>")
else
setDir(pick(GLOB.cardinal))//Random rotation
setDir(pick(GLOB.cardinals))//Random rotation
/obj/structure/destructible/clockwork/ocular_warden/proc/acquire_nearby_targets()
. = list()
code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm
+1 -1
View File
@@ -64,7 +64,7 @@
for(var/I in circleviewturfs(src, round(convert_range * 0.5)))
var/turf/T = I
T.ratvar_act(TRUE)
var/dir_to_step_in = pick(GLOB.cardinal)
var/dir_to_step_in = pick(GLOB.cardinals)
var/list/meals = list()
for(var/mob/living/L in GLOB.living_mob_list) //we want to know who's alive so we don't lose and retarget a single person
if(L.z == z && !is_servant_of_ratvar(L) && L.mind)
code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm
+1 -1
View File
@@ -25,7 +25,7 @@
for(var/obj/structure/destructible/clockwork/taunting_trail/TT in loc)
if(TT != src)
qdel(TT)
setDir(pick(GLOB.cardinal))
setDir(pick(GLOB.cardinals))
transform = matrix()*1.3
animate(src, alpha = 100, time = 15)
code/game/gamemodes/meteor/meteors.dm
+1 -1
View File
@@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
var/turf/pickedgoal
var/max_i = 10//number of tries to spawn meteor.
while(!isspaceturf(pickedstart))
var/startSide = pick(GLOB.cardinal)
var/startSide = pick(GLOB.cardinals)
pickedstart = spaceDebrisStartLoc(startSide, ZLEVEL_STATION)
pickedgoal = spaceDebrisFinishLoc(startSide, ZLEVEL_STATION)
max_i--
code/game/gamemodes/wizard/artefact.dm
+1 -1
View File
@@ -517,7 +517,7 @@
user.unset_machine()
if("r_leg","l_leg")
to_chat(user, "<span class='notice'>You move the doll's legs around.</span>")
var/turf/T = get_step(target,pick(GLOB.cardinal))
var/turf/T = get_step(target,pick(GLOB.cardinals))
target.Move(T)
if("r_arm","l_arm")
target.click_random_mob()
code/game/machinery/computer/Operating.dm
+1 -1
View File
@@ -14,7 +14,7 @@
find_table()
/obj/machinery/computer/operating/proc/find_table()
for(var/dir in GLOB.cardinal)
for(var/dir in GLOB.cardinals)
table = locate(/obj/structure/table/optable, get_step(src, dir))
if(table)
table.computer = src
code/game/machinery/computer/gulag_teleporter.dm
+1 -1
View File
@@ -135,7 +135,7 @@
/obj/machinery/computer/gulag_teleporter_computer/proc/findteleporter()
var/obj/machinery/gulag_teleporter/teleporterf = null
for(dir in GLOB.cardinal)
for(dir in GLOB.cardinals)
teleporterf = locate(/obj/machinery/gulag_teleporter, get_step(src, dir))
if(teleporterf && teleporterf.is_operational())
return teleporterf
code/game/machinery/dance_machine.dm
+1 -1
View File
@@ -392,7 +392,7 @@
while(time)
sleep(speed)
for(var/i in 1 to speed)
M.setDir(pick(GLOB.cardinal))
M.setDir(pick(GLOB.cardinals))
M.lay_down(TRUE)
time--
code/game/machinery/shieldgen.dm
+4 -4
View File
@@ -234,7 +234,7 @@
req_access = list(GLOB.access_xenobiology)
/obj/machinery/shieldwallgen/Destroy()
for(var/d in GLOB.cardinal)
for(var/d in GLOB.cardinals)
cleanup_field(d)
return ..()
@@ -271,7 +271,7 @@
icon_state = "Shield_Gen +a"
if(active == ACTIVE_SETUPFIELDS)
var/fields = 0
for(var/d in GLOB.cardinal)
for(var/d in GLOB.cardinals)
if(setup_field(d))
fields++
if(fields)
@@ -281,11 +281,11 @@
"<span class='italics'>You hear heavy droning fade out.</span>")
icon_state = "Shield_Gen"
active = FALSE
for(var/d in GLOB.cardinal)
for(var/d in GLOB.cardinals)
cleanup_field(d)
else
icon_state = "Shield_Gen"
for(var/d in GLOB.cardinal)
for(var/d in GLOB.cardinals)
cleanup_field(d)
/obj/machinery/shieldwallgen/proc/setup_field(direction)
code/game/mecha/mech_bay.dm
+1 -1
View File
@@ -130,7 +130,7 @@
return
recharge_port = locate(/obj/machinery/mech_bay_recharge_port) in range(1)
if(!recharge_port )
for(var/D in GLOB.cardinal)
for(var/D in GLOB.cardinals)
var/turf/A = get_step(src, D)
A = get_step(A, D)
recharge_port = locate(/obj/machinery/mech_bay_recharge_port) in A
code/game/objects/effects/decals/cleanable/humans.dm
+1 -1
View File
@@ -159,7 +159,7 @@
/obj/effect/decal/cleanable/blood/footprints/update_icon()
cut_overlays()
for(var/Ddir in GLOB.cardinal)
for(var/Ddir in GLOB.cardinals)
if(entered_dirs & Ddir)
var/image/bloodstep_overlay = GLOB.bloody_footprints_cache["entered-[blood_state]-[Ddir]"]
if(!bloodstep_overlay)
code/game/objects/effects/effect_system/effect_system.dm
+1 -1
View File
@@ -60,7 +60,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
total_effects++
var/direction
if(cardinals)
direction = pick(GLOB.cardinal)
direction = pick(GLOB.cardinals)
else
direction = pick(GLOB.alldirs)
var/steps_amt = pick(1,2,3)
code/game/objects/effects/effect_system/effects_smoke.dm
+1 -1
View File
@@ -84,7 +84,7 @@
smoke_mob(L)
var/obj/effect/particle_effect/smoke/S = new type(T)
reagents.copy_to(S, reagents.total_volume)
S.setDir(pick(GLOB.cardinal))
S.setDir(pick(GLOB.cardinals))
S.amount = amount-1
S.add_atom_colour(color, FIXED_COLOUR_PRIORITY)
S.lifetime = lifetime
code/game/objects/effects/glowshroom.dm
+2 -2
View File
@@ -108,7 +108,7 @@
var/placeCount = 1
for(var/obj/structure/glowshroom/shroom in newLoc)
shroomCount++
for(var/wallDir in GLOB.cardinal)
for(var/wallDir in GLOB.cardinals)
var/turf/isWall = get_step(newLoc,wallDir)
if(isWall.density)
placeCount++
@@ -129,7 +129,7 @@
/obj/structure/glowshroom/proc/CalcDir(turf/location = loc)
var/direction = 16
for(var/wallDir in GLOB.cardinal)
for(var/wallDir in GLOB.cardinals)
var/turf/newTurf = get_step(location,wallDir)
if(newTurf.density)
direction |= wallDir
code/game/objects/effects/temporary_visuals/temporary_visual.dm
+1 -1
View File
@@ -11,7 +11,7 @@
/obj/effect/temp_visual/Initialize()
. = ..()
if(randomdir)
setDir(pick(GLOB.cardinal))
setDir(pick(GLOB.cardinals))
timerid = QDEL_IN(src, duration)
code/game/objects/items/apc_frame.dm
+1 -1
View File
@@ -13,7 +13,7 @@
if(get_dist(on_wall,user)>1)
return
var/ndir = get_dir(on_wall, user)
if(!(ndir in GLOB.cardinal))
if(ndir in GLOB.cardinals)
return
var/turf/T = get_turf(user)
var/area/A = get_area(T)
code/game/objects/items/blueprints.dm
+2 -2
View File
@@ -309,7 +309,7 @@
return ROOM_ERR_TOOLARGE
var/turf/T = pending[1] //why byond havent list::pop()?
pending -= T
for (var/dir in GLOB.cardinal)
for (var/dir in GLOB.cardinals)
var/skip = 0
for (var/obj/structure/window/W in T)
if(dir == W.dir || (W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST)))
@@ -343,7 +343,7 @@
for(var/V in border) //lazy but works
var/turf/F = V
for(var/direction in GLOB.cardinal)
for(var/direction in GLOB.cardinals)
if(direction == border[F])
continue //don't want to grab turfs from outside the border
var/turf/U = get_step(F, direction)
code/game/objects/items/devices/radio/electropack.dm
+1 -1
View File
@@ -107,7 +107,7 @@
spawn(100)
shock_cooldown = 0
var/mob/living/L = loc
step(L, pick(GLOB.cardinal))
step(L, pick(GLOB.cardinals))
to_chat(L, "<span class='danger'>You feel a sharp shock!</span>")
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
code/game/objects/items/weapons/RCD.dm
+1 -1
View File
@@ -534,7 +534,7 @@ obj/item/weapon/construction
var/list/candidates = list()
var/turf/open/winner = null
var/winning_dist = null
for(var/direction in GLOB.cardinal)
for(var/direction in GLOB.cardinals)
var/turf/C = get_step(W, direction)
var/list/dupes = checkdupes(C)
if(start.CanAtmosPass(C) && !dupes.len)
code/game/objects/structures/tables_racks.dm
+1 -1
View File
@@ -369,7 +369,7 @@
/obj/structure/table/optable/New()
..()
for(var/dir in GLOB.cardinal)
for(var/dir in GLOB.cardinals)
computer = locate(/obj/machinery/computer/operating, get_step(src, dir))
if(computer)
computer.table = src
code/game/turfs/open.dm
+1 -1
View File
@@ -72,7 +72,7 @@
//cache some vars
var/list/atmos_adjacent_turfs = src.atmos_adjacent_turfs
for(var/direction in GLOB.cardinal)
for(var/direction in GLOB.cardinals)
var/turf/open/enemy_tile = get_step(src, direction)
if(!istype(enemy_tile))
if (atmos_adjacent_turfs)
code/game/turfs/simulated/minerals.dm
+1 -1
View File
@@ -32,7 +32,7 @@
icon = smooth_icon
..()
if (mineralType && mineralAmt && spread && spreadChance)
for(var/dir in GLOB.cardinal)
for(var/dir in GLOB.cardinals)
if(prob(spreadChance))
var/turf/T = get_step(src, dir)
if(istype(T, /turf/closed/mineral/random))
code/game/turfs/simulated/river.dm
+1 -1
View File
@@ -78,7 +78,7 @@
var/turf/closed/mineral/M = T
logged_turf_type = M.turf_type
if(get_dir(src, F) in GLOB.cardinal)
if(get_dir(src, F) in GLOB.cardinals)
cardinal_turfs += F
else
diagonal_turfs += F