From dbc9cb2fb81d24072ace41533d565dfb834867b9 Mon Sep 17 00:00:00 2001 From: ike709 Date: Sat, 18 Nov 2017 12:23:20 -0600 Subject: [PATCH 1/2] Fixes some computer dirs --- .gitignore | 3 +++ code/game/machinery/computer/Operating.dm | 8 ++++---- code/game/machinery/computer/teleporter.dm | 4 ++-- code/game/machinery/teleporter.dm | 12 ++++++------ code/game/objects/structures/tables_racks.dm | 4 ++-- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index f0dec2981e2..9744499e37c 100644 --- a/.gitignore +++ b/.gitignore @@ -192,3 +192,6 @@ Temporary Items #Visual studio stuff *.vscode/* + +#GitHub Atom +.atom-build.json diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index af11be2e5b7..8d53987a2ba 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -13,12 +13,12 @@ find_table() /obj/machinery/computer/operating/proc/find_table() - for(var/dir in GLOB.cardinals) - table = locate(/obj/structure/table/optable, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + table = locate(/obj/structure/table/optable, get_step(src, direction)) if(table) table.computer = src break - + /obj/machinery/computer/operating/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -60,7 +60,7 @@ var/alternative_step if(surgery_step.repeatable) var/datum/surgery_step/next_step = procedure.get_surgery_next_step() - if(next_step) + if(next_step) alternative_step = capitalize(next_step.name) else alternative_step = "Finish operation" diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index 74074189d3d..fda89646097 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -27,8 +27,8 @@ /obj/machinery/computer/teleporter/proc/link_power_station() if(power_station) return - for(dir in GLOB.cardinals) - power_station = locate(/obj/machinery/teleport/station, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + power_station = locate(/obj/machinery/teleport/station, get_step(src, direction)) if(power_station) break return power_station diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index be13cfdcff8..868c9ee7280 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -35,8 +35,8 @@ /obj/machinery/teleport/hub/proc/link_power_station() if(power_station) return - for(dir in list(NORTH,EAST,SOUTH,WEST)) - power_station = locate(/obj/machinery/teleport/station, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + power_station = locate(/obj/machinery/teleport/station, get_step(src, direction)) if(power_station) break return power_station @@ -127,13 +127,13 @@ efficiency = E - 1 /obj/machinery/teleport/station/proc/link_console_and_hub() - for(dir in list(NORTH,EAST,SOUTH,WEST)) - teleporter_hub = locate(/obj/machinery/teleport/hub, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + teleporter_hub = locate(/obj/machinery/teleport/hub, get_step(src, direction)) if(teleporter_hub) teleporter_hub.link_power_station() break - for(dir in list(NORTH,EAST,SOUTH,WEST)) - teleporter_console = locate(/obj/machinery/computer/teleporter, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + teleporter_console = locate(/obj/machinery/computer/teleporter, get_step(src, direction)) if(teleporter_console) teleporter_console.link_power_station() break diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 6a481ea3ef9..b46b1c72aa0 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -378,8 +378,8 @@ /obj/structure/table/optable/New() ..() - for(var/dir in GLOB.cardinals) - computer = locate(/obj/machinery/computer/operating, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + computer = locate(/obj/machinery/computer/operating, get_step(src, direction)) if(computer) computer.table = src break From 0090c5232c06bd0e9e37926a2253968abd15bc66 Mon Sep 17 00:00:00 2001 From: ike709 Date: Sat, 18 Nov 2017 18:34:28 -0600 Subject: [PATCH 2/2] missed one --- code/game/machinery/computer/gulag_teleporter.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/gulag_teleporter.dm b/code/game/machinery/computer/gulag_teleporter.dm index 3ea4c2f9b2d..36da1288a92 100644 --- a/code/game/machinery/computer/gulag_teleporter.dm +++ b/code/game/machinery/computer/gulag_teleporter.dm @@ -129,8 +129,8 @@ /obj/machinery/computer/gulag_teleporter_computer/proc/findteleporter() var/obj/machinery/gulag_teleporter/teleporterf = null - for(dir in GLOB.cardinals) - teleporterf = locate(/obj/machinery/gulag_teleporter, get_step(src, dir)) + for(var/direction in GLOB.cardinals) + teleporterf = locate(/obj/machinery/gulag_teleporter, get_step(src, direction)) if(teleporterf && teleporterf.is_operational()) return teleporterf