cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes filter being used, which prevented compiling

Browse Source
This commit is contained in:
killer653
2017-10-15 19:01:55 -04:00
parent 785f4c3302
commit 3cd3054811
6 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
code/ATMOSPHERICS/components/omni_devices/filter.dm
View File

@@ -1,11 +1,11 @@
//-------------------------------------------- //--------------------------------------------
// Gas filter - omni variant // Gas filter - omni variant
//-------------------------------------------- //--------------------------------------------
/obj/machinery/atmospherics/omni/filter /obj/machinery/atmospherics/omni/atmos_filter
name = "omni gas filter" name = "omni gas filter"
icon_state = "map_filter" icon_state = "map_filter"
var/list/filters = new() var/list/atmos_filters = new()
var/datum/omni_port/input var/datum/omni_port/input
var/datum/omni_port/output var/datum/omni_port/output
@@ -18,27 +18,27 @@
var/list/filtering_outputs = list() //maps gasids to gas_mixtures 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() rebuild_filtering_list()
for(var/datum/omni_port/P in ports) for(var/datum/omni_port/P in ports)
P.air.volume = ATMOS_DEFAULT_VOLUME_FILTER P.air.volume = ATMOS_DEFAULT_VOLUME_FILTER
/obj/machinery/atmospherics/omni/filter/Destroy() /obj/machinery/atmospherics/omni/atmos_filter/Destroy()
input = null input = null
output = null output = null
filters.Cut() atmos_filters.Cut()
return ..() return ..()
/obj/machinery/atmospherics/omni/filter/sort_ports() /obj/machinery/atmospherics/omni/atmos_filter/sort_ports()
for(var/datum/omni_port/P in ports) for(var/datum/omni_port/P in ports)
if(P.update) if(P.update)
if(output == P) if(output == P)
output = null output = null
if(input == P) if(input == P)
input = null input = null
if(filters.Find(P)) if(atmos_filters.Find(P))
filters -= P atmos_filters -= P
P.air.volume = 200 P.air.volume = 200
switch(P.mode) switch(P.mode)
@@ -47,17 +47,17 @@
if(ATM_OUTPUT) if(ATM_OUTPUT)
output = P output = P
if(ATM_O2 to ATM_N2O) if(ATM_O2 to ATM_N2O)
filters += P atmos_filters += P
/obj/machinery/atmospherics/omni/filter/error_check() /obj/machinery/atmospherics/omni/atmos_filter/error_check()
if(!input || !output || !filters) if(!input || !output || !atmos_filters)
return 1 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 1
return 0 return 0
/obj/machinery/atmospherics/omni/filter/process() /obj/machinery/atmospherics/omni/atmos_filter/process()
if(!..()) if(!..())
return 0 return 0
@@ -79,13 +79,13 @@
input.network.update = 1 input.network.update = 1
if(output.network) if(output.network)
output.network.update = 1 output.network.update = 1
for(var/datum/omni_port/P in filters) for(var/datum/omni_port/P in atmos_filters)
if(P.network) if(P.network)
P.network.update = 1 P.network.update = 1
return 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) usr.set_machine(src)
var/list/data = new() var/list/data = new()
@@ -100,7 +100,7 @@
ui.open() ui.open()
/obj/machinery/atmospherics/omni/filter/proc/build_uidata() /obj/machinery/atmospherics/omni/atmos_filter/proc/build_uidata()
var/list/data = new() var/list/data = new()
data["power"] = use_power data["power"] = use_power
@@ -113,22 +113,22 @@
var/input = 0 var/input = 0
var/output = 0 var/output = 0
var/filter = 1 var/atmo_filter = 1
var/f_type = null var/f_type = null
switch(P.mode) switch(P.mode)
if(ATM_INPUT) if(ATM_INPUT)
input = 1 input = 1
filter = 0 atmo_filter = 0
if(ATM_OUTPUT) if(ATM_OUTPUT)
output = 1 output = 1
filter = 0 atmo_filter = 0
if(ATM_O2 to ATM_N2O) if(ATM_O2 to ATM_N2O)
f_type = mode_send_switch(P.mode) f_type = mode_send_switch(P.mode)
portData[++portData.len] = list("dir" = dir_name(P.dir, capitalize = 1), \ portData[++portData.len] = list("dir" = dir_name(P.dir, capitalize = 1), \
"input" = input, \ "input" = input, \
"output" = output, \ "output" = output, \
"filter" = filter, \ "atmo_filter" = atmo_filter, \
"f_type" = f_type) "f_type" = f_type)
if(portData.len) if(portData.len)
@@ -139,7 +139,7 @@
return data 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) switch(mode)
if(ATM_O2) if(ATM_O2)
return "Oxygen" return "Oxygen"
@@ -154,7 +154,7 @@
else else
return null return null
/obj/machinery/atmospherics/omni/filter/Topic(href, href_list) /obj/machinery/atmospherics/omni/atmos_filter/Topic(href, href_list)
if(..()) return 1 if(..()) return 1
switch(href_list["command"]) switch(href_list["command"])
if("power") if("power")
@@ -183,7 +183,7 @@
nanomanager.update_uis(src) nanomanager.update_uis(src)
return 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) switch(mode)
if("Oxygen") if("Oxygen")
return ATM_O2 return ATM_O2
@@ -204,7 +204,7 @@
else else
return null 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 //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) for(var/datum/omni_port/P in ports)
if(P.dir == dir) if(P.dir == dir)
@@ -213,7 +213,7 @@
switch_mode(dir, mode) 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) if(mode == null || !port)
return return
var/datum/omni_port/target_port = null var/datum/omni_port/target_port = null
@@ -246,14 +246,14 @@
update_ports() update_ports()
/obj/machinery/atmospherics/omni/filter/proc/rebuild_filtering_list() /obj/machinery/atmospherics/omni/atmos_filter/proc/rebuild_filtering_list()
filtering_outputs.Cut() filtering_outputs.Cut()
for(var/datum/omni_port/P in ports) for(var/datum/omni_port/P in ports)
var/gasid = mode_to_gasid(P.mode) var/gasid = mode_to_gasid(P.mode)
if(gasid) if(gasid)
filtering_outputs[gasid] = P.air 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) switch(P.mode)
if(ATM_NONE) if(ATM_NONE)
initialize_directions &= ~P.dir initialize_directions &= ~P.dir

