diff --git a/code/ATMOSPHERICS/components/omni_devices/filter.dm b/code/ATMOSPHERICS/components/omni_devices/filter.dm index feb1b5cb93..8710623dfd 100644 --- a/code/ATMOSPHERICS/components/omni_devices/filter.dm +++ b/code/ATMOSPHERICS/components/omni_devices/filter.dm @@ -1,11 +1,11 @@ //-------------------------------------------- // Gas filter - omni variant //-------------------------------------------- -/obj/machinery/atmospherics/omni/filter +/obj/machinery/atmospherics/omni/atmos_filter name = "omni gas filter" icon_state = "map_filter" - var/list/filters = new() + var/list/atmos_filters = new() var/datum/omni_port/input var/datum/omni_port/output @@ -18,27 +18,27 @@ var/list/filtering_outputs = list() //maps gasids to gas_mixtures -/obj/machinery/atmospherics/omni/filter/New() +/obj/machinery/atmospherics/omni/atmos_filter/New() ..() rebuild_filtering_list() for(var/datum/omni_port/P in ports) P.air.volume = ATMOS_DEFAULT_VOLUME_FILTER -/obj/machinery/atmospherics/omni/filter/Destroy() +/obj/machinery/atmospherics/omni/atmos_filter/Destroy() input = null output = null - filters.Cut() + atmos_filters.Cut() return ..() -/obj/machinery/atmospherics/omni/filter/sort_ports() +/obj/machinery/atmospherics/omni/atmos_filter/sort_ports() for(var/datum/omni_port/P in ports) if(P.update) if(output == P) output = null if(input == P) input = null - if(filters.Find(P)) - filters -= P + if(atmos_filters.Find(P)) + atmos_filters -= P P.air.volume = 200 switch(P.mode) @@ -47,17 +47,17 @@ if(ATM_OUTPUT) output = P if(ATM_O2 to ATM_N2O) - filters += P + atmos_filters += P -/obj/machinery/atmospherics/omni/filter/error_check() - if(!input || !output || !filters) +/obj/machinery/atmospherics/omni/atmos_filter/error_check() + if(!input || !output || !atmos_filters) return 1 - if(filters.len < 1) //requires at least 1 filter ~otherwise why are you using a filter? + if(atmos_filters.len < 1) //requires at least 1 atmos_filter ~otherwise why are you using a filter? return 1 return 0 -/obj/machinery/atmospherics/omni/filter/process() +/obj/machinery/atmospherics/omni/atmos_filter/process() if(!..()) return 0 @@ -79,13 +79,13 @@ input.network.update = 1 if(output.network) output.network.update = 1 - for(var/datum/omni_port/P in filters) + for(var/datum/omni_port/P in atmos_filters) if(P.network) P.network.update = 1 return 1 -/obj/machinery/atmospherics/omni/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) +/obj/machinery/atmospherics/omni/atmos_filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) usr.set_machine(src) var/list/data = new() @@ -100,7 +100,7 @@ ui.open() -/obj/machinery/atmospherics/omni/filter/proc/build_uidata() +/obj/machinery/atmospherics/omni/atmos_filter/proc/build_uidata() var/list/data = new() data["power"] = use_power @@ -113,22 +113,22 @@ var/input = 0 var/output = 0 - var/filter = 1 + var/atmo_filter = 1 var/f_type = null switch(P.mode) if(ATM_INPUT) input = 1 - filter = 0 + atmo_filter = 0 if(ATM_OUTPUT) output = 1 - filter = 0 + atmo_filter = 0 if(ATM_O2 to ATM_N2O) f_type = mode_send_switch(P.mode) portData[++portData.len] = list("dir" = dir_name(P.dir, capitalize = 1), \ "input" = input, \ "output" = output, \ - "filter" = filter, \ + "atmo_filter" = atmo_filter, \ "f_type" = f_type) if(portData.len) @@ -139,7 +139,7 @@ return data -/obj/machinery/atmospherics/omni/filter/proc/mode_send_switch(var/mode = ATM_NONE) +/obj/machinery/atmospherics/omni/atmos_filter/proc/mode_send_switch(var/mode = ATM_NONE) switch(mode) if(ATM_O2) return "Oxygen" @@ -154,7 +154,7 @@ else return null -/obj/machinery/atmospherics/omni/filter/Topic(href, href_list) +/obj/machinery/atmospherics/omni/atmos_filter/Topic(href, href_list) if(..()) return 1 switch(href_list["command"]) if("power") @@ -183,7 +183,7 @@ nanomanager.update_uis(src) return -/obj/machinery/atmospherics/omni/filter/proc/mode_return_switch(var/mode) +/obj/machinery/atmospherics/omni/atmos_filter/proc/mode_return_switch(var/mode) switch(mode) if("Oxygen") return ATM_O2 @@ -204,7 +204,7 @@ else return null -/obj/machinery/atmospherics/omni/filter/proc/switch_filter(var/dir, var/mode) +/obj/machinery/atmospherics/omni/atmos_filter/proc/switch_filter(var/dir, var/mode) //check they aren't trying to disable the input or output ~this can only happen if they hack the cached tmpl file for(var/datum/omni_port/P in ports) if(P.dir == dir) @@ -213,7 +213,7 @@ switch_mode(dir, mode) -/obj/machinery/atmospherics/omni/filter/proc/switch_mode(var/port, var/mode) +/obj/machinery/atmospherics/omni/atmos_filter/proc/switch_mode(var/port, var/mode) if(mode == null || !port) return var/datum/omni_port/target_port = null @@ -246,14 +246,14 @@ update_ports() -/obj/machinery/atmospherics/omni/filter/proc/rebuild_filtering_list() +/obj/machinery/atmospherics/omni/atmos_filter/proc/rebuild_filtering_list() filtering_outputs.Cut() for(var/datum/omni_port/P in ports) var/gasid = mode_to_gasid(P.mode) if(gasid) filtering_outputs[gasid] = P.air -/obj/machinery/atmospherics/omni/filter/proc/handle_port_change(var/datum/omni_port/P) +/obj/machinery/atmospherics/omni/atmos_filter/proc/handle_port_change(var/datum/omni_port/P) switch(P.mode) if(ATM_NONE) initialize_directions &= ~P.dir diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 77087ed32f..5d692b39b9 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -265,13 +265,13 @@ /obj/mecha/combat/Topic(href,href_list) ..() - var/datum/topic_input/filter = new (href,href_list) - if(filter.get("close")) + var/datum/topic_input/top_filter = new (href,href_list) + if(top_filter.get("close")) am = null return /* - if(filter.get("saminput")) - if(md5(filter.get("saminput")) == am) + if(top_filter.get("saminput")) + if(md5(top_filter.get("saminput")) == am) occupant_message("From the lies of the Antipath, Circuit preserve us.") am = null return diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index acd680ba57..4e895b2b62 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -105,15 +105,15 @@ Topic(href,href_list) ..() - var/datum/topic_input/filter = new /datum/topic_input(href,href_list) - if(filter.get("eject")) + var/datum/topic_input/top_filter = new /datum/topic_input(href,href_list) + if(top_filter.get("eject")) go_out() - if(filter.get("view_stats")) + if(top_filter.get("view_stats")) chassis.occupant << browse(get_occupant_stats(),"window=msleeper") onclose(chassis.occupant, "msleeper") return - if(filter.get("inject")) - inject_reagent(filter.getType("inject",/datum/reagent),filter.getObj("source")) + if(top_filter.get("inject")) + inject_reagent(top_filter.getType("inject",/datum/reagent),top_filter.getObj("source")) return proc/get_occupant_stats() @@ -473,19 +473,19 @@ Topic(href,href_list) ..() - var/datum/topic_input/filter = new (href,href_list) - if(filter.get("toggle_mode")) + var/datum/topic_input/top_filter = new (href,href_list) + if(top_filter.get("toggle_mode")) mode = !mode update_equip_info() return - if(filter.get("select_reagents")) + if(top_filter.get("select_reagents")) processed_reagents.len = 0 var/m = 0 var/message for(var/i=1 to known_reagents.len) if(m>=synth_speed) break - var/reagent = filter.get("reagent_[i]") + var/reagent = top_filter.get("reagent_[i]") if(reagent && (reagent in known_reagents)) message = "[m ? ", " : null][known_reagents[reagent]]" processed_reagents += reagent @@ -497,14 +497,14 @@ occupant_message("Reagent processing started.") log_message("Reagent processing started.") return - if(filter.get("show_reagents")) + if(top_filter.get("show_reagents")) chassis.occupant << browse(get_reagents_page(),"window=msyringegun") - if(filter.get("purge_reagent")) - var/reagent = filter.get("purge_reagent") + if(top_filter.get("purge_reagent")) + var/reagent = top_filter.get("purge_reagent") if(reagent) reagents.del_reagent(reagent) return - if(filter.get("purge_all")) + if(top_filter.get("purge_all")) reagents.clear_reagents() return return diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 56149a254c..db8fc51992 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1498,10 +1498,10 @@ return if(usr.stat > 0) return - var/datum/topic_input/filter = new /datum/topic_input(href,href_list) + var/datum/topic_input/top_filter = new /datum/topic_input(href,href_list) if(href_list["select_equip"]) if(usr != src.occupant) return - var/obj/item/mecha_parts/mecha_equipment/equip = filter.getObj("select_equip") + var/obj/item/mecha_parts/mecha_equipment/equip = top_filter.getObj("select_equip") if(equip) src.selected = equip src.occupant_message("You switch to [equip]") @@ -1532,7 +1532,7 @@ return if(href_list["rfreq"]) if(usr != src.occupant) return - var/new_frequency = (radio.frequency + filter.getNum("rfreq")) + var/new_frequency = (radio.frequency + top_filter.getNum("rfreq")) if ((radio.frequency < PUBLIC_LOW_FREQ || radio.frequency > PUBLIC_HIGH_FREQ)) new_frequency = sanitize_frequency(new_frequency) radio.set_frequency(new_frequency) @@ -1574,11 +1574,11 @@ return if(href_list["req_access"] && add_req_access) if(!in_range(src, usr)) return - output_access_dialog(filter.getObj("id_card"),filter.getMob("user")) + output_access_dialog(top_filter.getObj("id_card"),top_filter.getMob("user")) return if(href_list["maint_access"] && maint_access) if(!in_range(src, usr)) return - var/mob/user = filter.getMob("user") + var/mob/user = top_filter.getMob("user") if(user) if(state==0) state = 1 @@ -1586,18 +1586,18 @@ else if(state==1) state = 0 user << "The securing bolts are now hidden." - output_maintenance_dialog(filter.getObj("id_card"),user) + output_maintenance_dialog(top_filter.getObj("id_card"),user) return if(href_list["set_internal_tank_valve"] && state >=1) if(!in_range(src, usr)) return - var/mob/user = filter.getMob("user") + var/mob/user = top_filter.getMob("user") if(user) var/new_pressure = input(user,"Input new output pressure","Pressure setting",internal_tank_valve) as num if(new_pressure) internal_tank_valve = new_pressure user << "The internal pressure valve has been set to [internal_tank_valve]kPa." if(href_list["remove_passenger"] && state >= 1) - var/mob/user = filter.getMob("user") + var/mob/user = top_filter.getMob("user") var/list/passengers = list() for (var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P in contents) if (P.occupant) @@ -1623,20 +1623,20 @@ P.go_out() P.log_message("[occupant] was removed.") return - if(href_list["add_req_access"] && add_req_access && filter.getObj("id_card")) + if(href_list["add_req_access"] && add_req_access && top_filter.getObj("id_card")) if(!in_range(src, usr)) return - operation_req_access += filter.getNum("add_req_access") - output_access_dialog(filter.getObj("id_card"),filter.getMob("user")) + operation_req_access += top_filter.getNum("add_req_access") + output_access_dialog(top_filter.getObj("id_card"),top_filter.getMob("user")) return - if(href_list["del_req_access"] && add_req_access && filter.getObj("id_card")) + if(href_list["del_req_access"] && add_req_access && top_filter.getObj("id_card")) if(!in_range(src, usr)) return - operation_req_access -= filter.getNum("del_req_access") - output_access_dialog(filter.getObj("id_card"),filter.getMob("user")) + operation_req_access -= top_filter.getNum("del_req_access") + output_access_dialog(top_filter.getObj("id_card"),top_filter.getMob("user")) return if(href_list["finish_req_access"]) if(!in_range(src, usr)) return add_req_access = 0 - var/mob/user = filter.getMob("user") + var/mob/user = top_filter.getMob("user") user << browse(null,"window=exosuit_add_access") return if(href_list["dna_lock"]) @@ -1669,9 +1669,9 @@ /* if(href_list["debug"]) if(href_list["set_i_dam"]) - setInternalDamage(filter.getNum("set_i_dam")) + setInternalDamage(top_filter.getNum("set_i_dam")) if(href_list["clear_i_dam"]) - clearInternalDamage(filter.getNum("clear_i_dam")) + clearInternalDamage(top_filter.getNum("clear_i_dam")) return */ diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 00a0654cc1..de1f20fe0a 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -41,19 +41,19 @@ Topic(href, href_list) if(..()) return - var/datum/topic_input/filter = new /datum/topic_input(href,href_list) + var/datum/topic_input/top_filter = new /datum/topic_input(href,href_list) if(href_list["send_message"]) - var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("send_message") + var/obj/item/mecha_parts/mecha_tracking/MT = top_filter.getObj("send_message") var/message = sanitize(input(usr,"Input message","Transmit message") as text) var/obj/mecha/M = MT.in_mecha() if(message && M) M.occupant_message(message) return if(href_list["shock"]) - var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("shock") + var/obj/item/mecha_parts/mecha_tracking/MT = top_filter.getObj("shock") MT.shock() if(href_list["get_log"]) - var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("get_log") + var/obj/item/mecha_parts/mecha_tracking/MT = top_filter.getObj("get_log") stored_data = MT.get_mecha_log() screen = 1 if(href_list["return"]) diff --git a/code/modules/power/supermatter/setup_supermatter.dm b/code/modules/power/supermatter/setup_supermatter.dm index 559f035cb2..262616ed6a 100644 --- a/code/modules/power/supermatter/setup_supermatter.dm +++ b/code/modules/power/supermatter/setup_supermatter.dm @@ -233,7 +233,7 @@ /obj/effect/engine_setup/filter/activate() ..() - var/obj/machinery/atmospherics/omni/filter/F = locate() in get_turf(src) + var/obj/machinery/atmospherics/omni/atmos_filter/F = locate() in get_turf(src) if(!F) log_and_message_admins("## WARNING: Unable to locate omni filter at [x] [y] [z]!") return SETUP_WARNING