diff --git a/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm b/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm index 5f09680f185..c6c2af411d4 100644 --- a/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm +++ b/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm @@ -245,7 +245,6 @@ }, /obj/machinery/power/apc/auto_name/directional/north{ coverlocked = 0; - network_id = null; start_charge = 60 }, /obj/effect/mapping_helpers/apc/unlocked, @@ -340,7 +339,6 @@ "Io" = ( /obj/machinery/power/smes{ charge = 2e+006; - network_id = null; output_level = 0 }, /obj/structure/cable, diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 644c3e0ea6d..352cd5c6752 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -47,9 +47,6 @@ /// Map tag for something. Tired of it being used on snowflake items. Moved here for some semblance of a standard. /// Next pr after the network fix will have me refactor door interactions, so help me god. var/id_tag = null - /// Network id. If set it can be found by either its hardware id or by the id tag if thats set. It can also be - /// broadcasted to as long as the other guys network is on the same branch or above. - var/network_id = null uses_integrity = TRUE diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 45f75496cd1..02073ae1a3b 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -310,7 +310,7 @@ areas_with_multiple_APCs.Add(A.type) CHECK_TICK - for(var/obj/machinery/airalarm/AA in GLOB.machines) + for(var/obj/machinery/airalarm/AA in GLOB.air_alarms) var/area/A = get_area(AA) if(!A) //Make sure the target isn't inside an object, which results in runtimes. dat += "Skipped over [AA] in invalid location, [AA.loc].
" diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 7135088cbff..0ced146db38 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -71,19 +71,18 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) if("maint_access_engiebrig") if(!is_debugger) return - for(var/obj/machinery/door/airlock/maintenance/M in GLOB.airlocks) - M.check_access() - if (ACCESS_MAINT_TUNNELS in M.req_access) - M.req_access = list() - M.req_one_access = list(ACCESS_BRIG, ACCESS_ENGINEERING) + for(var/obj/machinery/door/airlock/maintenance/doors in GLOB.airlocks) + if ((ACCESS_MAINT_TUNNELS in doors.req_access) || (ACCESS_MAINT_TUNNELS in doors.req_one_access)) + doors.req_access = list() + doors.req_one_access = list(ACCESS_BRIG, ACCESS_ENGINEERING) message_admins("[key_name_admin(holder)] made all maint doors engineering and brig access-only.") if("maint_access_brig") if(!is_debugger) return - for(var/obj/machinery/door/airlock/maintenance/M in GLOB.airlocks) - M.check_access() - if (ACCESS_MAINT_TUNNELS in M.req_access) - M.req_access = list(ACCESS_BRIG) + for(var/obj/machinery/door/airlock/maintenance/doors in GLOB.airlocks) + if ((ACCESS_MAINT_TUNNELS in doors.req_access) || (ACCESS_MAINT_TUNNELS in doors.req_one_access)) + doors.req_access = list(ACCESS_BRIG) + doors.req_one_access = list() message_admins("[key_name_admin(holder)] made all maint doors brig access-only.") if("infinite_sec") if(!is_debugger) diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm index ac15cd06e70..feba3734130 100644 --- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm +++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm @@ -693,7 +693,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) uses = 1 /datum/action/innate/ai/break_air_alarms/Activate() - for(var/obj/machinery/airalarm/AA in GLOB.machines) + for(var/obj/machinery/airalarm/AA in GLOB.air_alarms) if(!is_station_level(AA.z)) continue AA.obj_flags |= EMAGGED diff --git a/code/modules/antagonists/nukeop/equipment/pinpointer.dm b/code/modules/antagonists/nukeop/equipment/pinpointer.dm index 9108f5f4672..3e9b1511a23 100644 --- a/code/modules/antagonists/nukeop/equipment/pinpointer.dm +++ b/code/modules/antagonists/nukeop/equipment/pinpointer.dm @@ -15,7 +15,7 @@ else msg = "Its tracking indicator is blank." . += msg - for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines) + for(var/obj/machinery/nuclearbomb/bomb as anything in GLOB.nuke_list) if(bomb.timing) . += "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()]." diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 8b2009ed8f1..2b21764e083 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -172,7 +172,7 @@ /datum/antagonist/nukeop/proc/admin_tell_code(mob/admin) var/code - for (var/obj/machinery/nuclearbomb/bombue in GLOB.machines) + for (var/obj/machinery/nuclearbomb/bombue as anything in GLOB.nuke_list) if (length(bombue.r_code) <= 5 && bombue.r_code != initial(bombue.r_code)) code = bombue.r_code break diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index ae0b3d10581..ff5174752b6 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -651,7 +651,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar if(!get_ntnet_status()) return FALSE - return SSmodular_computers.add_log("[src]: [text]", network_id) + return SSmodular_computers.add_log("[src]: [text]") /obj/item/modular_computer/proc/shutdown_computer(loud = 1) kill_program(forced = TRUE)