8
code/game/mecha/combat/combat.dm
View File

@@ -265,13 +265,13 @@
/obj/mecha/combat/Topic(href,href_list) /obj/mecha/combat/Topic(href,href_list)
..() ..()
var/datum/topic_input/filter = new (href,href_list) var/datum/topic_input/top_filter = new (href,href_list)
if(filter.get("close")) if(top_filter.get("close"))
am = null am = null
return return
/* /*
if(filter.get("saminput")) if(top_filter.get("saminput"))
if(md5(filter.get("saminput")) == am) if(md5(top_filter.get("saminput")) == am)
occupant_message("From the lies of the Antipath, Circuit preserve us.") occupant_message("From the lies of the Antipath, Circuit preserve us.")
am = null am = null
return return

26
code/game/mecha/equipment/tools/medical_tools.dm
View File

@@ -105,15 +105,15 @@
Topic(href,href_list) Topic(href,href_list)
..() ..()
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(filter.get("eject")) if(top_filter.get("eject"))
go_out() go_out()
if(filter.get("view_stats")) if(top_filter.get("view_stats"))
chassis.occupant << browse(get_occupant_stats(),"window=msleeper") chassis.occupant << browse(get_occupant_stats(),"window=msleeper")
onclose(chassis.occupant, "msleeper") onclose(chassis.occupant, "msleeper")
return return
if(filter.get("inject")) if(top_filter.get("inject"))
inject_reagent(filter.getType("inject",/datum/reagent),filter.getObj("source")) inject_reagent(top_filter.getType("inject",/datum/reagent),top_filter.getObj("source"))
return return
proc/get_occupant_stats() proc/get_occupant_stats()
@@ -473,19 +473,19 @@
Topic(href,href_list) Topic(href,href_list)
..() ..()
var/datum/topic_input/filter = new (href,href_list) var/datum/topic_input/top_filter = new (href,href_list)
if(filter.get("toggle_mode")) if(top_filter.get("toggle_mode"))
mode = !mode mode = !mode
update_equip_info() update_equip_info()
return return
if(filter.get("select_reagents")) if(top_filter.get("select_reagents"))
processed_reagents.len = 0 processed_reagents.len = 0
var/m = 0 var/m = 0
var/message var/message
for(var/i=1 to known_reagents.len) for(var/i=1 to known_reagents.len)
if(m>=synth_speed) if(m>=synth_speed)
break break
var/reagent = filter.get("reagent_[i]") var/reagent = top_filter.get("reagent_[i]")
if(reagent && (reagent in known_reagents)) if(reagent && (reagent in known_reagents))
message = "[m ? ", " : null][known_reagents[reagent]]" message = "[m ? ", " : null][known_reagents[reagent]]"
processed_reagents += reagent processed_reagents += reagent
@@ -497,14 +497,14 @@
occupant_message("Reagent processing started.") occupant_message("Reagent processing started.")
log_message("Reagent processing started.") log_message("Reagent processing started.")
return return
if(filter.get("show_reagents")) if(top_filter.get("show_reagents"))
chassis.occupant << browse(get_reagents_page(),"window=msyringegun") chassis.occupant << browse(get_reagents_page(),"window=msyringegun")
if(filter.get("purge_reagent")) if(top_filter.get("purge_reagent"))
var/reagent = filter.get("purge_reagent") var/reagent = top_filter.get("purge_reagent")
if(reagent) if(reagent)
reagents.del_reagent(reagent) reagents.del_reagent(reagent)
return return
if(filter.get("purge_all")) if(top_filter.get("purge_all"))
reagents.clear_reagents() reagents.clear_reagents()
return return
return return

34
code/game/mecha/mecha.dm
View File

@@ -1498,10 +1498,10 @@
return return
if(usr.stat > 0) if(usr.stat > 0)
return 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(href_list["select_equip"])
if(usr != src.occupant) return 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) if(equip)
src.selected = equip src.selected = equip
src.occupant_message("You switch to [equip]") src.occupant_message("You switch to [equip]")
@@ -1532,7 +1532,7 @@
return return
if(href_list["rfreq"]) if(href_list["rfreq"])
if(usr != src.occupant) return 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)) if ((radio.frequency < PUBLIC_LOW_FREQ || radio.frequency > PUBLIC_HIGH_FREQ))
new_frequency = sanitize_frequency(new_frequency) new_frequency = sanitize_frequency(new_frequency)
radio.set_frequency(new_frequency) radio.set_frequency(new_frequency)
@@ -1574,11 +1574,11 @@
return return
if(href_list["req_access"] && add_req_access) if(href_list["req_access"] && add_req_access)
if(!in_range(src, usr)) return 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 return
if(href_list["maint_access"] && maint_access) if(href_list["maint_access"] && maint_access)
if(!in_range(src, usr)) return if(!in_range(src, usr)) return
var/mob/user = filter.getMob("user") var/mob/user = top_filter.getMob("user")
if(user) if(user)
if(state==0) if(state==0)
state = 1 state = 1
@@ -1586,18 +1586,18 @@
else if(state==1) else if(state==1)
state = 0 state = 0
user << "The securing bolts are now hidden." 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 return
if(href_list["set_internal_tank_valve"] && state >=1) if(href_list["set_internal_tank_valve"] && state >=1)
if(!in_range(src, usr)) return if(!in_range(src, usr)) return
var/mob/user = filter.getMob("user") var/mob/user = top_filter.getMob("user")
if(user) if(user)
var/new_pressure = input(user,"Input new output pressure","Pressure setting",internal_tank_valve) as num var/new_pressure = input(user,"Input new output pressure","Pressure setting",internal_tank_valve) as num
if(new_pressure) if(new_pressure)
internal_tank_valve = new_pressure internal_tank_valve = new_pressure
user << "The internal pressure valve has been set to [internal_tank_valve]kPa." user << "The internal pressure valve has been set to [internal_tank_valve]kPa."
if(href_list["remove_passenger"] && state >= 1) if(href_list["remove_passenger"] && state >= 1)
var/mob/user = filter.getMob("user") var/mob/user = top_filter.getMob("user")
var/list/passengers = list() var/list/passengers = list()
for (var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P in contents) for (var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P in contents)
if (P.occupant) if (P.occupant)
@@ -1623,20 +1623,20 @@
P.go_out() P.go_out()
P.log_message("[occupant] was removed.") P.log_message("[occupant] was removed.")
return 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 if(!in_range(src, usr)) return
operation_req_access += filter.getNum("add_req_access") operation_req_access += top_filter.getNum("add_req_access")
output_access_dialog(filter.getObj("id_card"),filter.getMob("user")) output_access_dialog(top_filter.getObj("id_card"),top_filter.getMob("user"))
return 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 if(!in_range(src, usr)) return
operation_req_access -= filter.getNum("del_req_access") operation_req_access -= top_filter.getNum("del_req_access")
output_access_dialog(filter.getObj("id_card"),filter.getMob("user")) output_access_dialog(top_filter.getObj("id_card"),top_filter.getMob("user"))
return return
if(href_list["finish_req_access"]) if(href_list["finish_req_access"])
if(!in_range(src, usr)) return if(!in_range(src, usr)) return
add_req_access = 0 add_req_access = 0
var/mob/user = filter.getMob("user") var/mob/user = top_filter.getMob("user")
user << browse(null,"window=exosuit_add_access") user << browse(null,"window=exosuit_add_access")
return return
if(href_list["dna_lock"]) if(href_list["dna_lock"])
@@ -1669,9 +1669,9 @@
/* /*
if(href_list["debug"]) if(href_list["debug"])
if(href_list["set_i_dam"]) 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"]) if(href_list["clear_i_dam"])
clearInternalDamage(filter.getNum("clear_i_dam")) clearInternalDamage(top_filter.getNum("clear_i_dam"))
return return
*/ */

8
code/game/mecha/mecha_control_console.dm
View File

@@ -41,19 +41,19 @@
Topic(href, href_list) Topic(href, href_list)
if(..()) if(..())
return 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"]) 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/message = sanitize(input(usr,"Input message","Transmit message") as text)
var/obj/mecha/M = MT.in_mecha() var/obj/mecha/M = MT.in_mecha()
if(message && M) if(message && M)
M.occupant_message(message) M.occupant_message(message)
return return
if(href_list["shock"]) 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() MT.shock()
if(href_list["get_log"]) 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() stored_data = MT.get_mecha_log()
screen = 1 screen = 1
if(href_list["return"]) if(href_list["return"])

2
code/modules/power/supermatter/setup_supermatter.dm
View File

@@ -233,7 +233,7 @@
/obj/effect/engine_setup/filter/activate() /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) if(!F)
log_and_message_admins("## WARNING: Unable to locate omni filter at [x] [y] [z]!") log_and_message_admins("## WARNING: Unable to locate omni filter at [x] [y] [z]!")
return SETUP_WARNING return SETUP_WARNING