diff --git a/baystation12.dme b/baystation12.dme index 22b3d97333a..8bbc8b813b8 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1517,6 +1517,11 @@ #include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_dnaswitch.dm" #include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_emp.dm" #include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_forcefield.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_gasco2.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_gasnitro.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_gasoxy.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_gasplasma.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_gassleeping.dm" #include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_goodfeeling.dm" #include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_heal.dm" #include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_heat.dm" @@ -1689,7 +1694,6 @@ #include "code\WorkInProgress\SkyMarshal\officer_stuff.dm" #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm" #include "code\ZAS\_docs.dm" -#include "code\ZAS\_gas_datum.dm" #include "code\ZAS\_gas_mixture.dm" #include "code\ZAS\Airflow.dm" #include "code\ZAS\Atom.dm" diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 4460d6a1a20..fa8b485ed8c 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -155,7 +155,7 @@ Pipelines + Other Objects -> Pipe network var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() add_fingerprint(user) - if ((int_air.pressure-env_air.pressure) > 2*ONE_ATMOSPHERE) + if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) if(istype(W, /obj/item/weapon/wrench/socket) && istype(src, /obj/machinery/atmospherics/pipe)) user << "You begin to open the pressure release valve on the pipe..." if(do_after(user, 50)) diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index c9929c2938d..9dc885c9f63 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -31,8 +31,8 @@ air1 = new air2 = new - air1.set_volume(200) - air2.set_volume(200) + air1.volume = 200 + air2.volume = 200 /obj/machinery/atmospherics/binary/buildFrom(var/mob/usr,var/obj/item/pipe/pipe) dir = pipe.dir diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index 3852918de5b..c3e27234cbc 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -25,8 +25,8 @@ /obj/machinery/atmospherics/binary/circulator/proc/return_transfer_air() var/datum/gas_mixture/removed if(anchored && !(stat&BROKEN) ) - var/input_starting_pressure = air1.pressure - var/output_starting_pressure = air2.pressure + var/input_starting_pressure = air1.return_pressure() + var/output_starting_pressure = air2.return_pressure() last_pressure_delta = max(input_starting_pressure - output_starting_pressure + 10, 0) //only circulate air if there is a pressure difference (plus 10 kPa to represent friction in the machine) @@ -38,7 +38,7 @@ //Actually transfer the gas removed = air1.remove(recent_moles_transferred) if(removed) - last_heat_capacity = removed.heat_capacity + last_heat_capacity = removed.heat_capacity() last_temperature = removed.temperature //Update the gas networks. diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 39ad99628b8..4dc3f31a817 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -25,8 +25,6 @@ var/frequency = 0 var/id_tag = null var/datum/radio_frequency/radio_connection - - machine_flags = MULTITOOL_MENU /obj/machinery/atmospherics/binary/dp_vent_pump/high_volume name = "Large Dual Port Air Vent" @@ -34,8 +32,8 @@ /obj/machinery/atmospherics/binary/dp_vent_pump/high_volume/New() ..() - air1.set_volume(1000) - air2.set_volume(1000) + air1.volume = 1000 + air2.volume = 1000 /obj/machinery/atmospherics/binary/dp_vent_pump/update_icon() if(on) @@ -75,7 +73,7 @@ return var/datum/gas_mixture/environment = loc.return_air() - var/environment_pressure = environment.pressure + var/environment_pressure = environment.return_pressure() if(pump_direction) //input -> external var/pressure_delta = 10000 @@ -83,7 +81,7 @@ if(pressure_checks&1) pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure)) if(pressure_checks&2) - pressure_delta = min(pressure_delta, (air1.pressure - input_pressure_min)) + pressure_delta = min(pressure_delta, (air1.return_pressure() - input_pressure_min)) if(pressure_delta > 0) if(air1.temperature > 0) @@ -102,7 +100,7 @@ if(pressure_checks&1) pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound)) if(pressure_checks&4) - pressure_delta = min(pressure_delta, (output_pressure_max - air2.pressure)) + pressure_delta = min(pressure_delta, (output_pressure_max - air2.return_pressure())) if(pressure_delta > 0) if(environment.temperature > 0) @@ -220,6 +218,9 @@ update_icon() /obj/machinery/atmospherics/binary/dp_vent_pump/attackby(var/obj/item/W as obj, var/mob/user as mob) + if(istype(W, /obj/item/device/multitool)) + interact(user) + return 1 return ..() /obj/machinery/atmospherics/binary/dp_vent_pump/interact(var/mob/user) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 9c6839ad1a2..c8827405ef3 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -33,8 +33,8 @@ if(!on) return - var/output_starting_pressure = air2.pressure - var/input_starting_pressure = air1.pressure + var/output_starting_pressure = air2.return_pressure() + var/input_starting_pressure = air1.return_pressure() if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10)) //No need to pump gas if target is already reached or input pressure is too low @@ -42,7 +42,7 @@ return //Calculate necessary moles to transfer using PV = nRT - if((air1.total_moles > 0) && (air1.temperature>0)) + if((air1.total_moles() > 0) && (air1.temperature>0)) var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2) //Can not have a pressure delta that would cause output_pressure > input_pressure diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 1830c294fed..23c25451c1d 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -55,14 +55,14 @@ Thus, the two variables affect pump operation are set in New(): if((stat & (NOPOWER|BROKEN)) || !on) return - var/output_starting_pressure = air2.pressure + var/output_starting_pressure = air2.return_pressure() if( (target_pressure - output_starting_pressure) < 0.01) //No need to pump gas if target is already reached! return //Calculate necessary moles to transfer using PV=nRT - if((air1.total_moles > 0) && (air1.temperature>0)) + if((air1.total_moles() > 0) && (air1.temperature>0)) var/pressure_delta = target_pressure - output_starting_pressure var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION) diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index e1317d6cc36..f5033654b7b 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -116,8 +116,6 @@ var/frequency = 0 var/id_tag = null var/datum/radio_frequency/radio_connection - - machine_flags = MULTITOOL_MENU /obj/machinery/atmospherics/binary/valve/digital/attack_ai(mob/user as mob) src.add_hiddenprint(user) @@ -216,6 +214,9 @@ // Just for digital valves. /obj/machinery/atmospherics/binary/valve/digital/attackby(var/obj/item/W as obj, var/mob/user as mob) + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 if(src.frequency && istype(W, /obj/item/weapon/wrench)) user << "You cannot unwrench this [src], it's digitally connected to another device." return 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 5fe5a558583..84c7236ee04 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -51,8 +51,8 @@ Thus, the two variables affect pump operation are set in New(): // Pump mechanism just won't do anything if the pressure is too high/too low - var/input_starting_pressure = air1.pressure - var/output_starting_pressure = air2.pressure + var/input_starting_pressure = air1.return_pressure() + var/output_starting_pressure = air2.return_pressure() if((input_starting_pressure < 0.01) || (output_starting_pressure > 9000)) return diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 5fe3d6b893e..c499b4f2c64 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -58,9 +58,9 @@ obj/machinery/atmospherics/trinary/filter/process() if(!on) return - var/output_starting_pressure = air3.pressure + var/output_starting_pressure = air3.return_pressure() - if(output_starting_pressure >= target_pressure || air2.pressure >= target_pressure ) + if(output_starting_pressure >= target_pressure || air2.return_pressure() >= target_pressure ) //No need to mix if target is already full! return @@ -80,32 +80,41 @@ obj/machinery/atmospherics/trinary/filter/process() if(!removed) return var/datum/gas_mixture/filtered_out = new - filtered_out.set_temperature(removed.temperature) - - var/list/gases_to_remove + filtered_out.temperature = removed.temperature switch(filter_type) if(0) //removing hydrocarbons - gases_to_remove = list(PLASMA /*, OXYGEN_AGENT_B*/) + filtered_out.toxins = removed.toxins + removed.toxins = 0 + + if(removed.trace_gases.len>0) + for(var/datum/gas/trace_gas in removed.trace_gases) + if(istype(trace_gas, /datum/gas/oxygen_agent_b)) + removed.trace_gases -= trace_gas + filtered_out.trace_gases += trace_gas if(1) //removing O2 - gases_to_remove = list(OXYGEN) + filtered_out.oxygen = removed.oxygen + removed.oxygen = 0 if(2) //removing N2 - gases_to_remove = list(NITROGEN) + filtered_out.nitrogen = removed.nitrogen + removed.nitrogen = 0 if(3) //removing CO2 - gases_to_remove = list(CARBON_DIOXIDE) + filtered_out.carbon_dioxide = removed.carbon_dioxide + removed.carbon_dioxide = 0 if(4)//removing N2O - gases_to_remove = list(NITROUS_OXIDE) + if(removed.trace_gases.len>0) + for(var/datum/gas/trace_gas in removed.trace_gases) + if(istype(trace_gas, /datum/gas/sleeping_agent)) + removed.trace_gases -= trace_gas + filtered_out.trace_gases += trace_gas else filtered_out = null - for(var/gasid in gases_to_remove) - filtered_out.adjust_gas(gasid, removed.gases[gasid]) - removed.set_gas(gasid, 0) air2.merge(filtered_out) air3.merge(removed) diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 0d1ed051c61..a1975011d7c 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -33,14 +33,14 @@ obj/machinery/atmospherics/trinary/mixer/power_change() obj/machinery/atmospherics/trinary/mixer/New() ..() - air3.set_volume(300) + air3.volume = 300 obj/machinery/atmospherics/trinary/mixer/process() . = ..() if(!on) return - var/output_starting_pressure = air3.pressure + var/output_starting_pressure = air3.return_pressure() if(output_starting_pressure >= target_pressure) //No need to mix if target is already full! @@ -58,8 +58,8 @@ obj/machinery/atmospherics/trinary/mixer/process() if(air2.temperature > 0) transfer_moles2 = (node2_concentration*pressure_delta)*air3.volume/(air2.temperature * R_IDEAL_GAS_EQUATION) - var/air1_moles = air1.total_moles - var/air2_moles = air2.total_moles + var/air1_moles = air1.total_moles() + var/air2_moles = air2.total_moles() if((air1_moles < transfer_moles1) || (air2_moles < transfer_moles2)) if(!transfer_moles1 || !transfer_moles2) return diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index b394387ad1c..5dccfd5cecb 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -24,9 +24,9 @@ obj/machinery/atmospherics/trinary/New() air2 = new air3 = new - air1.set_volume(starting_volume) - air2.set_volume(starting_volume) - air3.set_volume(starting_volume) + air1.volume = starting_volume + air2.volume = starting_volume + air3.volume = starting_volume /obj/machinery/atmospherics/trinary/proc/initialize_directions() switch(dir) diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm index a12a38900f0..ebe794ba8b2 100644 --- a/code/ATMOSPHERICS/components/unary/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm @@ -26,13 +26,14 @@ . = ..() if(!on || !network) return - var/combined_heat_capacity = current_heat_capacity + air_contents.heat_capacity + var/air_heat_capacity = air_contents.heat_capacity() + var/combined_heat_capacity = current_heat_capacity + air_heat_capacity var/old_temperature = air_contents.temperature if(combined_heat_capacity > 0) - var/combined_energy = current_temperature*current_heat_capacity + air_contents.thermal_energy() + var/combined_energy = current_temperature*current_heat_capacity + air_heat_capacity*air_contents.temperature if(air_contents.temperature > current_temperature) //if it's hotter than we can cool it, cool it - air_contents.set_temperature(combined_energy/combined_heat_capacity) + air_contents.temperature = combined_energy/combined_heat_capacity //todo: have current temperature affected. require power to bring down current temperature again diff --git a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm index 5d6ddd21b1b..82ddb66a70e 100644 --- a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm @@ -35,20 +35,22 @@ if(!partner || !air_master || air_master.current_cycle <= update_cycle) return - var/old_temperature = partner.air_contents.temperature - var/other_old_temperature = air_contents.temperature - update_cycle = air_master.current_cycle partner.update_cycle = air_master.current_cycle - var/combined_heat_capacity = partner.air_contents.heat_capacity + air_contents.heat_capacity + var/air_heat_capacity = air_contents.heat_capacity() + var/other_air_heat_capacity = partner.air_contents.heat_capacity() + var/combined_heat_capacity = other_air_heat_capacity + air_heat_capacity + + var/old_temperature = air_contents.temperature + var/other_old_temperature = partner.air_contents.temperature if(combined_heat_capacity > 0) - var/combined_energy = partner.air_contents.thermal_energy() + air_contents.thermal_energy() + var/combined_energy = partner.air_contents.temperature*other_air_heat_capacity + air_heat_capacity*air_contents.temperature var/new_temperature = combined_energy/combined_heat_capacity - air_contents.set_temperature(new_temperature) - partner.air_contents.set_temperature(new_temperature) + air_contents.temperature = new_temperature + partner.air_contents.temperature = new_temperature if(network) if(abs(old_temperature-air_contents.temperature) > 1) diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm index 6c8c02034c3..f95e457cda9 100644 --- a/code/ATMOSPHERICS/components/unary/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary/heat_source.dm @@ -28,13 +28,14 @@ . = ..() if(!on) return - var/combined_heat_capacity = current_heat_capacity + air_contents.heat_capacity + var/air_heat_capacity = air_contents.heat_capacity() + var/combined_heat_capacity = current_heat_capacity + air_heat_capacity var/old_temperature = air_contents.temperature if(combined_heat_capacity > 0) - var/combined_energy = current_temperature*current_heat_capacity + air_contents.thermal_energy() + var/combined_energy = current_temperature*current_heat_capacity + air_heat_capacity*air_contents.temperature if(air_contents.temperature < current_temperature) //if its colder than we can heat it, heat it - air_contents.set_temperature(combined_energy/combined_heat_capacity) + air_contents.temperature = combined_energy/combined_heat_capacity //todo: have current temperature affected. require power to bring up current temperature again diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm index b7c0d3fdc6e..16a4c47626f 100644 --- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm @@ -17,8 +17,6 @@ var/datum/radio_frequency/radio_connection level = 1 - - machine_flags = MULTITOOL_MENU /obj/machinery/atmospherics/unary/outlet_injector/update_icon() if(node) @@ -47,7 +45,7 @@ return if(air_contents.temperature > 0) - var/transfer_moles = (air_contents.pressure)*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION) + var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION) var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) @@ -65,7 +63,7 @@ injecting = 1 if(air_contents.temperature > 0) - var/transfer_moles = (air_contents.pressure)*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION) + var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION) var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) @@ -160,6 +158,9 @@ "} /obj/machinery/atmospherics/unary/outlet_injector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + if(istype(W, /obj/item/device/multitool)) + interact(user) + return 1 if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) diff --git a/code/ATMOSPHERICS/components/unary/oxygen_generator.dm b/code/ATMOSPHERICS/components/unary/oxygen_generator.dm index 848c29d03ed..355251849f4 100644 --- a/code/ATMOSPHERICS/components/unary/oxygen_generator.dm +++ b/code/ATMOSPHERICS/components/unary/oxygen_generator.dm @@ -26,22 +26,22 @@ obj/machinery/atmospherics/unary/oxygen_generator/update_icon() obj/machinery/atmospherics/unary/oxygen_generator/New() ..() - air_contents.set_volume(50) + air_contents.volume = 50 obj/machinery/atmospherics/unary/oxygen_generator/process() . = ..() if(!on) return - var/total_moles = air_contents.total_moles + var/total_moles = air_contents.total_moles() if(total_moles < oxygen_content) - var/current_heat_capacity = air_contents.heat_capacity + var/current_heat_capacity = air_contents.heat_capacity() var/added_oxygen = oxygen_content - total_moles - air_contents.set_temperature((current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen)) - air_contents.adjust_gas(OXYGEN, added_oxygen) + air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen) + air_contents.oxygen += added_oxygen if(network) network.update = 1 diff --git a/code/ATMOSPHERICS/components/unary/tank.dm b/code/ATMOSPHERICS/components/unary/tank.dm index 23b5502b579..ea994ad4921 100644 --- a/code/ATMOSPHERICS/components/unary/tank.dm +++ b/code/ATMOSPHERICS/components/unary/tank.dm @@ -28,7 +28,7 @@ /obj/machinery/atmospherics/unary/tank/carbon_dioxide/New() ..() - air_contents.set_gas(CARBON_DIOXIDE, (25*ONE_ATMOSPHERE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature), 0) + air_contents.carbon_dioxide = (25*ONE_ATMOSPHERE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) /obj/machinery/atmospherics/unary/tank/toxins @@ -38,9 +38,8 @@ /obj/machinery/atmospherics/unary/tank/toxins/New() ..() - air_contents.set_gas(PLASMA, (25*ONE_ATMOSPHERE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature), 0) + air_contents.toxins = (25*ONE_ATMOSPHERE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) -/* /obj/machinery/atmospherics/unary/tank/oxygen_agent_b icon = 'icons/obj/atmospherics/red_orange_pipe_tank.dmi' @@ -49,8 +48,11 @@ /obj/machinery/atmospherics/unary/tank/oxygen_agent_b/New() ..() - air_contents.set_gas(OXYGEN_AGENT_B, (25*ONE_ATMOSPHERE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature), 0) -*/ + var/datum/gas/oxygen_agent_b/trace_gas = new + trace_gas.moles = (25*ONE_ATMOSPHERE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) + + air_contents.trace_gases += trace_gas + /obj/machinery/atmospherics/unary/tank/oxygen icon = 'icons/obj/atmospherics/blue_pipe_tank.dmi' @@ -59,7 +61,7 @@ /obj/machinery/atmospherics/unary/tank/oxygen/New() ..() - air_contents.set_gas(OXYGEN, (25*ONE_ATMOSPHERE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature), 0) + air_contents.oxygen = (25*ONE_ATMOSPHERE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) /obj/machinery/atmospherics/unary/tank/nitrogen icon = 'icons/obj/atmospherics/red_pipe_tank.dmi' @@ -68,7 +70,7 @@ /obj/machinery/atmospherics/unary/tank/nitrogen/New() ..() - air_contents.set_gas(NITROGEN, (25*ONE_ATMOSPHERE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature), 0) + air_contents.nitrogen = (25*ONE_ATMOSPHERE)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) /obj/machinery/atmospherics/unary/tank/air icon = 'icons/obj/atmospherics/red_pipe_tank.dmi' @@ -77,8 +79,8 @@ /obj/machinery/atmospherics/unary/tank/air/New() ..() - air_contents.set_gas(OXYGEN, (25*ONE_ATMOSPHERE*O2STANDARD)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature), 0) - air_contents.set_gas(NITROGEN, (25*ONE_ATMOSPHERE*N2STANDARD)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature), 0) + air_contents.oxygen = (25*ONE_ATMOSPHERE*O2STANDARD)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) + air_contents.nitrogen = (25*ONE_ATMOSPHERE*N2STANDARD)*(starting_volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) /obj/machinery/atmospherics/unary/tank/update_icon() if(node) diff --git a/code/ATMOSPHERICS/components/unary/thermal_plate.dm b/code/ATMOSPHERICS/components/unary/thermal_plate.dm index b9347ded22c..8b066480bf8 100644 --- a/code/ATMOSPHERICS/components/unary/thermal_plate.dm +++ b/code/ATMOSPHERICS/components/unary/thermal_plate.dm @@ -26,34 +26,34 @@ //Get processable air sample and thermal info from environment - var/transfer_moles = 0.25 * environment.total_moles + var/transfer_moles = 0.25 * environment.total_moles() var/datum/gas_mixture/external_removed = environment.remove(transfer_moles) if (!external_removed) return radiate() - if (external_removed.total_moles < 10) + if (external_removed.total_moles() < 10) return radiate() //Get same info from connected gas - var/internal_transfer_moles = 0.25 * air_contents.total_moles + var/internal_transfer_moles = 0.25 * air_contents.total_moles() var/datum/gas_mixture/internal_removed = air_contents.remove(internal_transfer_moles) if (!internal_removed) environment.merge(external_removed) return - var/combined_heat_capacity = internal_removed.heat_capacity + external_removed.heat_capacity - var/combined_energy = internal_removed.thermal_energy() + external_removed.thermal_energy() + var/combined_heat_capacity = internal_removed.heat_capacity() + external_removed.heat_capacity() + var/combined_energy = internal_removed.temperature * internal_removed.heat_capacity() + external_removed.heat_capacity() * external_removed.temperature if(!combined_heat_capacity) combined_heat_capacity = 1 var/final_temperature = combined_energy / combined_heat_capacity - external_removed.set_temperature(final_temperature) + external_removed.temperature = final_temperature environment.merge(external_removed) - internal_removed.set_temperature(final_temperature) + internal_removed.temperature = final_temperature air_contents.merge(internal_removed) network.update = 1 @@ -73,18 +73,18 @@ air_contents.copy_from(network.radiate) //We can cut down on processing time by only calculating radiate() once and then applying the result return - var/internal_transfer_moles = 0.25 * air_contents.total_moles + var/internal_transfer_moles = 0.25 * air_contents.total_moles() var/datum/gas_mixture/internal_removed = air_contents.remove(internal_transfer_moles) if (!internal_removed) return - var/combined_heat_capacity = internal_removed.heat_capacity + RADIATION_CAPACITY - var/combined_energy = internal_removed.thermal_energy() + (RADIATION_CAPACITY * 6.4) + var/combined_heat_capacity = internal_removed.heat_capacity() + RADIATION_CAPACITY + var/combined_energy = internal_removed.temperature * internal_removed.heat_capacity() + (RADIATION_CAPACITY * 6.4) var/final_temperature = combined_energy / combined_heat_capacity - internal_removed.set_temperature(final_temperature) + internal_removed.temperature = final_temperature air_contents.merge(internal_removed) if (network) diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm index a035c8a651f..57b4f8e1ae8 100644 --- a/code/ATMOSPHERICS/components/unary/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary/unary_base.dm @@ -12,8 +12,8 @@ initialize_directions = dir air_contents = new - air_contents.set_temperature(T0C) - air_contents.set_volume(starting_volume) + air_contents.temperature = T0C + air_contents.volume = starting_volume /obj/machinery/atmospherics/unary/buildFrom(var/mob/usr,var/obj/item/pipe/pipe) dir = pipe.dir diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 644e042315b..b7b0270686d 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -29,20 +29,18 @@ var/radio_filter_out var/radio_filter_in - - machine_flags = MULTITOOL_MENU -/obj/machinery/atmospherics/unary/vent_pump/on - on = 1 - icon_state = "out" + on + on = 1 + icon_state = "out" -/obj/machinery/atmospherics/unary/vent_pump/siphon - pump_direction = 0 - icon_state = "off" + siphon + pump_direction = 0 + icon_state = "off" -/obj/machinery/atmospherics/unary/vent_pump/siphon/on - on = 1 - icon_state = "in" + on + on = 1 + icon_state = "in" /obj/machinery/atmospherics/unary/vent_pump/New() ..() @@ -60,7 +58,7 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/New() ..() - air_contents.set_volume(1000) + air_contents.volume = 1000 /obj/machinery/atmospherics/unary/vent_pump/update_icon() if(welded) @@ -95,7 +93,7 @@ if(!loc) return var/datum/gas_mixture/environment = loc.return_air() - var/environment_pressure = environment.pressure + var/environment_pressure = environment.return_pressure() if(pump_direction) //internal -> external var/pressure_delta = 10000 @@ -103,7 +101,7 @@ if(pressure_checks&1) pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure)) if(pressure_checks&2) - pressure_delta = min(pressure_delta, (air_contents.pressure - internal_pressure_bound)) + pressure_delta = min(pressure_delta, (air_contents.return_pressure() - internal_pressure_bound)) if(pressure_delta > 0.1) if(air_contents.temperature > 0) @@ -121,7 +119,7 @@ if(pressure_checks&1) pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound)) if(pressure_checks&2) - pressure_delta = min(pressure_delta, (internal_pressure_bound - air_contents.pressure)) + pressure_delta = min(pressure_delta, (internal_pressure_bound - air_contents.return_pressure())) if(pressure_delta > 0.1) if(environment.temperature > 0) @@ -339,6 +337,9 @@ else user << "You need more welding fuel to complete this task." return 1 + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 4d719d878d8..88dcbbc7d0f 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -14,10 +14,11 @@ var/on = 0 var/scrubbing = 1 //0 = siphoning, 1 = scrubbing - - var/list/scrubbing_gases = list(CARBON_DIOXIDE, //list of gas ids we scrub - PLASMA, - NITROUS_OXIDE) + var/scrub_CO2 = 1 + var/scrub_Toxins = 1 + var/scrub_N2O = 0 + var/scrub_O2 = 0 + var/scrub_N2 = 0 var/volume_rate = 1000 // 120 var/panic = 0 //is this scrubber panicked? @@ -26,8 +27,6 @@ var/area_uid var/radio_filter_out var/radio_filter_in - - machine_flags = MULTITOOL_MENU /obj/machinery/atmospherics/unary/vent_scrubber/New() ..() @@ -47,7 +46,7 @@ icon_state = "[hidden]weld" return var/suffix="" - if(OXYGEN in scrubbing_gases) + if(scrub_O2) suffix="1" if(node && on && !(stat & (NOPOWER|BROKEN))) if(scrubbing) @@ -83,11 +82,11 @@ "power" = on, "scrubbing" = scrubbing, "panic" = panic, - "filter_co2" = (CARBON_DIOXIDE in scrubbing_gases), - "filter_tox" = (PLASMA in scrubbing_gases), - "filter_n2o" = (NITROUS_OXIDE in scrubbing_gases), - "filter_o2" = (OXYGEN in scrubbing_gases), - "filter_n2" = (NITROGEN in scrubbing_gases), + "filter_co2" = scrub_CO2, + "filter_tox" = scrub_Toxins, + "filter_n2o" = scrub_N2O, + "filter_o2" = scrub_O2, + "filter_n2" = scrub_N2, "sigtype" = "status" ) if(!areaMaster.air_scrub_names[id_tag]) @@ -125,26 +124,48 @@ var/datum/gas_mixture/environment = loc.return_air() if(scrubbing) - if(scrubbing_gases.len) - var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles + // Are we scrubbing gasses that are present? + if(\ + (scrub_Toxins && environment.toxins > 0) ||\ + (scrub_CO2 && environment.carbon_dioxide > 0) ||\ + (scrub_N2O && environment.trace_gases.len > 0) ||\ + (scrub_O2 && environment.oxygen > 0) ||\ + (scrub_N2 && environment.nitrogen > 0)) + var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles() //Take a gas sample var/datum/gas_mixture/removed = loc.remove_air(transfer_moles) if (isnull(removed)) //in space return - var/datum/gas_mixture/filtered_out = new - - for(var/gasid in removed.gases) - if(!(gasid in scrubbing_gases)) - continue - - filtered_out.adjust_gas(gasid, removed.gases[gasid]) //move to filtered - removed.set_gas(gasid, 0) //set to 0 - //Filter it + var/datum/gas_mixture/filtered_out = new + filtered_out.temperature = removed.temperature - filtered_out.set_temperature(removed.temperature) + if(scrub_Toxins) + filtered_out.toxins = removed.toxins + removed.toxins = 0 + + if(scrub_CO2) + filtered_out.carbon_dioxide = removed.carbon_dioxide + removed.carbon_dioxide = 0 + + if(scrub_O2) + filtered_out.oxygen = removed.oxygen + removed.oxygen = 0 + + if(scrub_N2) + filtered_out.nitrogen = removed.nitrogen + removed.nitrogen = 0 + + if(removed.trace_gases.len>0) + for(var/datum/gas/trace_gas in removed.trace_gases) + if(istype(trace_gas, /datum/gas/oxygen_agent_b)) + removed.trace_gases -= trace_gas + filtered_out.trace_gases += trace_gas + else if(istype(trace_gas, /datum/gas/sleeping_agent) && scrub_N2O) + removed.trace_gases -= trace_gas + filtered_out.trace_gases += trace_gas //Remix the resulting gases @@ -156,10 +177,10 @@ network.update = 1 else //Just siphoning all air - if (air_contents.pressure>=50*ONE_ATMOSPHERE) + if (air_contents.return_pressure()>=50*ONE_ATMOSPHERE) return - var/transfer_moles = environment.total_moles*(volume_rate/environment.volume) + var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume) var/datum/gas_mixture/removed = loc.remove_air(transfer_moles) @@ -218,29 +239,29 @@ scrubbing = !scrubbing if(signal.data["co2_scrub"] != null) - toggle_gas_scrub(CARBON_DIOXIDE, text2num(signal.data["co2_scrub"])) + scrub_CO2 = text2num(signal.data["co2_scrub"]) if(signal.data["toggle_co2_scrub"]) - toggle_gas_scrub(CARBON_DIOXIDE) + scrub_CO2 = !scrub_CO2 if(signal.data["tox_scrub"] != null) - toggle_gas_scrub(PLASMA, text2num(signal.data["tox_scrub"])) + scrub_Toxins = text2num(signal.data["tox_scrub"]) if(signal.data["toggle_tox_scrub"]) - toggle_gas_scrub(PLASMA) + scrub_Toxins = !scrub_Toxins if(signal.data["n2o_scrub"] != null) - toggle_gas_scrub(NITROUS_OXIDE, text2num(signal.data["n2o_scrub"])) + scrub_N2O = text2num(signal.data["n2o_scrub"]) if(signal.data["toggle_n2o_scrub"]) - toggle_gas_scrub(NITROUS_OXIDE) + scrub_N2O = !scrub_N2O if(signal.data["o2_scrub"] != null) - toggle_gas_scrub(OXYGEN, text2num(signal.data["o2_scrub"])) + scrub_O2 = text2num(signal.data["o2_scrub"]) if(signal.data["toggle_o2_scrub"]) - toggle_gas_scrub(OXYGEN) + scrub_O2 = !scrub_O2 if(signal.data["n2_scrub"] != null) - toggle_gas_scrub(NITROGEN, text2num(signal.data["n2_scrub"])) + scrub_N2 = text2num(signal.data["n2_scrub"]) if(signal.data["toggle_n2_scrub"]) - toggle_gas_scrub(NITROGEN) + scrub_N2 = !scrub_N2 if(signal.data["init"] != null) name = signal.data["init"] @@ -257,20 +278,6 @@ update_icon() return -//forcestate 1 turns scrubbing on, forcestate -1 turns scrubbing off. Otherwise, it toggles -/obj/machinery/atmospherics/unary/vent_scrubber/proc/toggle_gas_scrub(gasid, forcestate) - if(!forcestate) - if(gasid in scrubbing_gases) - scrubbing_gases -= gasid - else - scrubbing_gases += gasid - else - switch(forcestate) - if(1) - scrubbing_gases |= gasid //adds it if it's not added already - if(-1) - scrubbing_gases -= gasid //since this only works if it's in, we remove it - /obj/machinery/atmospherics/unary/vent_scrubber/power_change() if(powered(power_channel)) stat &= ~NOPOWER @@ -282,6 +289,9 @@ return !welded /obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) diff --git a/code/ATMOSPHERICS/datum_pipe_network.dm b/code/ATMOSPHERICS/datum_pipe_network.dm index bd340131dab..b2da33fa451 100644 --- a/code/ATMOSPHERICS/datum_pipe_network.dm +++ b/code/ATMOSPHERICS/datum_pipe_network.dm @@ -102,69 +102,134 @@ //air_transient.volume = 0 var/air_transient_volume = 0 - for(var/gasid in air_transient.gases) - air_transient.set_gas(gasid, 0, 0) //sets them all to 0 + air_transient.oxygen = 0 + air_transient.nitrogen = 0 + air_transient.toxins = 0 + air_transient.carbon_dioxide = 0 + + + air_transient.trace_gases = list() for(var/datum/gas_mixture/gas in gases) air_transient_volume += gas.volume - var/temp_heatcap = gas.heat_capacity + var/temp_heatcap = gas.heat_capacity() total_thermal_energy += gas.temperature*temp_heatcap total_heat_capacity += temp_heatcap - air_transient.add(gas) + air_transient.oxygen += gas.oxygen + air_transient.nitrogen += gas.nitrogen + air_transient.toxins += gas.toxins + air_transient.carbon_dioxide += gas.carbon_dioxide - air_transient.set_volume(air_transient_volume) + if(gas.trace_gases.len) + for(var/datum/gas/trace_gas in gas.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in air_transient.trace_gases + if(!corresponding) + corresponding = new trace_gas.type() + air_transient.trace_gases += corresponding + + corresponding.moles += trace_gas.moles + + air_transient.volume = air_transient_volume if(air_transient_volume > 0) if(total_heat_capacity > 0) - air_transient.set_temperature(total_thermal_energy/total_heat_capacity) + air_transient.temperature = total_thermal_energy/total_heat_capacity //Allow air mixture to react if(air_transient.react()) update = 1 else - air_transient.set_temperature(0) + air_transient.temperature = 0 //Update individual gas_mixtures by volume ratio for(var/datum/gas_mixture/gas in gases) var/volume_ratio = gas.volume / air_transient.volume - gas.copy_from(air_transient) - gas.multiply(volume_ratio) + gas.oxygen = air_transient.oxygen * volume_ratio + gas.nitrogen = air_transient.nitrogen * volume_ratio + gas.toxins = air_transient.toxins * volume_ratio + gas.carbon_dioxide = air_transient.carbon_dioxide * volume_ratio + gas.temperature = air_transient.temperature + + if(air_transient.trace_gases.len) + for(var/datum/gas/trace_gas in air_transient.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in gas.trace_gases + + if(!corresponding) + corresponding = new trace_gas.type() + gas.trace_gases += corresponding + + corresponding.moles = trace_gas.moles * volume_ratio + + gas.update_values() + + air_transient.update_values() return 1 -proc/equalize_gases(list/datum/gas_mixture/gases) +proc/equalize_gases(datum/gas_mixture/list/gases) //Perfectly equalize all gases members instantly - var/datum/gas_mixture/total = new + //Calculate totals from individual components var/total_volume = 0 var/total_thermal_energy = 0 + var/total_heat_capacity = 0 + + var/total_oxygen = 0 + var/total_nitrogen = 0 + var/total_toxins = 0 + var/total_carbon_dioxide = 0 + + var/list/total_trace_gases = list() for(var/datum/gas_mixture/gas in gases) total_volume += gas.volume - total_thermal_energy += gas.temperature*gas.heat_capacity + var/temp_heatcap = gas.heat_capacity() + total_thermal_energy += gas.temperature*temp_heatcap + total_heat_capacity += temp_heatcap - total.add(gas) + total_oxygen += gas.oxygen + total_nitrogen += gas.nitrogen + total_toxins += gas.toxins + total_carbon_dioxide += gas.carbon_dioxide + if(gas.trace_gases.len) + for(var/datum/gas/trace_gas in gas.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in total_trace_gases + if(!corresponding) + corresponding = new trace_gas.type() + total_trace_gases += corresponding + + corresponding.moles += trace_gas.moles if(total_volume > 0) //Calculate temperature var/temperature = 0 - if(total.heat_capacity > 0) - temperature = total_thermal_energy/total.heat_capacity + if(total_heat_capacity > 0) + temperature = total_thermal_energy/total_heat_capacity //Update individual gas_mixtures by volume ratio - for(var/gasid in total.gases) //for each gas in the gas mix in our list of gas mixes - var/total_gas = total.gases[gasid] - for(var/datum/gas_mixture/gas_mix in gases) - gas_mix.set_gas(gasid, total_gas * gas_mix.volume / total_volume) + for(var/datum/gas_mixture/gas in gases) + gas.oxygen = total_oxygen*gas.volume/total_volume + gas.nitrogen = total_nitrogen*gas.volume/total_volume + gas.toxins = total_toxins*gas.volume/total_volume + gas.carbon_dioxide = total_carbon_dioxide*gas.volume/total_volume - for(var/datum/gas_mixture/gas_mix in gases) //cheaper to set here - gas_mix.set_temperature(temperature) + gas.temperature = temperature + + if(total_trace_gases.len) + for(var/datum/gas/trace_gas in total_trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in gas.trace_gases + if(!corresponding) + corresponding = new trace_gas.type() + gas.trace_gases += corresponding + + corresponding.moles = trace_gas.moles*gas.volume/total_volume + gas.update_values() return 1 \ No newline at end of file diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index 9384bf26d86..e91ca41e0d1 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -29,7 +29,7 @@ /datum/pipeline/proc/process()//This use to be called called from the pipe networks if((world.timeofday - last_pressure_check) / 10 >= PRESSURE_CHECK_DELAY) //Check to see if pressure is within acceptable limits - var/pressure = air.pressure + var/pressure = air.return_pressure() if(pressure > alert_pressure) for(var/obj/machinery/atmospherics/pipe/member in members) if(!member.check_pressure(pressure)) @@ -46,11 +46,22 @@ for(var/obj/machinery/atmospherics/pipe/member in members) member.air_temporary = new - member.air_temporary.set_volume(member.volume) + member.air_temporary.volume = member.volume - member.air_temporary.copy_from(air) - member.air_temporary.multiply(member.volume/air.volume) + member.air_temporary.oxygen = air.oxygen*member.volume/air.volume + member.air_temporary.nitrogen = air.nitrogen*member.volume/air.volume + member.air_temporary.toxins = air.toxins*member.volume/air.volume + member.air_temporary.carbon_dioxide = air.carbon_dioxide*member.volume/air.volume + member.air_temporary.temperature = air.temperature + + if(air.trace_gases.len) + for(var/datum/gas/trace_gas in air.trace_gases) + var/datum/gas/corresponding = new trace_gas.type() + member.air_temporary.trace_gases += corresponding + + corresponding.moles = trace_gas.moles*member.volume/air.volume + member.air_temporary.update_values() /datum/pipeline/proc/build_pipeline(obj/machinery/atmospherics/pipe/base) var/list/possible_expansions = list(base) @@ -67,8 +78,6 @@ else air = new - air.set_volume(volume) - while(possible_expansions.len>0) for(var/obj/machinery/atmospherics/pipe/borderline in possible_expansions) @@ -96,6 +105,9 @@ possible_expansions -= borderline + air.volume = volume + air.update_values() + /datum/pipeline/proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference) if(new_network.line_members.Find(src)) @@ -124,14 +136,14 @@ /datum/pipeline/proc/mingle_with_turf(turf/simulated/target, mingle_volume) var/datum/gas_mixture/air_sample = air.remove_ratio(mingle_volume/air.volume) - air_sample.set_volume(mingle_volume) + air_sample.volume = mingle_volume if(istype(target) && target.zone) //Have to consider preservation of group statuses var/datum/gas_mixture/turf_copy = new turf_copy.copy_from(target.zone.air) - turf_copy.set_volume(target.zone.air.volume) //Copy a good representation of the turf from parent group + turf_copy.volume = target.zone.air.volume //Copy a good representation of the turf from parent group equalize_gases(list(air_sample, turf_copy)) air.merge(air_sample) @@ -157,7 +169,7 @@ network.update = 1 /datum/pipeline/proc/temperature_interact(turf/target, share_volume, thermal_conductivity) - var/total_heat_capacity = air.heat_capacity + var/total_heat_capacity = air.heat_capacity() var/partial_heat_capacity = total_heat_capacity*(share_volume/air.volume) if(istype(target, /turf/simulated)) @@ -171,7 +183,7 @@ var/heat = thermal_conductivity*delta_temperature* \ (partial_heat_capacity*modeled_location.heat_capacity/(partial_heat_capacity+modeled_location.heat_capacity)) - air.set_temperature(air.temperature - heat/total_heat_capacity) + air.temperature -= heat/total_heat_capacity modeled_location.temperature += heat/modeled_location.heat_capacity else @@ -180,10 +192,10 @@ if(modeled_location.zone) delta_temperature = (air.temperature - modeled_location.zone.air.temperature) - sharer_heat_capacity = modeled_location.zone.air.heat_capacity + sharer_heat_capacity = modeled_location.zone.air.heat_capacity() else delta_temperature = (air.temperature - modeled_location.air.temperature) - sharer_heat_capacity = modeled_location.air.heat_capacity + sharer_heat_capacity = modeled_location.air.heat_capacity() var/self_temperature_delta = 0 var/sharer_temperature_delta = 0 @@ -197,12 +209,12 @@ else return 1 - air.set_temperature(air.temperature + self_temperature_delta) + air.temperature += self_temperature_delta if(modeled_location.zone) - modeled_location.zone.air.set_temperature(modeled_location.zone.air.temperature + sharer_temperature_delta/modeled_location.zone.air.group_multiplier) + modeled_location.zone.air.temperature += sharer_temperature_delta/modeled_location.zone.air.group_multiplier else - modeled_location.air.set_temperature(modeled_location.air.temperature + sharer_temperature_delta) + modeled_location.air.temperature += sharer_temperature_delta else @@ -212,6 +224,6 @@ var/heat = thermal_conductivity*delta_temperature* \ (partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity)) - air.set_temperature( air.temperature - heat/total_heat_capacity) + air.temperature -= heat/total_heat_capacity if(network) network.update = 1 diff --git a/code/ATMOSPHERICS/he_pipes.dm b/code/ATMOSPHERICS/he_pipes.dm index 56b1ef5312c..37d44d2c9e9 100644 --- a/code/ATMOSPHERICS/he_pipes.dm +++ b/code/ATMOSPHERICS/he_pipes.dm @@ -56,12 +56,12 @@ // Get gas from pipenet var/datum/gas_mixture/internal = return_air() - var/internal_transfer_moles = 0.25 * internal.total_moles + var/internal_transfer_moles = 0.25 * internal.total_moles() var/datum/gas_mixture/internal_removed = internal.remove(internal_transfer_moles) //Get processable air sample and thermal info from environment var/datum/gas_mixture/environment = loc.return_air() - var/transfer_moles = 0.25 * environment.total_moles + var/transfer_moles = 0.25 * environment.total_moles() var/datum/gas_mixture/external_removed = environment.remove(transfer_moles) // No environmental gas? We radiate it, then. @@ -71,7 +71,7 @@ return radiate() // Not enough gas in the air around us to care about. Radiate. - if (external_removed.total_moles < 10) + if (external_removed.total_moles() < 10) if(internal_removed) internal.merge(internal_removed) environment.merge(external_removed) @@ -83,17 +83,17 @@ return //Get same info from connected gas - var/combined_heat_capacity = internal_removed.heat_capacity + external_removed.heat_capacity - var/combined_energy = internal_removed.thermal_energy() + external_removed.thermal_energy() + var/combined_heat_capacity = internal_removed.heat_capacity() + external_removed.heat_capacity() + var/combined_energy = internal_removed.temperature * internal_removed.heat_capacity() + external_removed.heat_capacity() * external_removed.temperature if(!combined_heat_capacity) combined_heat_capacity = 1 var/final_temperature = combined_energy / combined_heat_capacity - external_removed.set_temperature(final_temperature) + external_removed.temperature = final_temperature environment.merge(external_removed) - internal_removed.set_temperature(final_temperature) + internal_removed.temperature = final_temperature internal.merge(internal_removed) @@ -103,18 +103,18 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/proc/radiate() var/datum/gas_mixture/internal = return_air() - var/internal_transfer_moles = 0.25 * internal.total_moles + var/internal_transfer_moles = 0.25 * internal.total_moles() var/datum/gas_mixture/internal_removed = internal.remove(internal_transfer_moles) if (!internal_removed) return - var/combined_heat_capacity = internal_removed.heat_capacity + RADIATION_CAPACITY - var/combined_energy = internal_removed.thermal_energy() + (RADIATION_CAPACITY * ENERGY_MULT) + var/combined_heat_capacity = internal_removed.heat_capacity() + RADIATION_CAPACITY + var/combined_energy = internal_removed.temperature * internal_removed.heat_capacity() + (RADIATION_CAPACITY * ENERGY_MULT) var/final_temperature = combined_energy / combined_heat_capacity - internal_removed.set_temperature(final_temperature) + internal_removed.temperature = final_temperature internal.merge(internal_removed) if(parent && parent.network) diff --git a/code/ATMOSPHERICS/hvac/chiller.dm b/code/ATMOSPHERICS/hvac/chiller.dm index 3b9c03ce6ca..0e4af4c1e82 100644 --- a/code/ATMOSPHERICS/hvac/chiller.dm +++ b/code/ATMOSPHERICS/hvac/chiller.dm @@ -93,16 +93,17 @@ var/turf/simulated/L = loc if(istype(L)) var/datum/gas_mixture/env = L.return_air() - var/transfer_moles = 0.25 * env.total_moles + var/transfer_moles = 0.25 * env.total_moles() var/datum/gas_mixture/removed = env.remove(transfer_moles) if(removed) if(removed.temperature > (set_temperature + T0C)) - var/combined_heat_capacity = cooling_power + removed.heat_capacity + var/air_heat_capacity = removed.heat_capacity() + var/combined_heat_capacity = cooling_power + air_heat_capacity //var/old_temperature = removed.temperature if(combined_heat_capacity > 0) - var/combined_energy = set_temperature*cooling_power + removed.thermal_energy() - removed.set_temperature(combined_energy/combined_heat_capacity) + var/combined_energy = set_temperature*cooling_power + air_heat_capacity*removed.temperature + removed.temperature = combined_energy/combined_heat_capacity env.merge(removed) return 1 env.merge(removed) diff --git a/code/ATMOSPHERICS/hvac/spaceheater.dm b/code/ATMOSPHERICS/hvac/spaceheater.dm index 915fae5e343..8934b3f1edb 100644 --- a/code/ATMOSPHERICS/hvac/spaceheater.dm +++ b/code/ATMOSPHERICS/hvac/spaceheater.dm @@ -165,7 +165,7 @@ var/datum/gas_mixture/env = L.return_air() if(env.temperature != set_temperature + T0C) - var/transfer_moles = 0.25 * env.total_moles + var/transfer_moles = 0.25 * env.total_moles() var/datum/gas_mixture/removed = env.remove(transfer_moles) @@ -173,13 +173,13 @@ if(removed) - var/heat_capacity = removed.heat_capacity + var/heat_capacity = removed.heat_capacity() //world << "heating ([heat_capacity])" if(heat_capacity) // Added check to avoid divide by zero (oshi-) runtime errors -- TLE if(removed.temperature < set_temperature + T0C) - removed.set_temperature(min(removed.temperature + heating_power/heat_capacity, 1000)) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE + removed.temperature = min(removed.temperature + heating_power/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE else - removed.set_temperature(max(removed.temperature - heating_power/heat_capacity, TCMB)) + removed.temperature = max(removed.temperature - heating_power/heat_capacity, TCMB) cell.use(heating_power/20000) //world << "now at [removed.temperature]" diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 71fe65bf8e7..542b3f3fc44 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -12,9 +12,6 @@ // Insulated pipes #define IPIPE_COLOR_RED PIPE_COLOR_RED #define IPIPE_COLOR_BLUE "#4285F4" -/obj/machinery/atmospherics/pipe/process() - . = ..() - atmos_machines.Remove(src) /obj/machinery/atmospherics/pipe var/datum/gas_mixture/air_temporary //used when reconstructing a pipeline that broke @@ -201,7 +198,7 @@ // So, a pipe rated at 8,000 kPa in a 104kPa environment will explode at 8,104kPa. var/datum/gas_mixture/environment = loc.return_air() - var/pressure_difference = pressure - environment.pressure + var/pressure_difference = pressure - environment.return_pressure() // Burst check first. if(pressure_difference > maximum_pressure && prob(1)) diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm index 41fac7a61ea..17c87e428a9 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm @@ -135,24 +135,25 @@ Deuterium-tritium fusion: 4.5 x 10^7 K //add plasma from the surrounding environment var/datum/gas_mixture/environment = loc.return_air() - var/held_plasma_moles = held_plasma.gases[PLASMA] //hack in some stuff to remove plasma from the air because SCIENCE //the amount of plasma pulled in each update is relative to the field strength, with 50T (max field strength) = 100% of area covered by the field //at minimum strength, 0.25% of the field volume is pulled in per update (?) //have a max of 1000 moles suspended - if(held_plasma_moles < transfer_ratio * 1000) - var/moles_covered = environment.pressure*volume_covered/(environment.temperature * R_IDEAL_GAS_EQUATION) + if(held_plasma.toxins < transfer_ratio * 1000) + var/moles_covered = environment.return_pressure()*volume_covered/(environment.temperature * R_IDEAL_GAS_EQUATION) //world << "moles_covered: [moles_covered]" // var/datum/gas_mixture/gas_covered = environment.remove(moles_covered) var/datum/gas_mixture/plasma_captured = new /datum/gas_mixture() // - plasma_captured.set_gas(PLASMA, round(gas_covered.gases[PLASMA] * transfer_ratio)) + plasma_captured.toxins = round(gas_covered.toxins * transfer_ratio) //world << "[plasma_captured.toxins] moles of plasma captured" - plasma_captured.set_temperature(gas_covered.temperature) + plasma_captured.temperature = gas_covered.temperature + plasma_captured.update_values() // - gas_covered.adjust_gas(PLASMA, -plasma_captured.gases[PLASMA]) + gas_covered.toxins -= plasma_captured.toxins + gas_covered.update_values() // held_plasma.merge(plasma_captured) // @@ -170,32 +171,32 @@ Deuterium-tritium fusion: 4.5 x 10^7 K //change held plasma temp according to energy levels //SPECIFIC_HEAT_TOXIN - if(mega_energy > 0 && held_plasma_moles) - var/heat_capacity = held_plasma.heat_capacity//200 * number of plasma moles + if(mega_energy > 0 && held_plasma.toxins) + var/heat_capacity = held_plasma.heat_capacity()//200 * number of plasma moles if(heat_capacity > 0.0003) //formerly MINIMUM_HEAT_CAPACITY - held_plasma.set_temperature((heat_capacity + mega_energy * 35000)/heat_capacity) + held_plasma.temperature = (heat_capacity + mega_energy * 35000)/heat_capacity //if there is too much plasma in the field, lose some /*if( held_plasma.toxins > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) ) LosePlasma()*/ - if(held_plasma_moles > 1) + if(held_plasma.toxins > 1) //lose a random amount of plasma back into the air, increased by the field strength (want to switch this over to frequency eventually) var/loss_ratio = rand() * (0.05 + (0.05 * 50 / field_strength)) //world << "lost [loss_ratio*100]% of held plasma" // var/datum/gas_mixture/plasma_lost = new - plasma_lost.set_temperature(held_plasma.temperature) + plasma_lost.temperature = held_plasma.temperature // - plasma_lost.set_gas(PLASMA, held_plasma_moles * loss_ratio) + plasma_lost.toxins = held_plasma.toxins * loss_ratio //plasma_lost.update_values() - held_plasma.adjust_gas(PLASMA, -held_plasma_moles * loss_ratio) + held_plasma.toxins -= held_plasma.toxins * loss_ratio //held_plasma.update_values() // environment.merge(plasma_lost) radiation += loss_ratio * mega_energy * 0.1 mega_energy -= loss_ratio * mega_energy * 0.1 else - held_plasma.set_gas(PLASMA, 0) + held_plasma.toxins = 0 //held_plasma.update_values() //handle some reactants formatting diff --git a/code/WorkInProgress/pomf/spacepods/equipment.dm b/code/WorkInProgress/pomf/spacepods/equipment.dm index fc2095ef970..46596ab4a58 100644 --- a/code/WorkInProgress/pomf/spacepods/equipment.dm +++ b/code/WorkInProgress/pomf/spacepods/equipment.dm @@ -9,9 +9,7 @@ usr << "Missing equipment or weapons." my_atom.verbs -= /obj/item/device/spacepod_equipment/weaponry/proc/fire_weapon_system return - if(!my_atom.battery.use(shot_cost)) - usr << "\The [my_atom]'s cell is too low on charge!" - return + my_atom.battery.use(shot_cost) var/olddir dir = my_atom.dir for(var/i = 0; i < shots_per; i++) @@ -92,9 +90,8 @@ name = "\improper burst taser system" desc = "A weak taser system for space pods, this one fires 3 at a time." icon_state = "pod_b_taser" - shot_cost = 35 + shot_cost = 20 shots_per = 3 - fire_delay = 20 verb_name = "Fire Burst Taser System" verb_desc = "Fire ze tasers!" @@ -103,9 +100,9 @@ desc = "A weak laser system for space pods, fires concentrated bursts of energy" icon_state = "pod_w_laser" projectile_type = /obj/item/projectile/beam - shot_cost = 150 + shot_cost = 15 fire_sound = 'sound/weapons/Laser.ogg' - fire_delay = 15 + fire_delay = 25 verb_name = "Fire Laser System" verb_desc = "Fire ze lasers!" diff --git a/code/WorkInProgress/pomf/spacepods/spacepods.dm b/code/WorkInProgress/pomf/spacepods/spacepods.dm index 8089359f074..a55ef12555d 100644 --- a/code/WorkInProgress/pomf/spacepods/spacepods.dm +++ b/code/WorkInProgress/pomf/spacepods/spacepods.dm @@ -86,12 +86,12 @@ spawn(0) if(occupant) occupant << "Critical damage to the vessel detected, core explosion imminent!" - for(var/i = 10, i >= 0; --i) - if(occupant) - occupant << "[i]" - if(i == 0) - explosion(loc, 2, 4, 8) - sleep(10) + for(var/i = 10, i >= 0; --i) + if(occupant) + occupant << "[i]" + if(i == 0) + explosion(loc, 2, 4, 8) + sleep(10) update_icons() @@ -230,10 +230,10 @@ /obj/spacepod/proc/add_cabin() cabin_air = new - cabin_air.set_temperature(T20C) - cabin_air.set_volume(200) - cabin_air.adjust_gas(OXYGEN, O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)) - cabin_air.adjust_gas(NITROGEN, N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)) + cabin_air.temperature = T20C + cabin_air.volume = 200 + cabin_air.oxygen = O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature) + cabin_air.nitrogen = N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature) return cabin_air /obj/spacepod/proc/add_airtank() @@ -263,21 +263,21 @@ /obj/spacepod/proc/return_pressure() . = 0 if(use_internal_tank) - . = cabin_air.pressure + . = cabin_air.return_pressure() else var/datum/gas_mixture/t_air = get_turf_air() if(t_air) - . = t_air.pressure + . = t_air.return_pressure() return /obj/spacepod/proc/return_temperature() . = 0 if(use_internal_tank) - . = cabin_air.temperature + . = cabin_air.return_temperature() else var/datum/gas_mixture/t_air = get_turf_air() if(t_air) - . = t_air.temperature + . = t_air.return_temperature() return /obj/spacepod/proc/moved_inside(var/mob/living/carbon/human/H as mob) @@ -366,9 +366,9 @@ delay = 20 process(var/obj/spacepod/spacepod) - if(spacepod.cabin_air && spacepod.cabin_air.volume > 0) + if(spacepod.cabin_air && spacepod.cabin_air.return_volume() > 0) var/delta = spacepod.cabin_air.temperature - T20C - spacepod.cabin_air.set_temperature( spacepod.cabin_air.temperature - max(-10, min(10, round(delta/4,0.1)))) + spacepod.cabin_air.temperature -= max(-10, min(10, round(delta/4,0.1))) return /datum/global_iterator/pod_tank_give_air @@ -380,21 +380,21 @@ var/datum/gas_mixture/cabin_air = spacepod.cabin_air var/release_pressure = ONE_ATMOSPHERE - var/cabin_pressure = cabin_air.pressure - var/pressure_delta = min(release_pressure - cabin_pressure, (tank_air.pressure - cabin_pressure)/2) + var/cabin_pressure = cabin_air.return_pressure() + var/pressure_delta = min(release_pressure - cabin_pressure, (tank_air.return_pressure() - cabin_pressure)/2) var/transfer_moles = 0 if(pressure_delta > 0) //cabin pressure lower than release pressure - if(tank_air.temperature > 0) - transfer_moles = pressure_delta*cabin_air.volume/(cabin_air.temperature * R_IDEAL_GAS_EQUATION) + if(tank_air.return_temperature() > 0) + transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION) var/datum/gas_mixture/removed = tank_air.remove(transfer_moles) cabin_air.merge(removed) else if(pressure_delta < 0) //cabin pressure higher than release pressure var/datum/gas_mixture/t_air = spacepod.get_turf_air() pressure_delta = cabin_pressure - release_pressure if(t_air) - pressure_delta = min(cabin_pressure - t_air.pressure, pressure_delta) + pressure_delta = min(cabin_pressure - t_air.return_pressure(), pressure_delta) if(pressure_delta > 0) //if location pressure is lower than cabin pressure - transfer_moles = pressure_delta*cabin_air.volume/(cabin_air.temperature * R_IDEAL_GAS_EQUATION) + transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION) var/datum/gas_mixture/removed = cabin_air.remove(transfer_moles) if(t_air) t_air.merge(removed) diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 85a5e941b85..66497632826 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -118,7 +118,7 @@ obj/item/check_airflow_movable(n) proc/Airflow(zone/A, zone/B) set background = 1 - var/n = B.air.pressure - A.air.pressure + var/n = B.air.return_pressure() - A.air.return_pressure() //Don't go any further if n is lower than the lowest value needed for airflow. if(abs(n) < zas_settings.Get(/datum/ZAS_Setting/airflow_lightest_pressure)) return @@ -199,7 +199,7 @@ proc/AirflowSpace(zone/A) spawn() //The space version of the Airflow(A,B,n) proc. - var/n = A.air.pressure + var/n = A.air.return_pressure() //Here, n is determined by only the pressure in the room. if(n < zas_settings.Get(/datum/ZAS_Setting/airflow_lightest_pressure)) return diff --git a/code/ZAS/ConnectionGroup.dm b/code/ZAS/ConnectionGroup.dm index 57c4cc7e879..bb818b673bf 100644 --- a/code/ZAS/ConnectionGroup.dm +++ b/code/ZAS/ConnectionGroup.dm @@ -182,7 +182,7 @@ Class Procs: air_master.mark_zone_update(B) //world << "equalized." - var/differential = A.air.pressure - B.air.pressure + var/differential = A.air.return_pressure() - B.air.return_pressure() if(abs(differential) < zas_settings.Get(/datum/ZAS_Setting/airflow_lightest_pressure)) return var/list/attracted @@ -241,7 +241,7 @@ Class Procs: ShareSpace(A.air,air,dbg_out) air_master.mark_zone_update(A) - var/differential = A.air.pressure - air.pressure + var/differential = A.air.return_pressure() - air.return_pressure() if(abs(differential) < zas_settings.Get(/datum/ZAS_Setting/airflow_lightest_pressure)) return var/list/attracted = A.movables() @@ -251,55 +251,113 @@ var/list/sharing_lookup_table = list(0.30, 0.40, 0.48, 0.54, 0.60, 0.66) proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles) //Shares a specific ratio of gas between mixtures using simple weighted averages. - + var //WOOT WOOT TOUCH THIS AND YOU ARE A RETARD - var/ratio = sharing_lookup_table[6] + ratio = sharing_lookup_table[6] //WOOT WOOT TOUCH THIS AND YOU ARE A RETARD - var/A_full_heat_capacity = A.heat_capacity * A.group_multiplier + size = max(1,A.group_multiplier) + share_size = max(1,B.group_multiplier) - var/B_full_heat_capacity = B.heat_capacity * B.group_multiplier + full_oxy = A.oxygen * size + full_nitro = A.nitrogen * size + full_co2 = A.carbon_dioxide * size + full_plasma = A.toxins * size - var/temp_avg = (A.temperature * A_full_heat_capacity + B.temperature * B_full_heat_capacity) / (A_full_heat_capacity + B_full_heat_capacity) + full_heat_capacity = A.heat_capacity() * size + + s_full_oxy = B.oxygen * share_size + s_full_nitro = B.nitrogen * share_size + s_full_co2 = B.carbon_dioxide * share_size + s_full_plasma = B.toxins * share_size + + s_full_heat_capacity = B.heat_capacity() * share_size + + oxy_avg = (full_oxy + s_full_oxy) / (size + share_size) + nit_avg = (full_nitro + s_full_nitro) / (size + share_size) + co2_avg = (full_co2 + s_full_co2) / (size + share_size) + plasma_avg = (full_plasma + s_full_plasma) / (size + share_size) + + temp_avg = (A.temperature * full_heat_capacity + B.temperature * s_full_heat_capacity) / (full_heat_capacity + s_full_heat_capacity) //WOOT WOOT TOUCH THIS AND YOU ARE A RETARD if(sharing_lookup_table.len >= connecting_tiles) //6 or more interconnecting tiles will max at 42% of air moved per tick. ratio = sharing_lookup_table[connecting_tiles] //WOOT WOOT TOUCH THIS AND YOU ARE A RETARD - A.set_temperature((A.temperature - temp_avg) * (1-ratio) + temp_avg) + A.oxygen = max(0, (A.oxygen - oxy_avg) * (1-ratio) + oxy_avg ) + A.nitrogen = max(0, (A.nitrogen - nit_avg) * (1-ratio) + nit_avg ) + A.carbon_dioxide = max(0, (A.carbon_dioxide - co2_avg) * (1-ratio) + co2_avg ) + A.toxins = max(0, (A.toxins - plasma_avg) * (1-ratio) + plasma_avg ) - B.set_temperature((B.temperature - temp_avg) * (1-ratio) + temp_avg) + A.temperature = max(0, (A.temperature - temp_avg) * (1-ratio) + temp_avg ) - for(var/gasid in A.gases) - var/A_moles = A.gases[gasid] - var/B_moles = B.gases[gasid] - var/avg_gas = (A_moles * A.group_multiplier + B_moles * B.group_multiplier) / (A.group_multiplier + B.group_multiplier) + B.oxygen = max(0, (B.oxygen - oxy_avg) * (1-ratio) + oxy_avg ) + B.nitrogen = max(0, (B.nitrogen - nit_avg) * (1-ratio) + nit_avg ) + B.carbon_dioxide = max(0, (B.carbon_dioxide - co2_avg) * (1-ratio) + co2_avg ) + B.toxins = max(0, (B.toxins - plasma_avg) * (1-ratio) + plasma_avg ) - A.set_gas(gasid, avg_gas + ((A_moles - avg_gas) * (1 - ratio))) //we don't use adjust_gas because it interferes with the group multiplier - B.set_gas(gasid, avg_gas + ((B_moles - avg_gas) * (1 - ratio))) + B.temperature = max(0, (B.temperature - temp_avg) * (1-ratio) + temp_avg ) - return A.compare(B) + for(var/datum/gas/G in A.trace_gases) + var/datum/gas/H = locate(G.type) in B.trace_gases + if(H) + var/G_avg = (G.moles*size + H.moles*share_size) / (size+share_size) + G.moles = (G.moles - G_avg) * (1-ratio) + G_avg + + H.moles = (H.moles - G_avg) * (1-ratio) + G_avg + else + H = new G.type + B.trace_gases += H + var/G_avg = (G.moles*size) / (size+share_size) + G.moles = (G.moles - G_avg) * (1-ratio) + G_avg + H.moles = (H.moles - G_avg) * (1-ratio) + G_avg + + for(var/datum/gas/G in B.trace_gases) + var/datum/gas/H = locate(G.type) in A.trace_gases + if(!H) + H = new G.type + A.trace_gases += H + var/G_avg = (G.moles*size) / (size+share_size) + G.moles = (G.moles - G_avg) * (1-ratio) + G_avg + H.moles = (H.moles - G_avg) * (1-ratio) + G_avg + + A.update_values() + B.update_values() + + if(A.compare(B)) return 1 + else return 0 proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles, dbg_output) //A modified version of ShareRatio for spacing gas at the same rate as if it were going into a large airless room. if(!unsimulated_tiles) return 0 - var/datum/gas_mixture/unsim_mix = new + var + unsim_oxygen = 0 + unsim_nitrogen = 0 + unsim_co2 = 0 + unsim_plasma = 0 + unsim_heat_capacity = 0 + unsim_temperature = 0 + + size = max(1,A.group_multiplier) var/tileslen - var/size = A.group_multiplier var/share_size if(istype(unsimulated_tiles, /datum/gas_mixture)) var/datum/gas_mixture/avg_unsim = unsimulated_tiles - unsim_mix.copy_from(avg_unsim) + unsim_oxygen = avg_unsim.oxygen + unsim_co2 = avg_unsim.carbon_dioxide + unsim_nitrogen = avg_unsim.nitrogen + unsim_plasma = avg_unsim.toxins + unsim_temperature = avg_unsim.temperature share_size = max(1, max(size + 3, 1) + avg_unsim.group_multiplier) tileslen = avg_unsim.group_multiplier if(dbg_output) - world << "O2: [unsim_mix.gases[OXYGEN]] N2: [unsim_mix.gases[NITROGEN]] Size: [share_size] Tiles: [tileslen]" + world << "O2: [unsim_oxygen] N2: [unsim_nitrogen] Size: [share_size] Tiles: [tileslen]" else if(istype(unsimulated_tiles, /list)) if(!unsimulated_tiles.len) @@ -314,53 +372,79 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles, dbg_output) var/correction_ratio = share_size / unsimulated_tiles.len for(var/turf/T in unsimulated_tiles) - unsim_mix.add(T.return_air()) + unsim_oxygen += T.oxygen + unsim_co2 += T.carbon_dioxide + unsim_nitrogen += T.nitrogen + unsim_plasma += T.toxins + unsim_temperature += T.temperature/unsimulated_tiles.len //These values require adjustment in order to properly represent a room of the specified size. - unsim_mix.multiply(correction_ratio) + unsim_oxygen *= correction_ratio + unsim_co2 *= correction_ratio + unsim_nitrogen *= correction_ratio + unsim_plasma *= correction_ratio tileslen = unsimulated_tiles.len else //invalid input type return 0 - var/ratio = sharing_lookup_table[6] + unsim_heat_capacity = HEAT_CAPACITY_CALCULATION(unsim_oxygen, unsim_co2, unsim_nitrogen, unsim_plasma) - var/old_pressure = A.pressure + var + ratio = sharing_lookup_table[6] - var/full_heat_capacity = A.heat_capacity * A.group_multiplier + old_pressure = A.return_pressure() - var/temp_avg = 0 + full_oxy = A.oxygen * size + full_nitro = A.nitrogen * size + full_co2 = A.carbon_dioxide * size + full_plasma = A.toxins * size - if((full_heat_capacity + unsim_mix.heat_capacity) > 0) - temp_avg = (A.temperature * full_heat_capacity + unsim_mix.temperature * unsim_mix.heat_capacity) / (full_heat_capacity + unsim_mix.heat_capacity) + full_heat_capacity = A.heat_capacity() * size + + oxy_avg = (full_oxy + unsim_oxygen*share_size) / (size + share_size) + nit_avg = (full_nitro + unsim_nitrogen*share_size) / (size + share_size) + co2_avg = (full_co2 + unsim_co2*share_size) / (size + share_size) + plasma_avg = (full_plasma + unsim_plasma*share_size) / (size + share_size) + + temp_avg = 0 + + if((full_heat_capacity + unsim_heat_capacity) > 0) + temp_avg = (A.temperature * full_heat_capacity + unsim_temperature * unsim_heat_capacity) / (full_heat_capacity + unsim_heat_capacity) if(sharing_lookup_table.len >= tileslen) //6 or more interconnecting tiles will max at 42% of air moved per tick. ratio = sharing_lookup_table[tileslen] if(dbg_output) world << "Ratio: [ratio]" - //world << "Avg O2: [oxy_avg] N2: [nit_avg]" + world << "Avg O2: [oxy_avg] N2: [nit_avg]" - A.set_temperature(max(TCMB, (A.temperature - temp_avg) * (1 - ratio) + temp_avg )) + A.oxygen = max(0, (A.oxygen - oxy_avg) * (1 - ratio) + oxy_avg ) + A.nitrogen = max(0, (A.nitrogen - nit_avg) * (1 - ratio) + nit_avg ) + A.carbon_dioxide = max(0, (A.carbon_dioxide - co2_avg) * (1 - ratio) + co2_avg ) + A.toxins = max(0, (A.toxins - plasma_avg) * (1 - ratio) + plasma_avg ) - for(var/gasid in A.gases) - var/gas_moles = A.gases[gasid] - var/avg_gas = (gas_moles + unsim_mix.gases[gasid]*share_size) / (size + share_size) - A.set_gas(gasid, (gas_moles - avg_gas) * (1 - ratio) + avg_gas, 0 ) + A.temperature = max(TCMB, (A.temperature - temp_avg) * (1 - ratio) + temp_avg ) - if(dbg_output) world << "Result: [abs(old_pressure - A.pressure)] kPa" + for(var/datum/gas/G in A.trace_gases) + var/G_avg = (G.moles * size) / (size + share_size) + G.moles = (G.moles - G_avg) * (1 - ratio) + G_avg - return abs(old_pressure - A.pressure) + A.update_values() + + if(dbg_output) world << "Result: [abs(old_pressure - A.return_pressure())] kPa" + + return abs(old_pressure - A.return_pressure()) proc/ShareHeat(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles) //This implements a simplistic version of the Stefan-Boltzmann law. var/energy_delta = ((A.temperature - B.temperature) ** 4) * 5.6704e-8 * connecting_tiles * 2.5 - var/maximum_energy_delta = max(0, min(A.temperature * A.heat_capacity * A.group_multiplier, B.temperature * B.heat_capacity * B.group_multiplier)) + var/maximum_energy_delta = max(0, min(A.temperature * A.heat_capacity() * A.group_multiplier, B.temperature * B.heat_capacity() * B.group_multiplier)) if(maximum_energy_delta > abs(energy_delta)) if(energy_delta < 0) maximum_energy_delta *= -1 energy_delta = maximum_energy_delta - A.set_temperature(A.temperature - energy_delta / (A.heat_capacity * A.group_multiplier)) - B.set_temperature(B.temperature + energy_delta / (B.heat_capacity * B.group_multiplier)) \ No newline at end of file + A.temperature -= energy_delta / (A.heat_capacity() * A.group_multiplier) + B.temperature += energy_delta / (B.heat_capacity() * B.group_multiplier) \ No newline at end of file diff --git a/code/ZAS/Controller.dm b/code/ZAS/Controller.dm index e85a00773c8..5f63d445c10 100644 --- a/code/ZAS/Controller.dm +++ b/code/ZAS/Controller.dm @@ -310,15 +310,11 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun return edge /datum/controller/air_system/proc/has_same_air(turf/A, turf/B) + if(A.oxygen != B.oxygen) return 0 + if(A.nitrogen != B.nitrogen) return 0 + if(A.toxins != B.toxins) return 0 + if(A.carbon_dioxide != B.carbon_dioxide) return 0 if(A.temperature != B.temperature) return 0 - - var/datum/gas_mixture/A_mix = A.return_air() - var/datum/gas_mixture/B_mix = B.return_air() - - for(var/gasid in A_mix.gases) - if(A_mix.gases[gasid] != B_mix.gases[gasid]) - return 0 - return 1 /datum/controller/air_system/proc/remove_edge(connection/c) diff --git a/code/ZAS/Diagnostic.dm b/code/ZAS/Diagnostic.dm index 09443f7c4ae..75e4ab50ce9 100644 --- a/code/ZAS/Diagnostic.dm +++ b/code/ZAS/Diagnostic.dm @@ -18,12 +18,8 @@ client/proc/Zone_Info(turf/T as null|turf) else mob << "No zone here." var/datum/gas_mixture/mix = T.return_air() - mob << "[mix.pressure] kPa [mix.temperature]C" - var/message = "" - for(var/gasid in mix.gases) - var/datum/gas/gas = mix.get_gas_by_id(gasid) - message += "[gas.display_short]: [mix.gases[gasid]]" - mob << message + mob << "[mix.return_pressure()] kPa [mix.temperature]C" + mob << "O2: [mix.oxygen] N2: [mix.nitrogen] CO2: [mix.carbon_dioxide] TX: [mix.toxins]" else if(zone_debug_images) for(var/zone in zone_debug_images) @@ -112,8 +108,8 @@ client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf) client << "Plasma: [air.toxins]" client << "Carbon Dioxide: [air.carbon_dioxide]" client << "Temperature: [air.temperature] K" - client << "Heat Energy: [air.temperature * air.heat_capacity] J" - client << "Pressure: [air.pressure] KPa" + client << "Heat Energy: [air.temperature * air.heat_capacity()] J" + client << "Pressure: [air.return_pressure()] KPa" client << "" client << "Unsimulated Zone(space/catwalk) Tiles: [length(unsimulated_tiles)]" client << "Movable Objects: [length(movables())]" diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index b4a322c02a9..3e75e815199 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -140,8 +140,6 @@ Attach to transfer valve and open. BOOM. qdel(src) -#define FIRE_GAS_ROUNDING 0.1 //how much we round gas values to when fire updates a turf - /obj/fire/process() . = 1 @@ -158,9 +156,18 @@ Attach to transfer valve and open. BOOM. var/datum/gas_mixture/air_contents = S.return_air() + //and the volatile stuff from the air + var/datum/gas/volatile_fuel/fuel = locate() in air_contents.trace_gases + //since the air is processed in fractions, we need to make sure not to have any minuscle residue or //the amount of moles might get to low for some functions to catch them and thus result in wonky behaviour - air_contents.round_values(FIRE_GAS_ROUNDING) //the define is the level we clean to + if(air_contents.oxygen < 0.1) + air_contents.oxygen = 0 + if(air_contents.toxins < 0.1) + air_contents.toxins = 0 + if(fuel) + if(fuel.moles < 0.1) + air_contents.trace_gases.Remove(fuel) // Check if there is something to combust. if (!air_contents.check_recombustability(S)) @@ -183,14 +190,14 @@ Attach to transfer valve and open. BOOM. //im not sure how to implement a version that works for every creature so for now monkeys are firesafe for(var/mob/living/carbon/human/M in loc) - M.FireBurn(firelevel, air_contents.temperature, air_contents.pressure ) //Burn the humans! + M.FireBurn(firelevel, air_contents.temperature, air_contents.return_pressure() ) //Burn the humans! /*for(var/atom/A in loc) - A.fire_act(air_contents, air_contents.temperature, air_contents.volume) + A.fire_act(air_contents, air_contents.temperature, air_contents.return_volume()) */ // Burn the turf, too. - S.fire_act(air_contents, air_contents.temperature, air_contents.volume) + S.fire_act(air_contents, air_contents.temperature, air_contents.return_volume()) //spread for(var/direction in cardinal) @@ -249,21 +256,6 @@ turf/proc/apply_fire_protection() turf/simulated/apply_fire_protection() fire_protection = world.time -/datum/gas_mixture/proc/get_gas_fuel() - var/total_fuel = 0 - for(var/gasid in gases) - var/datum/gas/gas = get_gas_by_id(gasid) - if(gas.isFuel()) - total_fuel += gases[gasid] - return total_fuel - -/datum/gas_mixture/proc/get_gas_oxidiser() - var/total_oxidiser = 0 - for(var/gasid in gases) - var/datum/gas/gas = get_gas_by_id(gasid) - if(gas.isOxidiser()) - total_oxidiser += gases[gasid] - return total_oxidiser datum/gas_mixture/proc/zburn(var/turf/T, force_burn) // NOTE: zburn is also called from canisters and in tanks/pipes (via react()). Do NOT assume T is always a turf. @@ -271,8 +263,14 @@ datum/gas_mixture/proc/zburn(var/turf/T, force_burn) var/value = 0 if((temperature > PLASMA_MINIMUM_BURN_TEMPERATURE || force_burn) && check_recombustability(T)) - var/total_fuel = get_gas_fuel() - var/total_oxidiser = get_gas_oxidiser() + var/total_fuel = 0 + var/datum/gas/volatile_fuel/fuel = locate() in trace_gases + + total_fuel += toxins + + if(fuel) + //Volatile Fuel + total_fuel += fuel.moles var/can_use_turf=(T && istype(T)) if(can_use_turf) @@ -289,33 +287,32 @@ datum/gas_mixture/proc/zburn(var/turf/T, force_burn) //get the current inner energy of the gas mix //this must be taken here to prevent the addition or deletion of energy by a changing heat capacity - var/starting_energy = temperature * heat_capacity + var/starting_energy = temperature * heat_capacity() //determine the amount of oxygen used - total_oxidiser = min(total_oxidiser, 2 * total_fuel) + var/total_oxygen = min(oxygen, 2 * total_fuel) //determine the amount of fuel actually used - var/used_fuel_ratio = min(total_oxidiser / 2 , total_fuel) / total_fuel + var/used_fuel_ratio = min(oxygen / 2 , total_fuel) / total_fuel total_fuel = total_fuel * used_fuel_ratio - var/total_reactants = total_fuel + total_oxidiser + var/total_reactants = total_fuel + total_oxygen //determine the amount of reactants actually reacting var/used_reactants_ratio = Clamp(total_reactants * firelevel / zas_settings.Get(/datum/ZAS_Setting/fire_firelevel_multiplier), 0.2, total_reactants) / total_reactants //remove and add gasses as calculated - for(var/gasid in gases) - var/datum/gas/current_gas = get_gas_by_id(gasid) - if(current_gas.isOxidiser()) - adjust_gas(current_gas.gas_id, -gases[gasid] * used_reactants_ratio * current_gas.fuel_multiplier, 0) //take the cost of oxidiser + oxygen -= min(oxygen, total_oxygen * used_reactants_ratio ) - //fuels - for(var/gasid in gases) - var/datum/gas/current_gas = get_gas_by_id(gasid) - if(current_gas.isFuel()) - adjust_gas(current_gas.gas_id, -gases[gasid] * used_fuel_ratio * used_reactants_ratio * current_gas.fuel_multiplier, 0) //take the cost of fuel + toxins -= min(toxins, (toxins * used_fuel_ratio * used_reactants_ratio ) * 3) + if(toxins < 0) + toxins = 0 - adjust_gas(CARBON_DIOXIDE, max(2 * total_fuel, 0), 0) + carbon_dioxide += max(2 * total_fuel, 0) + + if(fuel) + fuel.moles -= (fuel.moles * used_fuel_ratio * used_reactants_ratio) * 5 //Fuel burns 5 times as quick + if(fuel.moles <= 0) del fuel if(can_use_turf) if(T.getFireFuel()>0) @@ -325,19 +322,21 @@ datum/gas_mixture/proc/zburn(var/turf/T, force_burn) A.burnFireFuel(used_fuel_ratio, used_reactants_ratio) //calculate the energy produced by the reaction and then set the new temperature of the mix - set_temperature((starting_energy + zas_settings.Get(/datum/ZAS_Setting/fire_fuel_energy_release) * total_fuel) / heat_capacity) + temperature = (starting_energy + zas_settings.Get(/datum/ZAS_Setting/fire_fuel_energy_release) * total_fuel) / heat_capacity() + update_values() value = total_reactants * used_reactants_ratio return value /datum/gas_mixture/proc/check_recombustability(var/turf/T) //this is a copy proc to continue a fire after its been started. - var/total_fuel = get_gas_fuel() - var/total_oxidiser = get_gas_oxidiser() + var/datum/gas/volatile_fuel/fuel = locate() in trace_gases - if(total_oxidiser && total_fuel) //have some fuel to burn - if(QUANTIZE(total_fuel * zas_settings.Get(/datum/ZAS_Setting/fire_consumption_rate)) >= BASE_ZAS_FUEL_REQ) + if(oxygen && (toxins || fuel)) + if(QUANTIZE(toxins * zas_settings.Get(/datum/ZAS_Setting/fire_consumption_rate)) >= BASE_ZAS_FUEL_REQ) + return 1 + if(fuel && QUANTIZE(fuel.moles * zas_settings.Get(/datum/ZAS_Setting/fire_consumption_rate)) >= BASE_ZAS_FUEL_REQ) return 1 // Check if we're actually in a turf or not before trying to check object fires. @@ -353,7 +352,7 @@ datum/gas_mixture/proc/zburn(var/turf/T, force_burn) var/still_burning=0 for(var/atom/A in T) if(!A) continue - if(!total_oxidiser/* || A.autoignition_temperature > temperature*/) + if(!oxygen/* || A.autoignition_temperature > temperature*/) A.extinguish() continue // if(!A.autoignition_temperature) @@ -374,16 +373,18 @@ datum/gas_mixture/proc/check_combustability(var/turf/T, var/objects) warning("check_combustability being asked to check a [T.type] instead of /turf.") return 0 */ - var/total_fuel = get_gas_fuel() - var/total_oxidiser = get_gas_oxidiser() - if(total_oxidiser && total_fuel) - if(QUANTIZE(total_fuel * zas_settings.Get(/datum/ZAS_Setting/fire_consumption_rate)) >= BASE_ZAS_FUEL_REQ) + var/datum/gas/volatile_fuel/fuel = locate() in trace_gases + + if(oxygen && (toxins || fuel)) + if(QUANTIZE(toxins * zas_settings.Get(/datum/ZAS_Setting/fire_consumption_rate)) >= BASE_ZAS_FUEL_REQ) + return 1 + if(fuel && QUANTIZE(fuel.moles * zas_settings.Get(/datum/ZAS_Setting/fire_consumption_rate)) >= BASE_ZAS_FUEL_REQ) return 1 if(objects && istype(T)) for(var/atom/A in T) - if(!A || !total_oxidiser || A.autoignition_temperature > temperature) continue + if(!A || !oxygen || A.autoignition_temperature > temperature) continue if(QUANTIZE(A.getFireFuel() * zas_settings.Get(/datum/ZAS_Setting/fire_consumption_rate)) >= A.volatility) return 1 @@ -391,23 +392,33 @@ datum/gas_mixture/proc/check_combustability(var/turf/T, var/objects) datum/gas_mixture/proc/calculate_firelevel(var/turf/T) //Calculates the firelevel based on one equation instead of having to do this multiple times in different areas. + + var/datum/gas/volatile_fuel/fuel = locate() in trace_gases var/total_fuel = 0 var/firelevel = 0 - var/total_oxidiser = 0 if(check_recombustability(T)) - total_fuel += get_gas_fuel() - total_oxidiser += get_gas_oxidiser() + total_fuel += toxins - var/total_combustables = (total_fuel + total_oxidiser) + if(T && istype(T)) + total_fuel += T.getFireFuel() - if(total_fuel > 0 && total_oxidiser > 0) + for(var/atom/A in T) + if(A) + total_fuel += A.getFireFuel() + + if(fuel) + total_fuel += fuel.moles + + var/total_combustables = (total_fuel + oxygen) + + if(total_fuel > 0 && oxygen > 0) //slows down the burning when the concentration of the reactants is low - var/dampening_multiplier = total_combustables / (total_moles) + var/dampening_multiplier = total_combustables / (total_combustables + nitrogen + carbon_dioxide) //calculates how close the mixture of the reactants is to the optimum - var/mix_multiplier = 1 / (1 + (5 * ((total_oxidiser / total_combustables) ** 2))) // Thanks, Mloc + var/mix_multiplier = 1 / (1 + (5 * ((oxygen / total_combustables) ** 2))) // Thanks, Mloc //toss everything together firelevel = zas_settings.Get(/datum/ZAS_Setting/fire_firelevel_multiplier) * mix_multiplier * dampening_multiplier diff --git a/code/ZAS/Plasma.dm b/code/ZAS/Plasma.dm index c6d5967bef4..dc1dc8d75bc 100644 --- a/code/ZAS/Plasma.dm +++ b/code/ZAS/Plasma.dm @@ -53,7 +53,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') if(stat >= 2) return - if(species.breath_type != PLASMA) + if(species.breath_type != "plasma") //Burn skin if exposed. if(zas_settings.Get(/datum/ZAS_Setting/SKIN_BURNS)) @@ -124,6 +124,6 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') if(istype(I) && zas_settings.Get(/datum/ZAS_Setting/CLOTH_CONTAMINATION)) var/datum/gas_mixture/environment = return_air() - if(environment.gases[PLASMA] > MOLES_PLASMA_VISIBLE + 1) + if(environment.toxins > MOLES_PLASMA_VISIBLE + 1) if(I.can_contaminate()) I.contaminate() diff --git a/code/ZAS/Turf.dm b/code/ZAS/Turf.dm index 4d22fba7e16..30320f71794 100644 --- a/code/ZAS/Turf.dm +++ b/code/ZAS/Turf.dm @@ -204,21 +204,41 @@ /turf/return_air() //Create gas mixture to hold data for passing - if(!air) - make_air() + var/datum/gas_mixture/GM = new - air.set_temperature(temperature) + GM.oxygen = oxygen + GM.carbon_dioxide = carbon_dioxide + GM.nitrogen = nitrogen + GM.toxins = toxins - return air + GM.temperature = temperature + GM.update_values() + + return GM /turf/remove_air(amount as num) - var/datum/gas_mixture/my_air = return_air() - return my_air.remove(amount) + var/datum/gas_mixture/GM = new + + var/sum = oxygen + carbon_dioxide + nitrogen + toxins + if(sum>0) + GM.oxygen = (oxygen/sum)*amount + GM.carbon_dioxide = (carbon_dioxide/sum)*amount + GM.nitrogen = (nitrogen/sum)*amount + GM.toxins = (toxins/sum)*amount + + GM.temperature = temperature + GM.update_values() + + return GM /turf/simulated/assume_air(datum/gas_mixture/giver) var/datum/gas_mixture/my_air = return_air() my_air.merge(giver) +/turf/simulated/remove_air(amount as num) + var/datum/gas_mixture/my_air = return_air() + return my_air.remove(amount) + /turf/simulated/return_air() if(zone) if(!zone.invalid) @@ -236,11 +256,10 @@ /turf/proc/make_air() air = new/datum/gas_mixture - air.set_temperature(temperature) + air.temperature = temperature + air.adjust(oxygen, carbon_dioxide, nitrogen, toxins) air.group_multiplier = 1 - air.set_volume(CELL_VOLUME) - if(starting_gases) - air.adjust(starting_gases) + air.volume = CELL_VOLUME /turf/simulated/proc/c_copy_air() if(!air) air = new/datum/gas_mixture diff --git a/code/ZAS/Zone.dm b/code/ZAS/Zone.dm index fcbaf396f1a..eb23fe7d1e5 100644 --- a/code/ZAS/Zone.dm +++ b/code/ZAS/Zone.dm @@ -50,9 +50,9 @@ Class Procs: /zone/New() air_master.add_zone(src) - air.set_temperature(TCMB) + air.temperature = TCMB air.group_multiplier = 1 - air.set_volume(CELL_VOLUME) + air.volume = CELL_VOLUME /zone/proc/add(turf/simulated/T) #ifdef ZASDBG @@ -128,13 +128,9 @@ Class Procs: /zone/proc/dbg_data(mob/M) M << name - var/gas_message = "" - for(var/gasid in air.gases) - var/datum/gas/gas = air.get_gas_by_id(gasid) - gas_message += "[gas.display_short]: [air.gases[gasid]]" - M << gas_message - M << "P: [air.pressure] kPa V: [air.volume]L T: [air.temperature]°K ([air.temperature - T0C]°C)" - M << "O2 per N2: [(air.gases[NITROGEN] ? air.gases[OXYGEN]/air.gases[NITROGEN] : "N/A")] Moles: [air.total_moles]" + M << "O2: [air.oxygen] N2: [air.nitrogen] CO2: [air.carbon_dioxide] P: [air.toxins]" + M << "P: [air.return_pressure()] kPa V: [air.volume]L T: [air.temperature]°K ([air.temperature - T0C]°C)" + M << "O2 per N2: [(air.nitrogen ? air.oxygen/air.nitrogen : "N/A")] Moles: [air.total_moles]" M << "Simulated: [contents.len] ([air.group_multiplier])" //M << "Unsimulated: [unsimulated_contents.len]" //M << "Edges: [edges.len]" @@ -147,7 +143,7 @@ Class Procs: else space_edges++ space_coefficient += E.coefficient - M << "[E:air:pressure]kPa" + M << "[E:air:return_pressure()]kPa" M << "Zone Edges: [zone_edges]" M << "Space Edges: [space_edges] ([space_coefficient] connections)" diff --git a/code/ZAS/_gas_datum.dm b/code/ZAS/_gas_datum.dm deleted file mode 100644 index 0bef446f2db..00000000000 --- a/code/ZAS/_gas_datum.dm +++ /dev/null @@ -1,73 +0,0 @@ -var/global/list/gas_datum_list -var/global/list/gas_specific_heat - -/datum/gas - var/display_name = "" - var/display_short = "" - - var/gas_id = "" //all ids must be unique - - var/specific_heat = 0 - - var/gas_flags = 0 - var/fuel_multiplier = 1 //multiplier of rate of burning - -/datum/gas/proc/isFuel() - return gas_flags & IS_FUEL - -/datum/gas/proc/isOxidiser() - return gas_flags & IS_OXIDISER - -/datum/gas/oxygen - display_name = "Oxygen" - display_short = "O2" - gas_id = OXYGEN - specific_heat = SPECIFIC_HEAT_AIR - gas_flags = IS_OXIDISER | ALWAYS_SHOW - -/datum/gas/nitrogen - display_name = "Nitrogen" - display_short = "N2" - gas_id = NITROGEN - specific_heat = SPECIFIC_HEAT_AIR - gas_flags = ALWAYS_SHOW - -/datum/gas/plasma - display_name = "Plasma" - display_short = "PL" - gas_id = PLASMA - specific_heat = SPECIFIC_HEAT_PLASMA - gas_flags = IS_FUEL | AUTO_FILTERED | AUTO_LOGGING | ALWAYS_SHOW - fuel_multiplier = 3 - -/datum/gas/co2 - display_name = "Carbon Dioxide" - display_short = "CO2" - gas_id = CARBON_DIOXIDE - specific_heat = SPECIFIC_HEAT_CDO - gas_flags = AUTO_FILTERED | AUTO_LOGGING | ALWAYS_SHOW - -/datum/gas/n2o - display_name = "Nitrous Oxide" - display_short = "N2O" - gas_id = NITROUS_OXIDE - specific_heat = SPECIFIC_HEAT_NIO - gas_flags = AUTO_FILTERED | AUTO_LOGGING - -//ping me when someone figures out what the hell this is for -/* -/datum/gas/oxygen_agent_b - display_name = "Oxygen Agent B" - display_short = "OAB" - gas_id = "oxygen_agent_b" - specific_heat = 300 -*/ - -/datum/gas/volatile_fuel - display_name = "Volatile Fuel" - display_short = "VF" - gas_id = VOLATILE_FUEL - specific_heat = 30 - gas_flags = IS_FUEL | AUTO_LOGGING - fuel_multiplier = 5 - diff --git a/code/ZAS/_gas_mixture.dm b/code/ZAS/_gas_mixture.dm index bebaf82d3d2..9bb1daa958b 100644 --- a/code/ZAS/_gas_mixture.dm +++ b/code/ZAS/_gas_mixture.dm @@ -4,10 +4,14 @@ What are the archived variables for? This prevents race conditions that arise based on the order of tile processing. */ -#define STANDARD_GAS_ROUNDING 0.0001 +#define SPECIFIC_HEAT_TOXIN 200 +#define SPECIFIC_HEAT_AIR 20 +#define SPECIFIC_HEAT_CDO 30 +#define HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) \ + max(0, carbon_dioxide * SPECIFIC_HEAT_CDO + (oxygen + nitrogen) * SPECIFIC_HEAT_AIR + toxins * SPECIFIC_HEAT_TOXIN) #define MINIMUM_HEAT_CAPACITY 0.0003 -#define QUANTIZE(variable) (round(variable,STANDARD_GAS_ROUNDING)) +#define QUANTIZE(variable) (round(variable,0.0001)) #define TRANSFER_FRACTION 5 //What fraction (1/#) of the air difference to try and transfer // /vg/ SHIT @@ -34,7 +38,27 @@ What are the archived variables for? slmaster.mouse_opacity = 0 return 1 -/datum/gas_mixture +/datum/gas/sleeping_agent/specific_heat = 40 //These are used for the "Trace Gases" stuff, but is buggy. + +/datum/gas/oxygen_agent_b/specific_heat = 300 + +/datum/gas/volatile_fuel/specific_heat = 30 + +/datum/gas + var/moles = 0 + + var/specific_heat = 0 + + var/moles_archived = 0 + +/datum/gas_mixture/ + var/oxygen = 0 //Holds the "moles" of each of the four gases. + var/carbon_dioxide = 0 + var/nitrogen = 0 + var/toxins = 0 + + var/total_moles = 0 //Updated when a reaction occurs. + var/volume = CELL_VOLUME var/temperature = 0 //in Kelvin, use calculate_temperature() to modify @@ -43,16 +67,16 @@ What are the archived variables for? //Size of the group this gas_mixture is representing. //=1 for singletons - var/total_moles = 0 - var/graphics=0 var/pressure=0 - var/heat_capacity = MINIMUM_HEAT_CAPACITY + var/list/datum/gas/trace_gases = list() //Seemed to be a good idea that was abandoned - var/list/gases //stores all the gas numbers for this mixture - var/list/archived_gases //archiving! + var/tmp/oxygen_archived //These are variables for use with the archived data + var/tmp/carbon_dioxide_archived + var/tmp/nitrogen_archived + var/tmp/toxins_archived var/tmp/temperature_archived @@ -60,132 +84,175 @@ What are the archived variables for? var/tmp/fuel_burnt = 0 //var/datum/reagents/aerosols - +/* /datum/gas_mixture/New() - gases = list() - if(!gas_datum_list) - for(var/newgas in (typesof(/datum/gas) - /datum/gas)) - var/datum/gas/new_datum_gas = new newgas() - gas_datum_list += list(new_datum_gas.gas_id = new_datum_gas) //associates the gas with its id - gas_specific_heat += list(new_datum_gas.gas_id = new_datum_gas.specific_heat) - - for(var/gasid in gas_datum_list) //initialise the gases themselves - gases += list("[gasid]" = 0) - - archived_gases = gases.Copy() - -//gets a gas in the gas list -/datum/gas_mixture/proc/get_gas_by_id(gasid) - if(gasid in gas_datum_list) - return gas_datum_list[gasid] - else - return null - + //create_reagents(10) +*/ //FOR THE LOVE OF GOD PLEASE USE THIS PROC //Call it with negative numbers to remove gases. -/datum/gas_mixture/proc/adjust(list/datum/gas/adjusts = list()) +/datum/gas_mixture/proc/adjust(o2 = 0, co2 = 0, n2 = 0, tx = 0, list/datum/gas/traces = list()) //Purpose: Adjusting the gases within a airmix //Called by: Nothing, yet! - //Inputs: The values of the gases to adjust done as a list(id = moles) + //Inputs: The values of the gases to adjust //Outputs: null - for(var/a_gas in adjusts) - adjust_gas(a_gas, adjusts[a_gas], 0) + oxygen = max(0, oxygen + o2) + carbon_dioxide = max(0, carbon_dioxide + co2) + nitrogen = max(0, nitrogen + n2) + toxins = max(0, toxins + tx) + + //handle trace gasses + for(var/datum/gas/G in traces) + var/datum/gas/T = locate(G.type) in trace_gases + if(T) + T.moles = max(G.moles + T.moles, 0) + else if(G.moles > 0) + trace_gases |= G + update_values() return -//Takes a gas string, and the amount of moles to adjust by. -//if use_group is 0, the group_multiplier isn't considered -//supports negative values -/datum/gas_mixture/proc/adjust_gas(gasid, moles, use_group = 1) +//Takes a gas string, and the amount of moles to adjust by. Calls update_values() if update isn't 0. +/datum/gas_mixture/proc/adjust_gas(gasid, moles, update = 1) if(moles == 0) return + switch(gasid) + if("oxygen") + if (group_multiplier != 1) + oxygen += moles/group_multiplier + else + oxygen += moles + if("plasma") + if (group_multiplier != 1) + toxins += moles/group_multiplier + else + toxins += moles + if("carbon_dioxide") + if (group_multiplier != 1) + carbon_dioxide += moles/group_multiplier + else + carbon_dioxide += moles + if("nitrogen") + if (group_multiplier != 1) + nitrogen += moles/group_multiplier + else + nitrogen += moles - if(group_multiplier != 1 && use_group) - set_gas(gasid, gases[gasid] + moles/group_multiplier) - else - set_gas(gasid, gases[gasid] + moles) -//Sets the value of a gas using a gas string and a mole number -//Note: this should be the only way in which gas numbers should ever be edited -//The gas system must be airtight - never bypass this -/datum/gas_mixture/proc/set_gas(gasid, moles) - ASSERT(gasid in gases) + if(update) + update_values() - if(moles < 0) - return +/* +/datum/gas_mixture/proc/create_reagents(var/max_vol) + aerosols = new /datum/reagents(max_vol) + aerosols.my_atom = src +*/ - var/old_moles = gases[gasid] +//tg seems to like using these a lot +/datum/gas_mixture/proc/return_temperature() + return temperature - gases[gasid] = max(0, moles) - pressure += ((moles - old_moles) * R_IDEAL_GAS_EQUATION * temperature) / volume //add the maths of the new gas - heat_capacity = max(MINIMUM_HEAT_CAPACITY, heat_capacity + (moles - old_moles) * gas_specific_heat[gasid]) - total_moles += (moles - old_moles) +/datum/gas_mixture/proc/return_volume() + return max(0, volume) + /datum/gas_mixture/proc/thermal_energy() - return temperature*heat_capacity + return temperature*heat_capacity() /////////////////////////////// //PV=nRT - related procedures// /////////////////////////////// -/datum/gas_mixture/proc/set_temperature(var/new_temperature) - //Purpose: Changes the temperature of a gas_mixture +/datum/gas_mixture/proc/heat_capacity() + //Purpose: Returning the heat capacity of the gas mix //Called by: UNKNOWN - //Inputs: New temperature to set to - //Outputs: None - new_temperature = max(0, new_temperature) - - var/old_temperature = temperature - - temperature = new_temperature - - if(old_temperature) //can't divide by 0 - and we only have pressure if T > 0 - pressure *= new_temperature/old_temperature //V is unchanging, T changes by a factor, P must change by the same factor - else - pressure = (total_moles * R_IDEAL_GAS_EQUATION * temperature) / volume //recalc - -/datum/gas_mixture/proc/set_volume(var/new_volume) - //Purpose: Changes the volume of a gas_mixture - //Called by: UNKNOWN - //Inputs: New volume to set to - //Outputs: None - new_volume = max(0, new_volume) - - var/old_volume = volume - - volume = new_volume - - if(old_volume && new_volume && pressure) //can't divide by 0 NO SHIT COMIC - pressure /= new_volume/old_volume //since PV is a constant, the ratio change in V is inverse for P - else - if(volume) - pressure = (total_moles * R_IDEAL_GAS_EQUATION * temperature) / volume //recalc - -/datum/gas_mixture/proc/heat_capacity_calc(var/list/hc_gases = gases) - //Purpose: Returning the heat capacity of a gas mix - //Called by: UNKNOWN - //Inputs: List of gases (or none, so the gas list itself) + //Inputs: None //Outputs: Heat capacity - var/hc_current + var/heat_capacity = HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) - for(var/gasid in hc_gases) - hc_current += gases[gasid] * gas_specific_heat[gasid] + if(trace_gases && trace_gases.len) //sanity check because somehow the tracegases gets nulled? + for(var/datum/gas/trace_gas in trace_gases) + heat_capacity += trace_gas.moles*trace_gas.specific_heat - return max(MINIMUM_HEAT_CAPACITY, hc_current) + return max(MINIMUM_HEAT_CAPACITY,heat_capacity) -/datum/gas_mixture/proc/round_values(var/rounding_error = STANDARD_GAS_ROUNDING) - //Purpose: Trims the fat off values - //Called by: Fire code that cleans up values after processing - //Inputs: Rounding error +/datum/gas_mixture/proc/heat_capacity_archived() + //Purpose: Returning the archived heat capacity of the gas mix + //Called by: UNKNOWN + //Inputs: None + //Outputs: Archived heat capacity + + var/heat_capacity_archived = HEAT_CAPACITY_CALCULATION(oxygen_archived,carbon_dioxide_archived,nitrogen_archived,toxins_archived) + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + heat_capacity_archived += trace_gas.moles_archived*trace_gas.specific_heat + + return max(MINIMUM_HEAT_CAPACITY,heat_capacity_archived) + +/datum/gas_mixture/proc/total_moles() + return total_moles + /*var/moles = oxygen + carbon_dioxide + nitrogen + toxins + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + moles += trace_gas.moles + return moles*/ + +/datum/gas_mixture/proc/return_pressure() + //Purpose: Calculating Current Pressure + //Called by: + //Inputs: None + //Outputs: Gas pressure. + return pressure + +// proc/return_temperature() + //Purpose: + //Inputs: + //Outputs: + +// return temperature + +// proc/return_volume() + //Purpose: + //Inputs: + //Outputs: + +// return max(0, volume) + +// proc/thermal_energy() + //Purpose: + //Inputs: + //Outputs: + +// return temperature*heat_capacity() + +/datum/gas_mixture/proc/update_values() + //Purpose: Calculating and storing values which were normally called CONSTANTLY + //Called by: Anything that changes values within a gas mix. + //Inputs: None //Outputs: None - for(var/gasid in gases) - adjust_gas(gasid, - (gases[gasid] - round(gases[gasid], rounding_error))) + total_moles = oxygen + carbon_dioxide + nitrogen + toxins + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + total_moles += trace_gas.moles + +/* + if(aerosols.total_volume) + total_moles += aerosols.total_volume +*/ + + if(volume>0) + pressure = total_moles()*R_IDEAL_GAS_EQUATION*temperature/volume + else + pressure = 0 + + return //////////////////////////////////////////// //Procedures used for very specific events// @@ -201,17 +268,19 @@ What are the archived variables for? // If configured and cold, maek ice if(zas_settings.Get(/datum/ZAS_Setting/ice_formation)) - if(temperature <= TEMPERATURE_ICE_FORMATION && pressure>MIN_PRESSURE_ICE_FORMATION) + if(temperature <= TEMPERATURE_ICE_FORMATION && return_pressure()>MIN_PRESSURE_ICE_FORMATION) // If we're just forming, do a probability check. Otherwise, KEEP IT ON~ // This ordering will hopefully keep it from sampling random noise every damn tick. //if(was_icy || (!was_icy && prob(25))) graphics |= GRAPHICS_COLD - if(gases[PLASMA] > MOLES_PLASMA_VISIBLE) + if(toxins > MOLES_PLASMA_VISIBLE) graphics |= GRAPHICS_PLASMA - if(gases[NITROUS_OXIDE] > MOLES_N2O_VISIBLE) - graphics |= GRAPHICS_N2O + if(length(trace_gases)) + var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in trace_gases + if(sleeping_agent && (sleeping_agent.moles > 1)) + graphics |= GRAPHICS_N2O /* if(aerosols && aerosols.total_volume >= 1) graphics |= GRAPHICS_REAGENTS @@ -238,7 +307,7 @@ What are the archived variables for? return zburn(null) /*var/energy_released = 0 - var/old_heat_capacity = heat_capacity + var/old_heat_capacity = heat_capacity() var/datum/gas/volatile_fuel/fuel_store = locate(/datum/gas/volatile_fuel) in trace_gases if(fuel_store) //General volatile gas burn @@ -283,7 +352,7 @@ What are the archived variables for? fuel_burnt += (plasma_burn_rate)*(1+oxygen_burn_rate) if(energy_released > 0) - var/new_heat_capacity = heat_capacity + var/new_heat_capacity = heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) temperature = (temperature*old_heat_capacity + energy_released)/new_heat_capacity update_values() @@ -294,14 +363,21 @@ What are the archived variables for? //Procs for general gas spread calculations.// ////////////////////////////////////////////// + /datum/gas_mixture/proc/archive() //Purpose: Archives the current gas values //Called by: UNKNOWN //Inputs: None //Outputs: 1 - for(var/gasid in gases) - archived_gases[gasid] = gases[gasid] + oxygen_archived = oxygen + carbon_dioxide_archived = carbon_dioxide + nitrogen_archived = nitrogen + toxins_archived = toxins + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + trace_gas.moles_archived = trace_gas.moles temperature_archived = temperature @@ -318,13 +394,19 @@ What are the archived variables for? if(!giver) return 0 - + if(((giver.oxygen > MINIMUM_AIR_TO_SUSPEND) && (giver.oxygen >= oxygen*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((giver.carbon_dioxide > MINIMUM_AIR_TO_SUSPEND) && (giver.carbon_dioxide >= carbon_dioxide*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((giver.nitrogen > MINIMUM_AIR_TO_SUSPEND) && (giver.nitrogen >= nitrogen*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((giver.toxins > MINIMUM_AIR_TO_SUSPEND) && (giver.toxins >= toxins*MINIMUM_AIR_RATIO_TO_SUSPEND))) + return 0 if(abs(giver.temperature - temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) return 0 - for(var/gasid in gases) - if((giver.gases[gasid] > MINIMUM_AIR_TO_SUSPEND) && (giver.gases[gasid] >= gases[gasid]*MINIMUM_AIR_RATIO_TO_SUSPEND)) - return 0 + if(giver.trace_gases.len) + for(var/datum/gas/trace_gas in giver.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if((trace_gas.moles > MINIMUM_AIR_TO_SUSPEND) && (!corresponding || (trace_gas.moles >= corresponding.moles*MINIMUM_AIR_RATIO_TO_SUSPEND))) + return 0 return merge(giver) @@ -338,18 +420,35 @@ What are the archived variables for? return 0 if(abs(temperature-giver.temperature)>MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - var/self_heat_capacity = heat_capacity*group_multiplier - var/giver_heat_capacity = giver.heat_capacity*giver.group_multiplier + var/self_heat_capacity = heat_capacity()*group_multiplier + var/giver_heat_capacity = giver.heat_capacity()*giver.group_multiplier var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity if(combined_heat_capacity != 0) - set_temperature((giver.temperature*giver_heat_capacity + temperature*self_heat_capacity)/combined_heat_capacity) + temperature = (giver.temperature*giver_heat_capacity + temperature*self_heat_capacity)/combined_heat_capacity - if(giver.group_multiplier>1) - for(var/gasid in gases) - adjust_gas(gasid, giver.gases[gasid] * giver.group_multiplier) + if((group_multiplier>1)||(giver.group_multiplier>1)) + oxygen += giver.oxygen*giver.group_multiplier/group_multiplier + carbon_dioxide += giver.carbon_dioxide*giver.group_multiplier/group_multiplier + nitrogen += giver.nitrogen*giver.group_multiplier/group_multiplier + toxins += giver.toxins*giver.group_multiplier/group_multiplier else - for(var/gasid in gases) - adjust_gas(gasid, giver.gases[gasid]) + oxygen += giver.oxygen + carbon_dioxide += giver.carbon_dioxide + nitrogen += giver.nitrogen + toxins += giver.toxins + + if(giver.trace_gases.len) + for(var/datum/gas/trace_gas in giver.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if(!corresponding) + corresponding = new trace_gas.type() + trace_gases += corresponding + corresponding.moles += trace_gas.moles*giver.group_multiplier/group_multiplier +/* + if(giver.aerosols.total_volume > 1) + giver.aerosols.trans_to_atmos(src,aerosols.total_volume) +*/ + update_values() // Let the garbage collector handle it, faster according to /tg/ testers //del(giver) @@ -365,19 +464,39 @@ What are the archived variables for? if(group_multiplier==0) return null - var/sum = total_moles + var/sum = total_moles() amount = min(amount,sum) //Can not take more air than tile has! if(amount <= 0) - return new/datum/gas_mixture + return null var/datum/gas_mixture/removed = new - removed.set_temperature(temperature) - for(var/gasid in gases) - var/taken_gas = QUANTIZE(gases[gasid] / sum) * amount //the gas we lose - not yet subtracted - adjust_gas(gasid, -taken_gas) //don't update just yet - negative subtracts - removed.adjust_gas(gasid, taken_gas) //slap the copied gas in + removed.oxygen = QUANTIZE((oxygen/sum)*amount) + removed.nitrogen = QUANTIZE((nitrogen/sum)*amount) + removed.carbon_dioxide = QUANTIZE((carbon_dioxide/sum)*amount) + removed.toxins = QUANTIZE((toxins/sum)*amount) + + oxygen -= removed.oxygen/group_multiplier + nitrogen -= removed.nitrogen/group_multiplier + carbon_dioxide -= removed.carbon_dioxide/group_multiplier + toxins -= removed.toxins/group_multiplier + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + var/datum/gas/corresponding = new trace_gas.type() + removed.trace_gases += corresponding + + corresponding.moles = (trace_gas.moles/sum)*amount + trace_gas.moles -= corresponding.moles/group_multiplier +/* + if(aerosols.total_volume > 1) + removed.aerosols.trans_to_atmos(src,(aerosols.total_volume/sum)*amount) +*/ + + removed.temperature = temperature + update_values() + removed.update_values() return removed @@ -392,7 +511,31 @@ What are the archived variables for? ratio = min(ratio, 1) - return remove(total_moles * ratio) //use the sum removal + var/datum/gas_mixture/removed = new + + removed.oxygen = QUANTIZE(oxygen*ratio) + removed.nitrogen = QUANTIZE(nitrogen*ratio) + removed.carbon_dioxide = QUANTIZE(carbon_dioxide*ratio) + removed.toxins = QUANTIZE(toxins*ratio) + + oxygen -= removed.oxygen/group_multiplier + nitrogen -= removed.nitrogen/group_multiplier + carbon_dioxide -= removed.carbon_dioxide/group_multiplier + toxins -= removed.toxins/group_multiplier + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + var/datum/gas/corresponding = new trace_gas.type() + removed.trace_gases += corresponding + + corresponding.moles = trace_gas.moles*ratio + trace_gas.moles -= corresponding.moles/group_multiplier + + removed.temperature = temperature + update_values() + removed.update_values() + + return removed /datum/gas_mixture/proc/check_then_remove(amount) //Purpose: Similar to remove(...) but first checks to see if the amount of air removed is small enough @@ -401,9 +544,9 @@ What are the archived variables for? //Inputs: Number of moles to remove //Outputs: Removed air or 0 if it can remove air or not. - amount = Clamp(amount, 0, total_moles) //Can not take more air than tile has! + amount = min(amount,total_moles()) //Can not take more air than tile has! - if((amount > MINIMUM_AIR_RATIO_TO_SUSPEND) && (amount > total_moles*MINIMUM_AIR_RATIO_TO_SUSPEND)) + if((amount > MINIMUM_AIR_RATIO_TO_SUSPEND) && (amount > total_moles()*MINIMUM_AIR_RATIO_TO_SUSPEND)) return 0 return remove(amount) @@ -414,10 +557,21 @@ What are the archived variables for? //Inputs: Gas to copy //Outputs: 1 - set_temperature(sample.temperature) + oxygen = sample.oxygen + carbon_dioxide = sample.carbon_dioxide + nitrogen = sample.nitrogen + toxins = sample.toxins + total_moles = sample.total_moles() - for(var/gasid in sample.gases) - set_gas(gasid, sample.gases[gasid], 0) + trace_gases.len=null + if(sample.trace_gases.len > 0) + for(var/datum/gas/trace_gas in sample.trace_gases) + var/datum/gas/corresponding = new trace_gas.type() + trace_gases += corresponding + + corresponding.moles = trace_gas.moles + + temperature = sample.temperature return 1 @@ -431,38 +585,82 @@ What are the archived variables for? if(!istype(sharer)) return - if(abs(temperature_archived - sharer.temperature_archived) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) + var/delta_oxygen = QUANTIZE(oxygen_archived - sharer.oxygen_archived)/TRANSFER_FRACTION + var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - sharer.carbon_dioxide_archived)/TRANSFER_FRACTION + var/delta_nitrogen = QUANTIZE(nitrogen_archived - sharer.nitrogen_archived)/TRANSFER_FRACTION + var/delta_toxins = QUANTIZE(toxins_archived - sharer.toxins_archived)/TRANSFER_FRACTION + + var/delta_temperature = (temperature_archived - sharer.temperature_archived) + + if(((abs(delta_oxygen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_oxygen) >= oxygen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_carbon_dioxide) >= carbon_dioxide_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_nitrogen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_nitrogen) >= nitrogen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_toxins) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_toxins) >= toxins_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) return 0 - for(var/gasid in gases) - var/archived_own_gas = archived_gases[gasid] - var/archived_sharer_gas = sharer.archived_gases[gasid] - var/gas_delta = abs(QUANTIZE(archived_own_gas - archived_sharer_gas)/TRANSFER_FRACTION) //the difference in gas moles + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) + return 0 - if((gas_delta > MINIMUM_AIR_TO_SUSPEND) && (gas_delta >= archived_own_gas*MINIMUM_AIR_RATIO_TO_SUSPEND)) - return 0 + if(sharer.trace_gases.len) + for(var/datum/gas/trace_gas in sharer.trace_gases) + if(trace_gas.moles_archived > MINIMUM_AIR_TO_SUSPEND*4) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if(corresponding) + if(trace_gas.moles_archived >= corresponding.moles_archived*MINIMUM_AIR_RATIO_TO_SUSPEND*4) + return 0 + else + return 0 - if((gas_delta > MINIMUM_AIR_TO_SUSPEND) && (gas_delta >= archived_sharer_gas*MINIMUM_AIR_RATIO_TO_SUSPEND)) - return -1 + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + if(trace_gas.moles_archived > MINIMUM_AIR_TO_SUSPEND*4) + if(!locate(trace_gas.type) in sharer.trace_gases) + return 0 + + if(((abs(delta_oxygen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_oxygen) >= sharer.oxygen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_carbon_dioxide) >= sharer.carbon_dioxide_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_nitrogen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_nitrogen) >= sharer.nitrogen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_toxins) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_toxins) >= sharer.toxins_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) + return -1 + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + if(trace_gas.moles_archived > MINIMUM_AIR_TO_SUSPEND*4) + var/datum/gas/corresponding = locate(trace_gas.type) in sharer.trace_gases + if(corresponding) + if(trace_gas.moles_archived >= corresponding.moles_archived*MINIMUM_AIR_RATIO_TO_SUSPEND*4) + return -1 + else + return -1 return 1 -/datum/gas_mixture/proc/check_turf(turf/model_turf) +/datum/gas_mixture/proc/check_turf(turf/model) //Purpose: Used to compare the gases in an unsimulated turf with the gas in a simulated one. //Called by: Sharing air (mimicing) with adjacent unsimulated turfs //Inputs: Unsimulated turf //Outputs: 1 if safe to mimic, 0 if needs to break airgroup. - var/datum/gas_mixture/model = model_turf.return_air() + var/delta_oxygen = (oxygen_archived - model.oxygen)/TRANSFER_FRACTION + var/delta_carbon_dioxide = (carbon_dioxide_archived - model.carbon_dioxide)/TRANSFER_FRACTION + var/delta_nitrogen = (nitrogen_archived - model.nitrogen)/TRANSFER_FRACTION + var/delta_toxins = (toxins_archived - model.toxins)/TRANSFER_FRACTION - if(abs(temperature_archived - model.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) + var/delta_temperature = (temperature_archived - model.temperature) + + if(((abs(delta_oxygen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_oxygen) >= oxygen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_carbon_dioxide) >= carbon_dioxide_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_nitrogen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_nitrogen) >= nitrogen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_toxins) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_toxins) >= toxins_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) + return 0 + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) return 0 - for(var/gasid in gases) - var/archived_gas = archived_gases[gasid] - var/gas_delta = abs((archived_gas - model.gases[gasid])/TRANSFER_FRACTION) - if((gas_delta > MINIMUM_AIR_TO_SUSPEND) && (gas_delta >= archived_gas*MINIMUM_AIR_RATIO_TO_SUSPEND)) - return 0 + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + if(trace_gas.moles_archived > MINIMUM_AIR_TO_SUSPEND*4) + return 0 + return 1 /datum/gas_mixture/proc/share(datum/gas_mixture/sharer) @@ -476,6 +674,11 @@ What are the archived variables for? if(!istype(sharer)) return + var/delta_oxygen = QUANTIZE(oxygen_archived - sharer.oxygen_archived)/TRANSFER_FRACTION + var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - sharer.carbon_dioxide_archived)/TRANSFER_FRACTION + var/delta_nitrogen = QUANTIZE(nitrogen_archived - sharer.nitrogen_archived)/TRANSFER_FRACTION + var/delta_toxins = QUANTIZE(toxins_archived - sharer.toxins_archived)/TRANSFER_FRACTION + var/delta_temperature = (temperature_archived - sharer.temperature_archived) var/old_self_heat_capacity = 0 @@ -486,58 +689,141 @@ What are the archived variables for? var/heat_sharer_to_self = 0 var/heat_capacity_sharer_to_self = 0 - var/moved_moles = 0 - - for(var/gasid in gases) - var/gas_delta = QUANTIZE(archived_gases[gasid] - sharer.archived_gases[gasid])/TRANSFER_FRACTION - if(gas_delta && abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) //difference in gases and temperature - var/datum/gas/current_gas = get_gas_by_id(gasid) - var/gas_heat_capacity = current_gas.specific_heat - if(gas_delta > 0) - heat_self_to_sharer += gas_heat_capacity * temperature_archived - heat_capacity_self_to_sharer += gas_heat_capacity - else - heat_sharer_to_self -= gas_heat_capacity * temperature_archived - heat_capacity_sharer_to_self -= gas_heat_capacity - - adjust_gas(gasid, -gas_delta) //delay update - adjust_gas handles the group multiplier - sharer.adjust_gas(gasid, gas_delta) - - moved_moles += gas_delta - if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - old_self_heat_capacity = heat_capacity*group_multiplier - old_sharer_heat_capacity = sharer.heat_capacity*sharer.group_multiplier + var/delta_air = delta_oxygen+delta_nitrogen + if(delta_air) + var/air_heat_capacity = SPECIFIC_HEAT_AIR*delta_air + if(delta_air > 0) + heat_self_to_sharer += air_heat_capacity*temperature_archived + heat_capacity_self_to_sharer += air_heat_capacity + else + heat_sharer_to_self -= air_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self -= air_heat_capacity + + if(delta_carbon_dioxide) + var/carbon_dioxide_heat_capacity = SPECIFIC_HEAT_CDO*delta_carbon_dioxide + if(delta_carbon_dioxide > 0) + heat_self_to_sharer += carbon_dioxide_heat_capacity*temperature_archived + heat_capacity_self_to_sharer += carbon_dioxide_heat_capacity + else + heat_sharer_to_self -= carbon_dioxide_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self -= carbon_dioxide_heat_capacity + + if(delta_toxins) + var/toxins_heat_capacity = SPECIFIC_HEAT_TOXIN*delta_toxins + if(delta_toxins > 0) + heat_self_to_sharer += toxins_heat_capacity*temperature_archived + heat_capacity_self_to_sharer += toxins_heat_capacity + else + heat_sharer_to_self -= toxins_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self -= toxins_heat_capacity + + old_self_heat_capacity = heat_capacity()*group_multiplier + old_sharer_heat_capacity = sharer.heat_capacity()*sharer.group_multiplier + + oxygen -= delta_oxygen/group_multiplier + sharer.oxygen += delta_oxygen/sharer.group_multiplier + + carbon_dioxide -= delta_carbon_dioxide/group_multiplier + sharer.carbon_dioxide += delta_carbon_dioxide/sharer.group_multiplier + + nitrogen -= delta_nitrogen/group_multiplier + sharer.nitrogen += delta_nitrogen/sharer.group_multiplier + + toxins -= delta_toxins/group_multiplier + sharer.toxins += delta_toxins/sharer.group_multiplier + + var/moved_moles = (delta_oxygen + delta_carbon_dioxide + delta_nitrogen + delta_toxins) + + var/list/trace_types_considered = list() + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + + var/datum/gas/corresponding = locate(trace_gas.type) in sharer.trace_gases + var/delta = 0 + + if(corresponding) + delta = QUANTIZE(trace_gas.moles_archived - corresponding.moles_archived)/TRANSFER_FRACTION + else + corresponding = new trace_gas.type() + sharer.trace_gases += corresponding + + delta = trace_gas.moles_archived/TRANSFER_FRACTION + + trace_gas.moles -= delta/group_multiplier + corresponding.moles += delta/sharer.group_multiplier + + if(delta) + var/individual_heat_capacity = trace_gas.specific_heat*delta + if(delta > 0) + heat_self_to_sharer += individual_heat_capacity*temperature_archived + heat_capacity_self_to_sharer += individual_heat_capacity + else + heat_sharer_to_self -= individual_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self -= individual_heat_capacity + + moved_moles += delta + + trace_types_considered += trace_gas.type + + + if(sharer.trace_gases.len) + for(var/datum/gas/trace_gas in sharer.trace_gases) + if(trace_gas.type in trace_types_considered) continue + else + var/datum/gas/corresponding + var/delta = 0 + + corresponding = new trace_gas.type() + trace_gases += corresponding + + delta = trace_gas.moles_archived/TRANSFER_FRACTION + + trace_gas.moles -= delta/sharer.group_multiplier + corresponding.moles += delta/group_multiplier + + //Guaranteed transfer from sharer to self + var/individual_heat_capacity = trace_gas.specific_heat*delta + heat_sharer_to_self += individual_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self += individual_heat_capacity + + moved_moles += -delta + update_values() + sharer.update_values() if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) var/new_self_heat_capacity = old_self_heat_capacity + heat_capacity_sharer_to_self - heat_capacity_self_to_sharer var/new_sharer_heat_capacity = old_sharer_heat_capacity + heat_capacity_self_to_sharer - heat_capacity_sharer_to_self if(new_self_heat_capacity > MINIMUM_HEAT_CAPACITY) - set_temperature((old_self_heat_capacity*temperature - heat_capacity_self_to_sharer*temperature_archived + heat_capacity_sharer_to_self*sharer.temperature_archived)/new_self_heat_capacity) + temperature = (old_self_heat_capacity*temperature - heat_capacity_self_to_sharer*temperature_archived + heat_capacity_sharer_to_self*sharer.temperature_archived)/new_self_heat_capacity if(new_sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) - sharer.set_temperature((old_sharer_heat_capacity*sharer.temperature-heat_capacity_sharer_to_self*sharer.temperature_archived + heat_capacity_self_to_sharer*temperature_archived)/new_sharer_heat_capacity) + sharer.temperature = (old_sharer_heat_capacity*sharer.temperature-heat_capacity_sharer_to_self*sharer.temperature_archived + heat_capacity_self_to_sharer*temperature_archived)/new_sharer_heat_capacity if(abs(old_sharer_heat_capacity) > MINIMUM_HEAT_CAPACITY) if(abs(new_sharer_heat_capacity/old_sharer_heat_capacity - 1) < 0.10) // <10% change in sharer heat capacity temperature_share(sharer, OPEN_HEAT_TRANSFER_COEFFICIENT) if((delta_temperature > MINIMUM_TEMPERATURE_TO_MOVE) || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE) - var/delta_pressure = temperature_archived*(total_moles + moved_moles) - sharer.temperature_archived*(sharer.total_moles - moved_moles) + var/delta_pressure = temperature_archived*(total_moles() + moved_moles) - sharer.temperature_archived*(sharer.total_moles() - moved_moles) return delta_pressure*R_IDEAL_GAS_EQUATION/volume else return 0 -/datum/gas_mixture/proc/mimic(turf/model_turf, border_multiplier) +/datum/gas_mixture/proc/mimic(turf/model, border_multiplier) //Purpose: Used transfer gas from a more pressurised tile to a less presurised unsimulated tile. //Called by: "sharing" from unsimulated to simulated turfs. //Inputs: Unsimulated turf, Multiplier for gas transfer (optional) //Outputs: Amount of gas exchanged - var/datum/gas_mixture/model = model_turf.return_air() + var/delta_oxygen = QUANTIZE(oxygen_archived - model.oxygen)/TRANSFER_FRACTION + var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - model.carbon_dioxide)/TRANSFER_FRACTION + var/delta_nitrogen = QUANTIZE(nitrogen_archived - model.nitrogen)/TRANSFER_FRACTION + var/delta_toxins = QUANTIZE(toxins_archived - model.toxins)/TRANSFER_FRACTION var/delta_temperature = (temperature_archived - model.temperature) @@ -545,39 +831,68 @@ What are the archived variables for? var/old_self_heat_capacity = 0 var/heat_capacity_transferred = 0 - var/moved_moles - - for(var/gasid in gases) - var/gas_delta = QUANTIZE(archived_gases[gasid] - model.gases[gasid])/TRANSFER_FRACTION - - if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - var/gas_heat_capacity = gas_specific_heat[gasid] - heat_transferred -= gas_heat_capacity * model.temperature - heat_capacity_transferred -= gas_heat_capacity - - if(border_multiplier) - adjust_gas(gasid, -gas_delta*border_multiplier) - else - adjust_gas(gasid, -gas_delta) - - moved_moles += gas_delta - - if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - old_self_heat_capacity = heat_capacity*group_multiplier + + var/delta_air = delta_oxygen+delta_nitrogen + if(delta_air) + var/air_heat_capacity = SPECIFIC_HEAT_AIR*delta_air + heat_transferred -= air_heat_capacity*model.temperature + heat_capacity_transferred -= air_heat_capacity + + if(delta_carbon_dioxide) + var/carbon_dioxide_heat_capacity = SPECIFIC_HEAT_CDO*delta_carbon_dioxide + heat_transferred -= carbon_dioxide_heat_capacity*model.temperature + heat_capacity_transferred -= carbon_dioxide_heat_capacity + + if(delta_toxins) + var/toxins_heat_capacity = SPECIFIC_HEAT_TOXIN*delta_toxins + heat_transferred -= toxins_heat_capacity*model.temperature + heat_capacity_transferred -= toxins_heat_capacity + + old_self_heat_capacity = heat_capacity()*group_multiplier + + if(border_multiplier) + oxygen -= delta_oxygen*border_multiplier/group_multiplier + carbon_dioxide -= delta_carbon_dioxide*border_multiplier/group_multiplier + nitrogen -= delta_nitrogen*border_multiplier/group_multiplier + toxins -= delta_toxins*border_multiplier/group_multiplier + else + oxygen -= delta_oxygen/group_multiplier + carbon_dioxide -= delta_carbon_dioxide/group_multiplier + nitrogen -= delta_nitrogen/group_multiplier + toxins -= delta_toxins/group_multiplier + + var/moved_moles = (delta_oxygen + delta_carbon_dioxide + delta_nitrogen + delta_toxins) + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + var/delta = 0 + + delta = trace_gas.moles_archived/TRANSFER_FRACTION + + if(border_multiplier) + trace_gas.moles -= delta*border_multiplier/group_multiplier + else + trace_gas.moles -= delta/group_multiplier + + var/heat_cap_transferred = delta*trace_gas.specific_heat + heat_transferred += heat_cap_transferred*temperature_archived + heat_capacity_transferred += heat_cap_transferred + moved_moles += delta + update_values() if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) var/new_self_heat_capacity = old_self_heat_capacity - heat_capacity_transferred if(new_self_heat_capacity > MINIMUM_HEAT_CAPACITY) if(border_multiplier) - set_temperature((old_self_heat_capacity*temperature - heat_capacity_transferred*border_multiplier*temperature_archived)/new_self_heat_capacity) + temperature = (old_self_heat_capacity*temperature - heat_capacity_transferred*border_multiplier*temperature_archived)/new_self_heat_capacity else - set_temperature((old_self_heat_capacity*temperature - heat_capacity_transferred*border_multiplier*temperature_archived)/new_self_heat_capacity) + temperature = (old_self_heat_capacity*temperature - heat_capacity_transferred*border_multiplier*temperature_archived)/new_self_heat_capacity - temperature_mimic(model, model_turf.thermal_conductivity, border_multiplier) + temperature_mimic(model, model.thermal_conductivity, border_multiplier) if((delta_temperature > MINIMUM_TEMPERATURE_TO_MOVE) || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE) - var/delta_pressure = temperature_archived*(total_moles + moved_moles) - model.temperature*(model.total_moles) + var/delta_pressure = temperature_archived*(total_moles() + moved_moles) - model.temperature*(model.oxygen+model.carbon_dioxide+model.nitrogen+model.toxins) return delta_pressure*R_IDEAL_GAS_EQUATION/volume else return 0 @@ -585,8 +900,8 @@ What are the archived variables for? /datum/gas_mixture/proc/check_both_then_temperature_share(datum/gas_mixture/sharer, conduction_coefficient) var/delta_temperature = (temperature_archived - sharer.temperature_archived) - var/self_heat_capacity = heat_capacity_calc(archived_gases) - var/sharer_heat_capacity = sharer.heat_capacity_calc(archived_gases) + var/self_heat_capacity = heat_capacity_archived() + var/sharer_heat_capacity = sharer.heat_capacity_archived() var/self_temperature_delta = 0 var/sharer_temperature_delta = 0 @@ -608,8 +923,8 @@ What are the archived variables for? && (abs(sharer_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*sharer.temperature_archived)) return -1 - set_temperature(temperature + self_temperature_delta) - sharer.set_temperature(sharer.temperature + sharer_temperature_delta) + temperature += self_temperature_delta + sharer.temperature += sharer_temperature_delta return 1 //Logic integrated from: temperature_share(sharer, conduction_coefficient) for efficiency @@ -617,8 +932,8 @@ What are the archived variables for? /datum/gas_mixture/proc/check_me_then_temperature_share(datum/gas_mixture/sharer, conduction_coefficient) var/delta_temperature = (temperature_archived - sharer.temperature_archived) - var/self_heat_capacity = heat_capacity_calc(archived_gases) - var/sharer_heat_capacity = sharer.heat_capacity_calc(archived_gases) + var/self_heat_capacity = heat_capacity_archived() + var/sharer_heat_capacity = sharer.heat_capacity_archived() var/self_temperature_delta = 0 var/sharer_temperature_delta = 0 @@ -636,8 +951,8 @@ What are the archived variables for? && (abs(self_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*temperature_archived)) return 0 - set_temperature(temperature + self_temperature_delta) - sharer.set_temperature(sharer.temperature + sharer_temperature_delta) + temperature += self_temperature_delta + sharer.temperature += sharer_temperature_delta return 1 //Logic integrated from: temperature_share(sharer, conduction_coefficient) for efficiency @@ -649,7 +964,7 @@ What are the archived variables for? var/sharer_temperature_delta = 0 if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - var/self_heat_capacity = heat_capacity_calc(archived_gases) + var/self_heat_capacity = heat_capacity_archived() if((sharer.heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) var/heat = conduction_coefficient*delta_temperature* \ @@ -664,7 +979,7 @@ What are the archived variables for? && (abs(self_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*temperature_archived)) return 0 - set_temperature(temperature + self_temperature_delta) + temperature += self_temperature_delta sharer.temperature += sharer_temperature_delta return 1 @@ -675,7 +990,7 @@ What are the archived variables for? var/self_temperature_delta = 0 if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - var/self_heat_capacity = heat_capacity_calc(archived_gases) + var/self_heat_capacity = heat_capacity_archived() if((model.heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) var/heat = conduction_coefficient*delta_temperature* \ @@ -687,7 +1002,7 @@ What are the archived variables for? && (abs(self_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*temperature_archived)) return 0 - set_temperature(temperature + self_temperature_delta) + temperature += self_temperature_delta return 1 //Logic integrated from: temperature_mimic(model, conduction_coefficient) for efficiency @@ -695,8 +1010,8 @@ What are the archived variables for? /datum/gas_mixture/proc/temperature_share(datum/gas_mixture/sharer, conduction_coefficient) var/delta_temperature = (temperature_archived - sharer.temperature_archived) if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - var/self_heat_capacity = heat_capacity_calc(archived_gases) - var/sharer_heat_capacity = sharer.heat_capacity_calc(archived_gases) + var/self_heat_capacity = heat_capacity_archived() + var/sharer_heat_capacity = sharer.heat_capacity_archived() if(!group_multiplier) message_admins("Error! The gas mixture (ref \ref[src]) has no group multiplier!") return @@ -705,13 +1020,13 @@ What are the archived variables for? var/heat = conduction_coefficient*delta_temperature* \ (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity)) - set_temperature(temperature - heat/(self_heat_capacity*group_multiplier)) - sharer.set_temperature( sharer.temperature + heat/(sharer_heat_capacity*sharer.group_multiplier)) + temperature -= heat/(self_heat_capacity*group_multiplier) + sharer.temperature += heat/(sharer_heat_capacity*sharer.group_multiplier) /datum/gas_mixture/proc/temperature_mimic(turf/model, conduction_coefficient, border_multiplier) var/delta_temperature = (temperature - model.temperature) if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - var/self_heat_capacity = heat_capacity//_archived() + var/self_heat_capacity = heat_capacity()//_archived() if(!group_multiplier) message_admins("Error! The gas mixture (ref \ref[src]) has no group multiplier!") return @@ -721,19 +1036,20 @@ What are the archived variables for? (self_heat_capacity*model.heat_capacity/(self_heat_capacity+model.heat_capacity)) if(border_multiplier) - set_temperature(temperature - heat*border_multiplier/(self_heat_capacity*group_multiplier)) + temperature -= heat*border_multiplier/(self_heat_capacity*group_multiplier) else - set_temperature(temperature - heat/(self_heat_capacity*group_multiplier)) + temperature -= heat/(self_heat_capacity*group_multiplier) /datum/gas_mixture/proc/temperature_turf_share(turf/simulated/sharer, conduction_coefficient) var/delta_temperature = (temperature_archived - sharer.temperature) if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) - var/self_heat_capacity = heat_capacity + var/self_heat_capacity = heat_capacity() if((sharer.heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) - var/heat = conduction_coefficient*delta_temperature * (self_heat_capacity*sharer.heat_capacity/(self_heat_capacity+sharer.heat_capacity)) + var/heat = conduction_coefficient*delta_temperature* \ + (self_heat_capacity*sharer.heat_capacity/(self_heat_capacity+sharer.heat_capacity)) - set_temperature(temperature - heat/(self_heat_capacity*group_multiplier)) + temperature -= heat/(self_heat_capacity*group_multiplier) sharer.temperature += heat/sharer.heat_capacity /datum/gas_mixture/proc/compare(datum/gas_mixture/sample) @@ -743,27 +1059,68 @@ What are the archived variables for? //Outputs: 1 if can rebuild, 0 if not. if(!sample) return 0 - for(var/gasid in gases) - var/current_gas = gases[gasid] - var/sample_gas = sample.gases[gasid] - if((abs(current_gas - sample_gas) > MINIMUM_AIR_TO_SUSPEND) && \ - ((current_gas < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample_gas) || (current_gas > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample_gas))) - return 0 + if((abs(oxygen-sample.oxygen) > MINIMUM_AIR_TO_SUSPEND) && \ + ((oxygen < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.oxygen) || (oxygen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.oxygen))) + return 0 + if((abs(nitrogen-sample.nitrogen) > MINIMUM_AIR_TO_SUSPEND) && \ + ((nitrogen < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.nitrogen) || (nitrogen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.nitrogen))) + return 0 + if((abs(carbon_dioxide-sample.carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && \ + ((carbon_dioxide < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide) || (carbon_dioxide > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide))) + return 0 + if((abs(toxins-sample.toxins) > MINIMUM_AIR_TO_SUSPEND) && \ + ((toxins < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins) || (toxins > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins))) + return 0 - if(total_moles > MINIMUM_AIR_TO_SUSPEND) + if(total_moles() > MINIMUM_AIR_TO_SUSPEND) if((abs(temperature-sample.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) && \ ((temperature < (1-MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND)*sample.temperature) || (temperature > (1+MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND)*sample.temperature))) //world << "temp fail [temperature] & [sample.temperature]" return 0 + var/check_moles + if(sample.trace_gases.len) + for(var/datum/gas/trace_gas in sample.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if(corresponding) + check_moles = corresponding.moles + else + check_moles = 0 + + if((abs(trace_gas.moles - check_moles) > MINIMUM_AIR_TO_SUSPEND) && \ + ((check_moles < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*trace_gas.moles) || (check_moles > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*trace_gas.moles))) + return 0 + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if(corresponding) + check_moles = corresponding.moles + else + check_moles = 0 + + if((abs(trace_gas.moles - check_moles) > MINIMUM_AIR_TO_SUSPEND) && \ + ((trace_gas.moles < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*check_moles) || (trace_gas.moles > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*check_moles))) + return 0 + return 1 /datum/gas_mixture/proc/add(datum/gas_mixture/right_side) if(!right_side) return 0 + oxygen += right_side.oxygen + carbon_dioxide += right_side.carbon_dioxide + nitrogen += right_side.nitrogen + toxins += right_side.toxins - for(var/gasid in right_side.gases) - adjust_gas(gasid, right_side.gases[gasid], 0) + if(trace_gases.len || right_side.trace_gases.len) + for(var/datum/gas/trace_gas in right_side.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if(!corresponding) + corresponding = new trace_gas.type() + trace_gases += corresponding + corresponding.moles += trace_gas.moles + update_values() return 1 /datum/gas_mixture/proc/subtract(datum/gas_mixture/right_side) @@ -772,17 +1129,42 @@ What are the archived variables for? //Inputs: Gas mix to remove //Outputs: 1 - for(var/gasid in right_side.gases) - adjust_gas(gasid, -right_side.gases[gasid], 0) + oxygen = max(oxygen - right_side.oxygen) + carbon_dioxide = max(carbon_dioxide - right_side.carbon_dioxide) + nitrogen = max(nitrogen - right_side.nitrogen) + toxins = max(toxins - right_side.toxins) + if(trace_gases.len || right_side.trace_gases.len) + for(var/datum/gas/trace_gas in right_side.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if(corresponding) + corresponding.moles = max(0, corresponding.moles - trace_gas.moles) + + update_values() return 1 /datum/gas_mixture/proc/multiply(factor) + oxygen *= factor + carbon_dioxide *= factor + nitrogen *= factor + toxins *= factor - for(var/gasid in gases) - adjust_gas(gasid, (factor - 1) * gases[gasid], 0) + if(trace_gases && trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + trace_gas.moles *= factor + update_values() return 1 /datum/gas_mixture/proc/divide(factor) - return multiply(1/factor) + oxygen /= factor + carbon_dioxide /= factor + nitrogen /= factor + toxins /= factor + + if(trace_gases && trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + trace_gas.moles /= factor + + update_values() + return 1 diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 517757ddb9f..f3416255076 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -285,8 +285,8 @@ else var/list/nicename = null var/list/tankcheck = null - var/breathes = OXYGEN //default, we'll check later - var/list/tank_contents = list() + var/breathes = "oxygen" //default, we'll check later + var/list/contents = list() if(ishuman(C)) var/mob/living/carbon/human/H = C @@ -304,31 +304,50 @@ if (!isnull(t.manipulated_by) && t.manipulated_by != C.real_name) contents.Add(t.air_contents.total_moles) //Someone messed with the tank and put unknown gasses continue //in it, so we're going to believe the tank is what it says it is + switch(breathes) + //These tanks we're sure of their contents + if("nitrogen") //So we're a bit more picky about them. + + if(t.air_contents.nitrogen && !t.air_contents.oxygen) + contents.Add(t.air_contents.nitrogen) + else + contents.Add(0) + + if ("oxygen") + if(t.air_contents.oxygen && !t.air_contents.toxins) + contents.Add(t.air_contents.oxygen) + else + contents.Add(0) + + // No races breath this, but never know about downstream servers. + if ("carbon dioxide") + if(t.air_contents.carbon_dioxide && !t.air_contents.toxins) + contents.Add(t.air_contents.carbon_dioxide) + else + contents.Add(0) + + // ACK ACK ACK Plasmen + if ("plasma") + if(t.air_contents.toxins) + contents.Add(t.air_contents.toxins) + else + contents.Add(0) - if(t.air_contents.gases[breathes]) - var/toxic_found - for(var/toxicid in C.toxic_to_breathe) - if(t.air_contents.gases[toxicid]) - tank_contents.Add(0) - toxic_found = 1 - break - if(!toxic_found) - tank_contents.Add(t.air_contents.gases[breathes]) else //no tank so we set contents to 0 - tank_contents.Add(0) + contents.Add(0) //Alright now we know the contents of the tanks so we have to pick the best one. var/best = 0 var/bestcontents = 0 - for(var/i=1, i < tank_contents.len + 1 , ++i) - if(!tank_contents[i]) + for(var/i=1, i < contents.len + 1 , ++i) + if(!contents[i]) continue - if(tank_contents[i] > bestcontents) + if(contents[i] > bestcontents) best = i - bestcontents = tank_contents[i] + bestcontents = contents[i] //We've determined the best container now we set it as our internals @@ -342,7 +361,7 @@ if(C.internals) C.internals.icon_state = "internal1" else - C << "You don't have a[breathes==OXYGEN ? "n oxygen" : addtext(" ",breathes)] tank." + C << "You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank." if("act_intent") usr.a_intent_change("right") if("help") diff --git a/code/controllers/Processes/pipenet.dm b/code/controllers/Processes/pipenet.dm index a25f51cc013..60c5d8d039c 100644 --- a/code/controllers/Processes/pipenet.dm +++ b/code/controllers/Processes/pipenet.dm @@ -6,10 +6,8 @@ var/global/list/obj/machinery/atmospherics/atmos_machines = list() schedule_interval = 20 // every 2 seconds /datum/controller/process/pipenet/doWork() - //world << atmos_machines.len - for(var/obj/machinery/atmosmachinery in atmos_machines) - //world << "processing [atmosmachinery]" - ASSERT(istype(atmosmachinery) || istype(atmosmachinery, /obj/machinery/portable_atmospherics)) + for(var/obj/machinery/atmospherics/atmosmachinery in atmos_machines) + ASSERT(istype(atmosmachinery)) if(!atmosmachinery.disposed) if(atmosmachinery.process()) scheck() diff --git a/code/controllers/_DynamicAreaLighting_TG.dm b/code/controllers/_DynamicAreaLighting_TG.dm index 06d093d7994..3f898980741 100644 --- a/code/controllers/_DynamicAreaLighting_TG.dm +++ b/code/controllers/_DynamicAreaLighting_TG.dm @@ -139,6 +139,12 @@ atom //Turfs with opacity when they are constructed will trigger nearby lights to update //Turfs and atoms with luminosity when they are constructed will create a light_source automatically +turf/New() + ..() + if(luminosity) + if(light) WARNING("[type] - Don't set lights up manually during New(), We do it automatically.") + trueLuminosity = luminosity * luminosity + light = new(src) //Movable atoms with opacity when they are constructed will trigger nearby lights to update //Movable atoms with luminosity when they are constructed will create a light_source automatically diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index e7ef277ce89..1d7fbe5f6c3 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -145,12 +145,12 @@ datum/controller/game_controller/proc/setup_objects() world << "Initializing pipe networks" sleep(-1) - for(var/obj/machinery/atmospherics/machine in atmos_machines) + for(var/obj/machinery/atmospherics/machine in machines) machine.build_network() world << "Initializing atmos machinery." sleep(-1) - for(var/obj/machinery/atmospherics/unary/U in atmos_machines) + for(var/obj/machinery/atmospherics/unary/U in machines) if(istype(U, /obj/machinery/atmospherics/unary/vent_pump)) var/obj/machinery/atmospherics/unary/vent_pump/T = U T.broadcast_status() diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm index 556e7ac1e0c..5fbc872f762 100644 --- a/code/game/dna/genes/disabilities.dm +++ b/code/game/dna/genes/disabilities.dm @@ -56,7 +56,7 @@ M << "[deactivation_message]" else testing("[name] has no deactivation message.") - return ..() + ..() /datum/dna/gene/disability/hallucinate name="Hallucinate" diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 64f29698408..38b6caf53eb 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -313,17 +313,27 @@ ________________________________________________________________________________ else var/datum/gas_mixture/environment = T.return_air() - var/pressure = environment.pressure - var/total_moles = environment.total_moles + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles() dat += "Air Pressure: [round(pressure,0.1)] kPa" - dat += ""} /obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 + if (!istype(W, /obj/item/weapon/wrench)) return ..() diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index c03c4114111..7f1408ff4d2 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -15,9 +15,8 @@ ..() machines.Remove(src) atmos_machines |= src - - air_contents.set_volume(volume) - air_contents.set_temperature(T20C) + air_contents.volume = volume + air_contents.temperature = T20C return 1 @@ -38,7 +37,7 @@ /obj/machinery/portable_atmospherics/Destroy() del(air_contents) - atmos_machines.Remove(src) + atmos_machines -= src ..() /obj/machinery/portable_atmospherics/update_icon() @@ -105,14 +104,9 @@ if(possible_port) if(connect(possible_port)) user << "You connect [name] to the port." - var/list/contents_l=list() - for(var/gasid in src.air_contents.gases) - var/datum/gas/gas = air_contents.get_gas_by_id(gasid) - if(gas.gas_flags & AUTO_LOGGING && air_contents.gases[gasid] > 0) - contents_l += "[gas.display_name]" - var/contents_str = english_list(contents_l) - if(contents_l.len>0) - log_admin("[key_name(user)]) opened a connected a container that contains [contents_str] to a connector at [loc.x], [loc.y], [loc.z]") + var/datum/gas/sleeping_agent/S = locate() in src.air_contents.trace_gases + if(src.air_contents.toxins > 0 || (istype(S))) + log_admin("[usr]([ckey(usr.key)]) connected a canister that contains \[[src.air_contents.toxins > 0 ? "Toxins" : ""] [istype(S) ? " N2O" : ""]\] to a connector_port at [loc.x], [loc.y], [loc.z]") update_icon() return 1 else diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index 60972006a6f..56ea190eaa8 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -55,7 +55,7 @@ else environment = loc.return_air() if(direction_out) - var/pressure_delta = target_pressure - environment.pressure + var/pressure_delta = target_pressure - environment.return_pressure() //Can not have a pressure delta that would cause environment pressure > tank pressure var/transfer_moles = 0 @@ -70,7 +70,7 @@ else loc.assume_air(removed) else - var/pressure_delta = target_pressure - air_contents.pressure + var/pressure_delta = target_pressure - air_contents.return_pressure() //Can not have a pressure delta that would cause environment pressure > tank pressure var/transfer_moles = 0 @@ -106,7 +106,7 @@ /obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) var/list/data[0] data["portConnected"] = connected_port ? 1 : 0 - data["tankPressure"] = round(air_contents.pressure > 0 ? air_contents.pressure : 0) + data["tankPressure"] = round(air_contents.return_pressure() > 0 ? air_contents.return_pressure() : 0) data["targetpressure"] = round(target_pressure) data["pump_dir"] = direction_out data["minpressure"] = round(pressuremin) @@ -115,7 +115,7 @@ data["hasHoldingTank"] = holding ? 1 : 0 if (holding) - data["holdingTank"] = list("name" = holding.name, "tankPressure" = round(holding.air_contents.pressure > 0 ? holding.air_contents.pressure : 0)) + data["holdingTank"] = list("name" = holding.name, "tankPressure" = round(holding.air_contents.return_pressure() > 0 ? holding.air_contents.return_pressure() : 0)) // update the ui if it exists, returns null if no ui is passed/found ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index ca940ed5c5f..c1e857e5a2c 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -101,7 +101,7 @@ environment = holding.air_contents else environment = loc.return_air() - var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles + var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles() //Take a gas sample var/datum/gas_mixture/removed @@ -114,13 +114,26 @@ if (removed) var/datum/gas_mixture/filtered_out = new - filtered_out.set_temperature(removed.temperature) + filtered_out.temperature = removed.temperature - for(var/gasid in removed.gases) - var/datum/gas/gas_to_remove = removed.get_gas_by_id(gasid) - if(gas_to_remove.gas_flags & AUTO_FILTERED) - filtered_out.adjust_gas(gasid, removed.gases[gasid]) - removed.set_gas(gasid, 0) + + filtered_out.toxins = removed.toxins + removed.toxins = 0 + + filtered_out.carbon_dioxide = removed.carbon_dioxide + removed.carbon_dioxide = 0 + + if(removed.trace_gases.len>0) + for(var/datum/gas/trace_gas in removed.trace_gases) + if(istype(trace_gas, /datum/gas/sleeping_agent)) + removed.trace_gases -= trace_gas + filtered_out.trace_gases += trace_gas + + if(removed.trace_gases.len>0) + for(var/datum/gas/trace_gas in removed.trace_gases) + if(istype(trace_gas, /datum/gas/oxygen_agent_b)) + removed.trace_gases -= trace_gas + filtered_out.trace_gases += trace_gas //Remix the resulting gases air_contents.merge(filtered_out) @@ -150,7 +163,7 @@ /obj/machinery/portable_atmospherics/scrubber/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) var/list/data[0] data["portConnected"] = connected_port ? 1 : 0 - data["tankPressure"] = round(air_contents.pressure > 0 ? air_contents.pressure : 0) + data["tankPressure"] = round(air_contents.return_pressure() > 0 ? air_contents.return_pressure() : 0) data["rate"] = round(volume_rate) data["minrate"] = round(minrate) data["maxrate"] = round(maxrate) @@ -158,7 +171,7 @@ data["hasHoldingTank"] = holding ? 1 : 0 if (holding) - data["holdingTank"] = list("name" = holding.name, "tankPressure" = round(holding.air_contents.pressure > 0 ? holding.air_contents.pressure : 0)) + data["holdingTank"] = list("name" = holding.name, "tankPressure" = round(holding.air_contents.return_pressure() > 0 ? holding.air_contents.return_pressure() : 0)) // update the ui if it exists, returns null if no ui is passed/found ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) @@ -191,4 +204,4 @@ var/diff = text2num(href_list["volume_adj"]) volume_rate = Clamp(volume_rate+diff, minrate, maxrate) - src.add_fingerprint(usr) + src.add_fingerprint(usr) \ No newline at end of file diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index e6778ad03f6..b67592cead4 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -8,7 +8,7 @@ active_power_usage = 300 var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassembly var/processing = 0 - machine_flags = EMAGGABLE | SCREWTOGGLE | WRENCHMOVE | FIXED2WORK | MULTITOOL_MENU + machine_flags = EMAGGABLE | SCREWTOGGLE | WRENCHMOVE | FIXED2WORK /obj/machinery/computer/cultify() new /obj/structure/cult/tome(loc) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 660050ac137..5cb3e6cfcde 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -91,8 +91,7 @@ visible_message("Cannot locate any mass driver of that ID. Cancelling firing sequence!") return - if(icon_state != "old") - flick("mass_drivers_timing", src) + flick("mass_drivers_timing", src) for(var/obj/machinery/door/poddoor/M in poddoors) if(M.z != src.z) continue @@ -192,12 +191,10 @@ else times[ident_tag] = maxtimes[ident_tag] updateDialog() - - if(icon_state != "old") - if(timing) - icon_state = "mass_drivers_timing" - else - icon_state = "mass_drivers" + if(timing) + icon_state = "mass_drivers_timing" + else + icon_state = "mass_drivers" return @@ -317,8 +314,7 @@ visible_message("Cannot locate any mass driver of that ID. Cancelling firing sequence!") return - if(icon_state != "old") - flick("mass_drivers_timing", src) + flick("mass_drivers_timing", src) if(teleporter_dest) for(var/obj/structure/deathsquad_tele/D in world) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 055b2937994..d292d400407 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -339,18 +339,18 @@ var/global/list/cryo_health_indicator = list( "full" = image("icon" = 'icons/obj icon_state = "cell-off" /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() - if(air_contents.total_moles < 10) + if(air_contents.total_moles() < 10) return if(occupant) if(occupant.stat == 2) return - occupant.bodytemperature += 2*(air_contents.temperature - occupant.bodytemperature)*current_heat_capacity/(current_heat_capacity + air_contents.heat_capacity) + occupant.bodytemperature += 2*(air_contents.temperature - occupant.bodytemperature)*current_heat_capacity/(current_heat_capacity + air_contents.heat_capacity()) occupant.bodytemperature = max(occupant.bodytemperature, air_contents.temperature) // this is so ugly i'm sorry for doing it i'll fix it later i promise occupant.stat = 1 if(occupant.bodytemperature < T0C) occupant.sleeping = max(5, (1/occupant.bodytemperature)*2000) occupant.Paralyse(max(5, (1/occupant.bodytemperature)*3000)) - if(air_contents.gases[OXYGEN] > 2) + if(air_contents.oxygen > 2) if(occupant.getOxyLoss()) occupant.adjustOxyLoss(-1) else occupant.adjustOxyLoss(-1) @@ -369,18 +369,19 @@ var/global/list/cryo_health_indicator = list( "full" = image("icon" = 'icons/obj beaker.reagents.reaction(occupant) /obj/machinery/atmospherics/unary/cryo_cell/proc/heat_gas_contents() - if(air_contents.total_moles < 1) + if(air_contents.total_moles() < 1) return - var/combined_heat_capacity = current_heat_capacity + air_contents.heat_capacity + var/air_heat_capacity = air_contents.heat_capacity() + var/combined_heat_capacity = current_heat_capacity + air_heat_capacity if(combined_heat_capacity > 0) - var/combined_energy = T20C*current_heat_capacity + air_contents.thermal_energy() - air_contents.set_temperature(combined_energy/combined_heat_capacity) + var/combined_energy = T20C*current_heat_capacity + air_heat_capacity*air_contents.temperature + air_contents.temperature = combined_energy/combined_heat_capacity /obj/machinery/atmospherics/unary/cryo_cell/proc/expel_gas() - if(air_contents.total_moles < 1) + if(air_contents.total_moles() < 1) return // var/datum/gas_mixture/expel_gas = new -// var/remove_amount = air_contents.total_moles/50 +// var/remove_amount = air_contents.total_moles()/50 // expel_gas = air_contents.remove(remove_amount) // Just have the gas disappear to nowhere. diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index b311eb9d75b..baa0a94ecc7 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -33,7 +33,7 @@ ghost_read=0 ghost_write=0 - machine_flags = EMAGGABLE | MULTITOOL_MENU + machine_flags = EMAGGABLE /obj/machinery/door_control/attack_ai(mob/user as mob) src.add_hiddenprint(user) @@ -134,13 +134,14 @@ return src.attack_hand(user) /obj/machinery/driver_button/attackby(obj/item/weapon/W, mob/user as mob) - . = ..() - if(.) - return . if(istype(W, /obj/item/device/detective_scanner)) return + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 + if(istype(W, /obj/item/weapon/wrench)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 30)) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 5d7047d55ba..b1dc1de5657 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -115,9 +115,7 @@ icon = 'icons/obj/doors/vault.dmi' opacity = 1 emag_cost = 2 // in MJ - assembly_type = /obj/structure/door_assembly/door_assembly_vault - - explosion_block = 3//that's some high quality plasteel door + assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites. explosion_block = 2 @@ -256,8 +254,8 @@ // target_tile.parent.suspend_group_processing() var/datum/gas_mixture/napalm = new var/toxinsToDeduce = 35 - napalm.adjust_gas(PLASMA, toxinsToDeduce) - napalm.set_temperature(400+T0C) + napalm.toxins = toxinsToDeduce + napalm.temperature = 400+T0C target_tile.assume_air(napalm) spawn (0) target_tile.hotspot_expose(temperature, 400, surfaces=1) diff --git a/code/game/machinery/doors/mineral.dm b/code/game/machinery/doors/mineral.dm index 8bdcdd8f1e5..05e1cea92df 100644 --- a/code/game/machinery/doors/mineral.dm +++ b/code/game/machinery/doors/mineral.dm @@ -168,8 +168,8 @@ var/toxinsToDeduce = temperature/10 - napalm.adjust_gas(PLASMA, toxinsToDeduce) - napalm.set_temperature(200+T0C) + napalm.toxins = toxinsToDeduce + napalm.temperature = 200+T0C target_tile.assume_air(napalm) spawn (0) target_tile.hotspot_expose(temperature, 400,surfaces=1) diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 85ca1d43c53..b18327b2a45 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -11,7 +11,6 @@ var/build=2 // Build state var/boardtype=null // /obj/item/weapon/circuitboard/ecb var/obj/item/weapon/circuitboard/_circuitboard - machine_flags = MULTITOOL_MENU /obj/machinery/embedded_controller/New(turf/loc, var/ndir, var/building=0) ..() @@ -31,9 +30,6 @@ src.update_icon() /obj/machinery/embedded_controller/attackby(var/obj/item/W as obj, var/mob/user as mob) - . = ..() - if(.) - return . if(type==/obj/machinery/embedded_controller) switch(build) if(0) // Empty hull @@ -117,6 +113,11 @@ if(build<2) return ..() + if(istype(W,/obj/item/device/multitool)) + update_multitool_menu(user) + else + ..() + /obj/machinery/embedded_controller/proc/post_signal(datum/signal/signal, comm_line) return 0 diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 73b24a4d80c..bbd0df05c88 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -580,10 +580,6 @@ Class Procs: else return -1 - if(ismultitool(O) && machine_flags & MULTITOOL_MENU) - update_multitool_menu(user) - return 1 - if(!anchored && machine_flags & FIXED2WORK) return user << "\The [src] must be anchored first!" diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index e72636a77aa..21a1999ad0d 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -8,7 +8,7 @@ var/list/mass_drivers = list() use_power = 1 idle_power_usage = 2 active_power_usage = 50 - machine_flags = EMAGGABLE | MULTITOOL_MENU + machine_flags = EMAGGABLE var/power = 1.0 var/code = 1.0 @@ -25,9 +25,9 @@ var/list/mass_drivers = list() /obj/machinery/mass_driver/attackby(obj/item/weapon/W, mob/user as mob) - . = ..() - if(.) - return . + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 if(istype(W, /obj/item/weapon/screwdriver)) user << "You begin to unscrew the bolts off the [src]..." diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 89b881eb082..35954c0c8b6 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -124,7 +124,7 @@ if(!colour2 && !T.density) var/datum/gas_mixture/environment = T.return_air() - var/turf_total = environment.total_moles + var/turf_total = environment.total_moles() //var/turf_total = T.co2 + T.oxygen + T.poison + T.sl_gas + T.n2 @@ -210,7 +210,7 @@ if("/turf/simulated/floor", "/turf/simulated/floor/engine") var/datum/gas_mixture/environment = T.return_air() - var/turf_total = environment.total_moles + var/turf_total = environment.total_moles() var/t1 = turf_total / MOLES_CELLSTANDARD * 175 if(t1<=100) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index a76d89ebc69..3a1babbb7df 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -10,15 +10,13 @@ /obj/machinery/telecomms var/temp = "" // output message var/construct_op = 0 - machine_flags = MULTITOOL_MENU /obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob) // Using a multitool lets you access the receiver's interface - . = ..() - if(.) - return . + if(istype(P, /obj/item/device/multitool)) + attack_hand(user) switch(construct_op) if(0) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index bef34df69a3..bd6a1778136 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -236,16 +236,16 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() var/datum/gas_mixture/env = L.return_air() if(env.temperature < (heat_amt+T0C)) - var/transfer_moles = 0.25 * env.total_moles + var/transfer_moles = 0.25 * env.total_moles() var/datum/gas_mixture/removed = env.remove(transfer_moles) if(removed) - var/heat_capacity = removed.heat_capacity + var/heat_capacity = removed.heat_capacity() if(heat_capacity == 0 || heat_capacity == null) heat_capacity = 1 - removed.set_temperature(min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000)) + removed.temperature = min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000) env.merge(removed) /* diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index f97b991d666..f34ec0cd57f 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -939,16 +939,17 @@ var/turf/simulated/T = get_turf(src) if(!T) return - var/datum/gas_mixture/GM = T.return_air() + var/datum/gas_mixture/GM = new if(prob(10)) - GM.adjust_gas(PLASMA, 100, 0) - GM.set_temperature(1500+T0C) //should be enough to start a fire + GM.toxins += 100 + GM.temperature = 1500+T0C //should be enough to start a fire T.visible_message("The [src] suddenly disgorges a cloud of heated plasma.") destroy() else - GM.adjust_gas(PLASMA, 5, 0) - GM.set_temperature(istype(T) ? T.air.temperature : T20C) + GM.toxins += 5 + GM.temperature = istype(T) ? T.air.temperature : T20C T.visible_message("The [src] suddenly disgorges a cloud of plasma.") + T.assume_air(GM) return /datum/global_iterator/mecha_generator diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 46ddcae90cd..ba4d933aafc 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -119,10 +119,10 @@ /obj/mecha/proc/add_cabin() cabin_air = new - cabin_air.set_temperature(T20C) - cabin_air.set_volume(200) - cabin_air.adjust_gas(OXYGEN, O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)) - cabin_air.adjust_gas(NITROGEN, N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)) + cabin_air.temperature = T20C + cabin_air.volume = 200 + cabin_air.oxygen = O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature) + cabin_air.nitrogen = N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature) return cabin_air /obj/mecha/proc/add_radio() @@ -821,22 +821,22 @@ /obj/mecha/proc/return_pressure() . = 0 if(use_internal_tank) - . = cabin_air.pressure + . = cabin_air.return_pressure() else var/datum/gas_mixture/t_air = get_turf_air() if(t_air) - . = t_air.pressure + . = t_air.return_pressure() return //skytodo: //No idea what you want me to do here, mate. /obj/mecha/proc/return_temperature() . = 0 if(use_internal_tank) - . = cabin_air.temperature + . = cabin_air.return_temperature() else var/datum/gas_mixture/t_air = get_turf_air() if(t_air) - . = t_air.temperature + . = t_air.return_temperature() return /obj/mecha/proc/connect(obj/machinery/atmospherics/unary/portables_connector/new_port) @@ -1118,17 +1118,17 @@ return if(mob_container.forceMove(src.loc))//ejecting mob container /* - if(ishuman(occupant) && (pressure > HAZARD_HIGH_PRESSURE)) + if(ishuman(occupant) && (return_pressure() > HAZARD_HIGH_PRESSURE)) use_internal_tank = 0 var/datum/gas_mixture/environment = get_turf_air() if(environment) - var/env_pressure = environment.pressure - var/pressure_delta = (cabin.pressure - env_pressure) + var/env_pressure = environment.return_pressure() + var/pressure_delta = (cabin.return_pressure() - env_pressure) //Can not have a pressure delta that would cause environment pressure > tank pressure var/transfer_moles = 0 if(pressure_delta > 0) - transfer_moles = pressure_delta*environment.volume/(cabin.temperature * R_IDEAL_GAS_EQUATION) + transfer_moles = pressure_delta*environment.volume/(cabin.return_temperature() * R_IDEAL_GAS_EQUATION) //Actually transfer the gas var/datum/gas_mixture/removed = cabin.air_contents.remove(transfer_moles) @@ -1688,9 +1688,9 @@ delay = 20 process(var/obj/mecha/mecha) - if(mecha.cabin_air && mecha.cabin_air.volume > 0) + if(mecha.cabin_air && mecha.cabin_air.return_volume() > 0) var/delta = mecha.cabin_air.temperature - T20C - mecha.cabin_air.set_temperature(mecha.cabin_air.temperature - max(-10, min(10, round(delta/4,0.1)))) + mecha.cabin_air.temperature -= max(-10, min(10, round(delta/4,0.1))) return /datum/global_iterator/mecha_tank_give_air @@ -1702,21 +1702,21 @@ var/datum/gas_mixture/cabin_air = mecha.cabin_air var/release_pressure = mecha.internal_tank_valve - var/cabin_pressure = cabin_air.pressure - var/pressure_delta = min(release_pressure - cabin_pressure, (tank_air.pressure - cabin_pressure)/2) + var/cabin_pressure = cabin_air.return_pressure() + var/pressure_delta = min(release_pressure - cabin_pressure, (tank_air.return_pressure() - cabin_pressure)/2) var/transfer_moles = 0 if(pressure_delta > 0) //cabin pressure lower than release pressure - if(tank_air.temperature > 0) - transfer_moles = pressure_delta*cabin_air.volume/(cabin_air.temperature * R_IDEAL_GAS_EQUATION) + if(tank_air.return_temperature() > 0) + transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION) var/datum/gas_mixture/removed = tank_air.remove(transfer_moles) cabin_air.merge(removed) else if(pressure_delta < 0) //cabin pressure higher than release pressure var/datum/gas_mixture/t_air = mecha.get_turf_air() pressure_delta = cabin_pressure - release_pressure if(t_air) - pressure_delta = min(cabin_pressure - t_air.pressure, pressure_delta) + pressure_delta = min(cabin_pressure - t_air.return_pressure(), pressure_delta) if(pressure_delta > 0) //if location pressure is lower than cabin pressure - transfer_moles = pressure_delta*cabin_air.volume/(cabin_air.temperature * R_IDEAL_GAS_EQUATION) + transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION) var/datum/gas_mixture/removed = cabin_air.remove(transfer_moles) if(t_air) t_air.merge(removed) @@ -1749,12 +1749,12 @@ if(mecha.internal_tank.return_pressure()>mecha.internal_tank.maximum_pressure && !(mecha.hasInternalDamage(MECHA_INT_TANK_BREACH))) mecha.setInternalDamage(MECHA_INT_TANK_BREACH) var/datum/gas_mixture/int_tank_air = mecha.internal_tank.return_air() - if(int_tank_air && int_tank_air.volume>0) //heat the air_contents - int_tank_air.set_temperature(min(6000+T0C, int_tank_air.temperature+rand(10,15))) - if(mecha.cabin_air && mecha.cabin_air.volume>0) - mecha.cabin_air.set_temperature(min(6000+T0C, mecha.cabin_air.temperature+rand(10,15))) - if(mecha.cabin_air.temperature>mecha.max_temperature/2) - mecha.take_damage(4/round(mecha.max_temperature/mecha.cabin_air.temperature,0.1),"fire") + if(int_tank_air && int_tank_air.return_volume()>0) //heat the air_contents + int_tank_air.temperature = min(6000+T0C, int_tank_air.temperature+rand(10,15)) + if(mecha.cabin_air && mecha.cabin_air.return_volume()>0) + mecha.cabin_air.temperature = min(6000+T0C, mecha.cabin_air.return_temperature()+rand(10,15)) + if(mecha.cabin_air.return_temperature()>mecha.max_temperature/2) + mecha.take_damage(4/round(mecha.max_temperature/mecha.cabin_air.return_temperature(),0.1),"fire") if(mecha.hasInternalDamage(MECHA_INT_TEMP_CONTROL)) //stop the mecha_preserve_temp loop datum mecha.pr_int_temp_processor.stop() if(mecha.hasInternalDamage(MECHA_INT_TANK_BREACH)) //remove some air from internal tank diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index f5bd1156d1c..ff445be4ba8 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -734,8 +734,8 @@ steam.start() -- spawns the effect if(reagents.has_reagent("water")) var/turf/simulated/T = get_turf(src) if(istype(T)) - var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles ) - lowertemp.set_temperature(max(min(lowertemp.temperature-500,lowertemp.temperature / 2) ,0)) + var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() ) + lowertemp.temperature = max( min(lowertemp.temperature-500,lowertemp.temperature / 2) ,0) lowertemp.react() T.assume_air(lowertemp) spawn(3) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index f6176188e16..e15811421dc 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -54,8 +54,10 @@ if(!target.blocks_air) var/datum/gas_mixture/payload = new + var/datum/gas/sleeping_agent/trace_gas = new - payload.set_gas(NITROUS_OXIDE, 30, 0) + trace_gas.moles = 30 + payload += trace_gas target.zone.air.merge(payload) @@ -68,7 +70,7 @@ var/datum/gas_mixture/payload = new - payload.set_gas(PLASMA, 30, 0) + payload.toxins = 30 target.zone.air.merge(payload) diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index bb44798ef42..944efe32a77 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -136,12 +136,14 @@ PT.master = V OT.master = V - PT.air_contents.set_temperature(PLASMA_FLASHPOINT) - PT.air_contents.set_gas(PLASMA, 15, 0) - PT.air_contents.set_gas(CARBON_DIOXIDE, 33, 0) + PT.air_contents.temperature = PLASMA_FLASHPOINT + PT.air_contents.toxins = 15 + PT.air_contents.carbon_dioxide = 33 + PT.air_contents.update_values() - PT.air_contents.set_temperature(PLASMA_FLASHPOINT) - OT.air_contents.set_gas(OXYGEN, 48, 0) + OT.air_contents.temperature = PLASMA_FLASHPOINT + OT.air_contents.oxygen = 48 + OT.air_contents.update_values() var/obj/item/device/assembly/S diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index d9492b054ce..e0b8190d338 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -839,7 +839,28 @@ var/global/list/obj/item/device/pda/PDAs = list() else var/datum/gas_mixture/environment = T.return_air() - dat += atmos_analys.output_gas_scan(environment, T, 0) //no human standards, go get a real analyzer + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles() + + dat += "Air Pressure: [round(pressure,0.1)] kPa
" + + if (total_moles) + var/o2_level = environment.oxygen/total_moles + var/n2_level = environment.nitrogen/total_moles + var/co2_level = environment.carbon_dioxide/total_moles + var/plasma_level = environment.toxins/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+plasma_level) + + // AUTOFIXED BY fix_string_idiocy.py + // C:\Users\Rob\Documents\Projects\vgstation13\code\game\objects\items\devices\PDA\PDA.dm:476: dat += "Nitrogen: [round(n2_level*100)]%
" + dat += {"Nitrogen: [round(n2_level*100)]%
+ Oxygen: [round(o2_level*100)]%
+ Carbon Dioxide: [round(co2_level*100)]%
+ Plasma: [round(plasma_level*100)]%
"} + // END AUTOFIX + if(unknown_level > 0.01) + dat += "OTHER: [round(unknown_level)]%
" + dat += "Temperature: [round(environment.temperature-T0C)]°C
" dat += "
" if (5) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index b17852e4555..e0c47bc13db 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -248,14 +248,6 @@ proc/healthanalyze(mob/living/M as mob, mob/living/user as mob, var/mode = 0) melt_temperature = MELTPOINT_PLASTIC origin_tech = "magnets=1;engineering=1" - var/list/human_standards = list("oxygen_min" = 16, - "oxygen_max" = 20, - "nitrogen_min" = 60, - "nitrogen_max" = 100, - "plasma_max" = 0.01, - "carbon_dioxide_max" = 0.01, - "nitrous_oxide_max" = 0.01) - /obj/item/device/analyzer/attack_self(mob/user as mob) if (user.stat) @@ -278,8 +270,9 @@ proc/healthanalyze(mob/living/M as mob, mob/living/user as mob, var/mode = 0) /obj/item/device/analyzer/proc/output_gas_scan(var/datum/gas_mixture/scanned, var/atom/container, human_standard = 0) if(!scanned) return "No gas mixture found." - var/pressure = scanned.pressure - var/total_moles = scanned.total_moles + scanned.update_values() + var/pressure = scanned.return_pressure() + var/total_moles = scanned.total_moles() var/message = "" if(!container || istype(container, /turf)) message += "Results:
" @@ -287,24 +280,25 @@ proc/healthanalyze(mob/living/M as mob, mob/living/user as mob, var/mode = 0) message += "\icon [container] Results of [container] scan:
" if(total_moles) message += "[human_standard && abs(pressure - ONE_ATMOSPHERE) > 10 ? "" : ""] Pressure: [round(pressure,0.1)] kPa
" + var/o2_concentration = scanned.oxygen/total_moles + var/n2_concentration = scanned.nitrogen/total_moles + var/co2_concentration = scanned.carbon_dioxide/total_moles + var/plasma_concentration = scanned.toxins/total_moles - for(var/gasid in scanned.gases) - var/gas_moles = scanned.gases[gasid] - var/datum/gas/gas = scanned.get_gas_by_id(gasid) - if(!gas_moles && !(gas.gas_flags & ALWAYS_SHOW)) //no gas, and we aren't configured to show a 0 number - continue //skip it - var/danger = 0 - if(human_standard) - if("[gas.gas_id]_min" in human_standards) - if(gas_moles <= human_standards["[gas.gas_id]_min"]) - danger = 1 - else if (!danger && ("[gas.gas_id]_max" in human_standards)) - if(gas_moles >= human_standards["[gas.gas_id]_max"]) - danger = 1 + var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) - message += "[danger ? "" : ""] [gas.display_short]: [round(gas_moles, 0.1)] mol, [round((gas_moles / scanned.total_moles)*100)]%
" + if(n2_concentration > 0.01) + message += "[human_standard && abs(n2_concentration - N2STANDARD) > 20 ? "" : ""] Nitrogen: [round(scanned.nitrogen, 0.1)] mol, [round(n2_concentration*100)]%
" + if(o2_concentration > 0.01) + message += "[human_standard && abs(o2_concentration - O2STANDARD) > 2 ? "" : ""] Oxygen: [round(scanned.oxygen, 0.1)] mol, [round(o2_concentration*100)]%
" + if(co2_concentration > 0.01) + message += "[human_standard ? "" : ""] CO2: [round(scanned.carbon_dioxide, 0.1)] mol, [round(co2_concentration*100)]%
" + if(plasma_concentration > 0.01) + message += "[human_standard ? "" : ""] Plasma: [round(scanned.toxins, 0.1)] mol, [round(plasma_concentration*100)]%
" + if(unknown_concentration > 0.01) + message += "Unknown: [round(unknown_concentration*100)]%
" - message += "[human_standard && !(abs(scanned.temperature-T0C - 20) < 20) ? "" : ""] Temperature: [round(scanned.temperature-T0C)]°C" + message += "[human_standard && !(scanned.temperature-T0C in range(0, 40)) ? "" : ""] Temperature: [round(scanned.temperature-T0C)]°C" else message += "No gasses detected[container && !istype(container, /turf) ? " in \the [container]." : ""]!" return message diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 10ebccb4e03..0799733414f 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -136,7 +136,7 @@ overlays += "device" /obj/item/device/transfer_valve/proc/merge_gases() - tank_two.air_contents.set_volume(tank_two.air_contents.volume + tank_one.air_contents.volume) + tank_two.air_contents.volume += tank_one.air_contents.volume var/datum/gas_mixture/temp temp = tank_one.air_contents.remove_ratio(1) tank_two.air_contents.merge(temp) @@ -148,7 +148,7 @@ var/datum/gas_mixture/temp temp = tank_two.air_contents.remove_ratio(ratio1) tank_one.air_contents.merge(temp) - tank_two.air_contents.set_volume(tank_two.air_contents.volume - tank_one.air_contents.volume) + tank_two.air_contents.volume -= tank_one.air_contents.volume /* Exadv1: I know this isn't how it's going to work, but this was just to check diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e7f79e25adb..a2a867c169a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -157,8 +157,6 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ new/datum/stack_recipe("Mass Driver frame", /obj/machinery/mass_driver_frame, 3, time = 50, one_per_turf = 1), \ new/datum/stack_recipe("Tank dispenser", /obj/structure/dispenser/empty, 2, time = 10, one_per_turf = 1), \ new/datum/stack_recipe("Fireaxe cabinet", /obj/structure/closet/fireaxecabinet/, 2, time = 50, one_per_turf = 1), \ - null, \ - new/datum/stack_recipe("Vault Door assembly", /obj/structure/door_assembly/door_assembly_vault, 8, time = 50, one_per_turf = 1, on_floor = 1), \ ) /obj/item/stack/sheet/plasteel diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 4ff926b90c8..bbe617eb4b9 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -138,7 +138,7 @@ M.requests += O if (buf.types & DNA2_BUF_SE) if(block)// Isolated injector - //testing("Isolated block [block] injector with contents: [GetValue()]") + testing("Isolated block [block] injector with contents: [GetValue()]") if (GetState() && block == MONKEYBLOCK && istype(M, /mob/living/carbon/human) ) message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] (MONKEY)") log_attack("[key_name(user)] injected [key_name(M)] with the Isolated [name] (MONKEY)") @@ -146,7 +146,7 @@ else log_attack("[key_name(user)] injected [key_name(M)] with the Isolated [name]") else - //testing("DNA injector with contents: [english_list(buf.dna.SE)]") + testing("DNA injector with contents: [english_list(buf.dna.SE)]") if (GetState(MONKEYBLOCK) && istype(M, /mob/living/carbon/human) ) message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)") log_attack("[key_name(user)] injected [key_name(M)] with the [name] (MONKEY)") @@ -173,7 +173,7 @@ if (buf.types & DNA2_BUF_SE) if(block)// Isolated injector - //testing("Isolated block [block] injector with contents: [GetValue()]") + testing("Isolated block [block] injector with contents: [GetValue()]") if (GetState() && block == MONKEYBLOCK && istype(M, /mob/living/carbon/human) ) message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] (MONKEY)") log_attack("[key_name(user)] injected [key_name(M)] with the Isolated [name] (MONKEY)") @@ -181,7 +181,7 @@ else log_attack("[key_name(user)] injected [key_name(M)] with the Isolated [name]") else - //testing("DNA injector with contents: [english_list(buf.dna.SE)]") + testing("DNA injector with contents: [english_list(buf.dna.SE)]") if (GetState(MONKEYBLOCK) && istype(M, /mob/living/carbon/human)) message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)") log_game("[key_name(user)] injected [key_name(M)] with the [name] (MONKEY)") diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 23c39374acb..38b4ff04ca5 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -128,7 +128,7 @@ if(!ptank) user << "Attach a plasma tank first!" return - var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
\n Tank Pressure: [ptank.air_contents.pressure]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove plasmatank - Close") + var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
\n Tank Pressure: [ptank.air_contents.return_pressure()]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove plasmatank - Close") user << browse(dat, "window=flamethrower;size=600x300") onclose(user, "flamethrower") return @@ -143,7 +143,7 @@ usr.set_machine(src) if(href_list["light"]) if(!ptank) return - if(ptank.air_contents.gases[PLASMA] < 1) return + if(ptank.air_contents.toxins < 1) return if(!status) return lit = !lit if(lit) @@ -192,8 +192,8 @@ //Transfer 5% of current tank air contents to turf var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.02*(throw_amount/100)) //air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is retarded and I could probably make it work without fucking it up like this, but there you have it. -- TLE - new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gases[PLASMA]*10,get_dir(loc,target)) - air_transfer.set_gas(PLASMA, 0) + new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.toxins*10,get_dir(loc,target)) + air_transfer.toxins = 0 target.assume_air(air_transfer) //Burn it based on transfered gas //target.hotspot_expose(part4.air_contents.temperature*2,300) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index d32bbbd31dd..eae9a0476da 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -39,16 +39,17 @@ /obj/item/weapon/tank/jetpack/proc/allow_thrust(num, mob/living/user as mob) if(!(src.on)) return 0 - if((num < 0.005 || src.air_contents.total_moles < num)) + if((num < 0.005 || src.air_contents.total_moles() < num)) src.toggle() return 0 var/datum/gas_mixture/G = src.air_contents.remove(num) + var/allgases = G.total_moles() - if(G.total_moles >= 0.005) + if(allgases >= 0.005) return 1 - G = null //let the GC get it + del(G) return /obj/item/weapon/tank/jetpack/ui_action_click() @@ -67,7 +68,7 @@ /obj/item/weapon/tank/jetpack/void/New() . = ..() - air_contents.adjust_gas(OXYGEN, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + air_contents.adjust((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) /obj/item/weapon/tank/jetpack/oxygen name = "Jetpack (Oxygen)" @@ -77,7 +78,7 @@ /obj/item/weapon/tank/jetpack/oxygen/New() . = ..() - air_contents.adjust_gas(OXYGEN, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + air_contents.adjust((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) /obj/item/weapon/tank/jetpack/nitrogen name = "Jetpack (Nitrogen)" @@ -87,7 +88,7 @@ /obj/item/weapon/tank/jetpack/nitrogen/New() . = ..() - air_contents.adjust_gas(NITROGEN, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + air_contents.adjust(, , (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) /obj/item/weapon/tank/jetpack/carbondioxide name = "Jetpack (Carbon Dioxide)" @@ -98,4 +99,4 @@ /obj/item/weapon/tank/jetpack/carbondioxide/New() . = ..() - air_contents.adjust_gas(CARBON_DIOXIDE, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + air_contents.adjust(, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 677a68706aa..d4dd97e13d5 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -13,12 +13,12 @@ /obj/item/weapon/tank/oxygen name = "oxygen tank" desc = "A tank of oxygen." - icon_state = OXYGEN + icon_state = "oxygen" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD /obj/item/weapon/tank/oxygen/New() . = ..() - air_contents.adjust_gas(OXYGEN, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + air_contents.adjust((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) /obj/item/weapon/tank/oxygen/yellow desc = "A tank of oxygen, this one is yellow." @@ -39,8 +39,9 @@ /obj/item/weapon/tank/anesthetic/New() . = ..() - air_contents.adjust_gas(NITROUS_OXIDE, (2 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) - air_contents.adjust_gas(OXYGEN, (4 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + var/datum/gas/sleeping_agent/sleeping_agent = new + sleeping_agent.moles = (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD + air_contents.adjust((3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD, , , , list(sleeping_agent)) /* * Air @@ -52,8 +53,7 @@ /obj/item/weapon/tank/air/New() . = ..() - air_contents.adjust_gas(OXYGEN, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD) - air_contents.adjust_gas(NITROGEN, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD) + air_contents.adjust((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD, , (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD) /* * Plasma @@ -67,7 +67,7 @@ /obj/item/weapon/tank/plasma/New() . = ..() - air_contents.adjust_gas(PLASMA, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + air_contents.adjust(, , , (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C)) /obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() @@ -102,7 +102,7 @@ /obj/item/weapon/tank/emergency_oxygen/New() . = ..() - air_contents.adjust_gas(OXYGEN, (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + air_contents.adjust((3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) /obj/item/weapon/tank/emergency_oxygen/engi name = "extended-capacity emergency oxygen tank" @@ -124,7 +124,7 @@ /obj/item/weapon/tank/emergency_nitrogen/New() . = ..() - air_contents.adjust_gas(NITROGEN, (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + air_contents.adjust(, , (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) /* * Nitrogen @@ -137,4 +137,4 @@ /obj/item/weapon/tank/nitrogen/New() . = ..() - air_contents.adjust_gas(NITROGEN, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + air_contents.adjust(, , (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C)) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index bc861baa9f1..8ecae54a9e6 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -25,8 +25,8 @@ ..() src.air_contents = new /datum/gas_mixture() - src.air_contents.set_volume(volume) //liters - src.air_contents.set_temperature(T20C) + src.air_contents.volume = volume //liters + src.air_contents.temperature = T20C processing_objects.Add(src) return @@ -117,7 +117,7 @@ // this is the data which will be sent to the ui var/data[0] - data["tankPressure"] = round(air_contents.pressure ? air_contents.pressure : 0) + data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0) data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0) data["defaultReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE) data["maxReleasePressure"] = round(TANK_MAX_RELEASE_PRESSURE) @@ -199,7 +199,7 @@ if(!air_contents) return null - var/tank_pressure = air_contents.pressure + var/tank_pressure = air_contents.return_pressure() if(tank_pressure < distribute_pressure) distribute_pressure = tank_pressure @@ -221,7 +221,7 @@ if(!air_contents) return 0 - var/pressure = air_contents.pressure + var/pressure = air_contents.return_pressure() if(pressure > TANK_FRAGMENT_PRESSURE) if(!istype(src.loc,/obj/item/device/transfer_valve)) message_admins("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") @@ -231,7 +231,7 @@ air_contents.react() air_contents.react() air_contents.react() - pressure = air_contents.pressure + pressure = air_contents.return_pressure() var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE if(range > MAX_EXPLOSION_RANGE) cap = 1 diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 38e34d68323..94b38439b15 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -103,14 +103,18 @@ var/datum/gas_mixture/gas = (..()) if(!gas) return null var/datum/gas_mixture/newgas = new/datum/gas_mixture() - newgas.set_volume(gas.volume) - newgas.copy_from(gas) + newgas.oxygen = gas.oxygen + newgas.carbon_dioxide = gas.carbon_dioxide + newgas.nitrogen = gas.nitrogen + newgas.toxins = gas.toxins + newgas.volume = gas.volume + newgas.temperature = gas.temperature if(newgas.temperature <= target_temp) return if((newgas.temperature - cooling_power) > target_temp) - newgas.set_temperature(newgas.temperature - cooling_power) + newgas.temperature -= cooling_power else - newgas.set_temperature(target_temp) + newgas.temperature = target_temp return newgas diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 2885008d302..62abe8a9484 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -103,12 +103,6 @@ airlock_type = "/highsecurity" glass = -1 -/obj/structure/door_assembly/door_assembly_vault - base_icon_state = "vault" - base_name = "Vault" - airlock_type = "/vault" - glass = -1 - /obj/structure/door_assembly/multi_tile/ icon = 'icons/obj/doors/door_assembly2x1.dmi' dir = EAST diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index a1f321e7d43..f6a2b015f75 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -18,7 +18,7 @@ var/cp=0 if(T && istype(T) && T.zone) var/datum/gas_mixture/environment = T.return_air() - cp = environment.pressure + cp = environment.return_pressure() else if(istype(T,/turf/simulated)) continue @@ -32,13 +32,13 @@ if(!istype(lT) || !lT.zone) return 0 var/datum/gas_mixture/myenv=lT.return_air() - var/pressure=myenv.pressure + var/pressure=myenv.return_pressure() for(var/dir in cardinal) var/turf/simulated/T=get_turf(get_step(loc,dir)) if(T && istype(T) && T.zone) var/datum/gas_mixture/environment = T.return_air() - var/pdiff = abs(pressure - environment.pressure) + var/pdiff = abs(pressure - environment.return_pressure()) if(pdiff > FALSEDOOR_MAX_PRESSURE_DIFF) return pdiff return 0 @@ -185,7 +185,7 @@ T.ChangeTurf(/turf/simulated/wall) else T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]")) - if(mineral != PLASMA) + if(mineral != "plasma") T = get_turf(src) T.attackby(W,user) del(src) @@ -196,7 +196,7 @@ T.ChangeTurf(/turf/simulated/wall) else T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]")) - if(mineral != PLASMA) + if(mineral != "plasma") T = get_turf(src) T.attackby(W,user) del(src) @@ -364,7 +364,7 @@ name = "plasma wall" desc = "A wall with plasma plating. This is definately a bad idea." icon_state = "" - mineral = PLASMA + mineral = "plasma" //-----------wtf?-----------start /obj/structure/falsewall/clown diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm index 7471a0e7050..b7874260ed0 100644 --- a/code/game/objects/structures/transit_tubes.dm +++ b/code/game/objects/structures/transit_tubes.dm @@ -75,9 +75,10 @@ obj/structure/ex_act(severity) /obj/structure/transit_tube_pod/New() . = ..() - air_contents.set_temperature(T20C) - air_contents.adjust_gas(OXYGEN, MOLES_O2STANDARD * 2) - air_contents.adjust_gas(NITROGEN, MOLES_N2STANDARD) + air_contents.oxygen = MOLES_O2STANDARD * 2 + air_contents.nitrogen = MOLES_N2STANDARD + air_contents.temperature = T20C + // Give auto tubes time to align before trying to start moving spawn (5) follow_tube() @@ -363,7 +364,11 @@ obj/structure/ex_act(severity) // datum, there might be problems if I don't... /obj/structure/transit_tube_pod/return_air() var/datum/gas_mixture/GM = new() - GM.copy_from(air_contents) + GM.oxygen = air_contents.oxygen + GM.carbon_dioxide = air_contents.carbon_dioxide + GM.nitrogen = air_contents.nitrogen + GM.toxins = air_contents.toxins + GM.temperature = air_contents.temperature return GM // For now, copying what I found in an unused FEA file (and almost identical in a @@ -382,8 +387,8 @@ obj/structure/ex_act(severity) // currently on. /obj/structure/transit_tube_pod/proc/mix_air() var/datum/gas_mixture/environment = loc.return_air() - var/env_pressure = environment.pressure - var/int_pressure = air_contents.pressure + var/env_pressure = environment.return_pressure() + var/int_pressure = air_contents.return_pressure() var/total_pressure = env_pressure + int_pressure if(total_pressure == 0) @@ -398,8 +403,8 @@ obj/structure/ex_act(severity) var/transfer_in = max(0.1, 0.5 * (env_pressure - int_pressure) / total_pressure) var/transfer_out = max(0.1, 0.3 * (int_pressure - env_pressure) / total_pressure) - var/datum/gas_mixture/from_env = loc.remove_air(environment.total_moles * transfer_in) - var/datum/gas_mixture/from_int = air_contents.remove(air_contents.total_moles * transfer_out) + var/datum/gas_mixture/from_env = loc.remove_air(environment.total_moles() * transfer_in) + var/datum/gas_mixture/from_int = air_contents.remove(air_contents.total_moles() * transfer_out) loc.assume_air(from_int) air_contents.merge(from_env) diff --git a/code/game/objects/structures/vehicles/adminbus.dm b/code/game/objects/structures/vehicles/adminbus.dm index b5b2362267b..1b13ff8e55d 100644 --- a/code/game/objects/structures/vehicles/adminbus.dm +++ b/code/game/objects/structures/vehicles/adminbus.dm @@ -10,7 +10,7 @@ icon = 'icons/obj/bus.dmi' icon_state = "adminbus" can_spacemove=1 - layer = FLY_LAYER+1 + layer = FLY_LAYER pixel_x = -32 pixel_y = -32 var/can_move=1 @@ -43,7 +43,6 @@ update_lightsource() warp = new/obj/structure/teleportwarp(src.loc) busjuke = new/obj/machinery/media/jukebox/superjuke/adminbus(src.loc) - busjuke.dir = EAST /obj/structure/stool/bed/chair/vehicle/adminbus/update_mob() if(buckled_mob) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 4300ea6c4e9..56d0b09107f 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -423,9 +423,6 @@ if (istype(O, /obj/item/weapon/reagent_containers)) var/obj/item/weapon/reagent_containers/RG = O - if(RG.reagents.total_volume >= RG.reagents.maximum_volume) - user << "[RG] is full." - return RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) user.visible_message("[user] fills the [RG] using \the [src].","You fill the [RG] using \the [src].") return @@ -443,8 +440,8 @@ else B.deductcharge(1) user.visible_message( \ - "[user] was stunned by \his wet [O.name]!", \ - "You have wet \the [O.name], it shocks you!") + "[user] was stunned by his wet [O].", \ + "You have wet \the [O], it shocks you!") return if (!isturf(user.loc)) diff --git a/code/game/smoothwall.dm b/code/game/smoothwall.dm index 4a829f3270c..eed45f46702 100644 --- a/code/game/smoothwall.dm +++ b/code/game/smoothwall.dm @@ -107,18 +107,4 @@ // DE-HACK /turf/simulated/wall/vault/relativewall() - return - -var/list/smoothable_unsims = list( - "riveted", - ) - -/turf/unsimulated/wall/New() - ..() - if(icon_state in smoothable_unsims) - relativewall() - relativewall_neighbours() - -/turf/unsimulated/wall/relativewall() - var/junction=findSmoothingNeighbors() - icon_state = "[walltype][junction]" + return \ No newline at end of file diff --git a/code/game/sound.dm b/code/game/sound.dm index ab878712e33..3735d2ebd51 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -41,7 +41,7 @@ var/list/mommicomment_sound = list('sound/voice/mommi_comment1.ogg', 'sound/voic var/atmosphere = 0 var/datum/gas_mixture/current_air = turf_source.return_air() if(current_air) - atmosphere = current_air.pressure + atmosphere = current_air.return_pressure() else atmosphere = 0 //no air @@ -82,7 +82,7 @@ var/const/SURROUND_CAP = 7 var/datum/gas_mixture/environment = current_turf.return_air() var/atmosphere = 0 if(environment) - atmosphere = environment.pressure + atmosphere = environment.return_pressure() /// Local sound modifications /// if(atmosphere < MIN_SOUND_PRESSURE) //no sound reception in space, boyos diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 094ae2e5980..a7c093685a2 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -4,8 +4,8 @@ var/image/wet_overlay = null var/thermite = 0 - starting_gases = list(OXYGEN = MOLES_O2STANDARD, - NITROGEN = MOLES_N2STANDARD) + oxygen = MOLES_O2STANDARD + nitrogen = MOLES_N2STANDARD var/to_be_destroyed = 0 //Used for fire, if a melting temperature was reached, it will be destroyed var/max_fire_temperature_sustained = 0 //The max temperature of the fire which it was subjected to var/drying = 0 // tracking if something is currently drying diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index a29b9aebf1c..ec56beff247 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -1,8 +1,8 @@ /turf/simulated/floor/airless icon_state = "floor" name = "airless floor" - starting_gases = list(OXYGEN = 0.01, // BIRDS HATE OXYGEN FOR SOME REASON - NITROGEN = 0.01) + oxygen = 0.01 + nitrogen = 0.01 temperature = TCMB New() @@ -15,8 +15,8 @@ icon_state = "plating" name = "vox plating" //icon = 'icons/turf/shuttle-debug.dmi' - starting_gases = list(OXYGEN = 0, // BIRDS HATE OXYGEN FOR SOME REASON - NITROGEN = MOLES_O2STANDARD+MOLES_N2STANDARD) // So it totals to the same pressure + oxygen=0 // BIRDS HATE OXYGEN FOR SOME REASON + nitrogen = MOLES_O2STANDARD+MOLES_N2STANDARD // So it totals to the same pressure New() ..() @@ -26,8 +26,8 @@ icon_state = "floor" name = "vox floor" //icon = 'icons/turf/shuttle-debug.dmi' - starting_gases = list(OXYGEN = 0, // BIRDS HATE OXYGEN FOR SOME REASON - NITROGEN = MOLES_O2STANDARD+MOLES_N2STANDARD) // So it totals to the same pressure + oxygen=0 // BIRDS HATE OXYGEN FOR SOME REASON + nitrogen = MOLES_O2STANDARD+MOLES_N2STANDARD // So it totals to the same pressure New() ..() @@ -149,18 +149,24 @@ return /turf/simulated/floor/engine/airless - starting_gases = list(OXYGEN = 0.01, - NITROGEN = 0.01) + oxygen = 0.01 + nitrogen = 0.01 /turf/simulated/floor/engine/n20 - - + New() + ..() + if(src.air) + // EXACTLY the same code as fucking roomfillers. If this doesn't work, something's fucked. + var/datum/gas/sleeping_agent/trace_gas = new + air.trace_gases += trace_gas + trace_gas.moles = 9*4000 + air.update_values() /turf/simulated/floor/engine/vacuum name = "vacuum floor" icon_state = "engine" - starting_gases = list(OXYGEN = 0, - NITROGEN = 0.001) + oxygen = 0 + nitrogen = 0.001 temperature = TCMB /turf/simulated/floor/plating @@ -178,8 +184,8 @@ /turf/simulated/floor/plating/airless icon_state = "plating" name = "airless plating" - starting_gases = list(OXYGEN = 0.01, - NITROGEN = 0.01) + oxygen = 0.01 + nitrogen = 0.01 temperature = TCMB New() @@ -367,11 +373,11 @@ // VOX SHUTTLE SHIT /turf/simulated/shuttle/floor/vox - starting_gases = list(OXYGEN = 0, // BIRDS HATE OXYGEN FOR SOME REASON - NITROGEN = MOLES_O2STANDARD+MOLES_N2STANDARD) // So it totals to the same pressure + oxygen=0 // BIRDS HATE OXYGEN FOR SOME REASON + nitrogen = MOLES_O2STANDARD+MOLES_N2STANDARD // So it totals to the same pressure //icon = 'icons/turf/shuttle-debug.dmi' /turf/simulated/shuttle/plating/vox - starting_gases = list(OXYGEN = 0, // BIRDS HATE OXYGEN FOR SOME REASON - NITROGEN = MOLES_O2STANDARD+MOLES_N2STANDARD) // So it totals to the same pressure + oxygen=0 // BIRDS HATE OXYGEN FOR SOME REASON + nitrogen = MOLES_O2STANDARD+MOLES_N2STANDARD // So it totals to the same pressure //icon = 'icons/turf/shuttle-debug.dmi' diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 460559797e6..7d159b15a4c 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -105,8 +105,8 @@ target_tile.parent.suspend_group_processing()*/ var/datum/gas_mixture/napalm = new var/toxinsToDeduce = 20 - napalm.adjust_gas(PLASMA, toxinsToDeduce) - napalm.set_temperature(400+T0C) + napalm.toxins = toxinsToDeduce + napalm.temperature = 400+T0C target_tile.assume_air(napalm) spawn (0) target_tile.hotspot_expose(temperature, 400,surfaces=1) for(var/obj/structure/falsewall/plasma/F in range(3,src))//Hackish as fuck, but until fire_act works, there is nothing I can do -Sieve diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 89eef8a243a..325bc03436d 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -5,7 +5,11 @@ //for floors, use is_plating(), is_plasteel_floor() and is_light_floor() var/intact = 1 - var/list/starting_gases = list() + //Properties for open tiles (/floor) + var/oxygen = 0 + var/carbon_dioxide = 0 + var/nitrogen = 0 + var/toxins = 0 //Properties for airtight tiles (/wall) var/thermal_conductivity = 0.05 @@ -39,14 +43,6 @@ /turf/New() ..() - if(luminosity) - if(light) WARNING("[type] - Don't set lights up manually during New(), We do it automatically.") - trueLuminosity = luminosity * luminosity - light = new(src) - - if(starting_gases && starting_gases.len) - return_air() //generates the air required - for(var/atom/movable/AM as mob|obj in src) spawn( 0 ) src.Entered(AM) diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated.dm index b9eecb1e4ba..178b69b2868 100644 --- a/code/game/turfs/unsimulated.dm +++ b/code/game/turfs/unsimulated.dm @@ -1,5 +1,5 @@ /turf/unsimulated intact = 1 name = "command" - starting_gases = list(OXYGEN = MOLES_O2STANDARD, - NITROGEN = MOLES_N2STANDARD) + oxygen = MOLES_O2STANDARD + nitrogen = MOLES_N2STANDARD \ No newline at end of file diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm index 981af365a44..8c820c68244 100644 --- a/code/game/turfs/unsimulated/walls.dm +++ b/code/game/turfs/unsimulated/walls.dm @@ -1,26 +1,21 @@ /turf/unsimulated/wall - name = "riveted wall" + name = "wall" icon = 'icons/turf/walls.dmi' icon_state = "riveted" opacity = 1 density = 1 explosion_block = 2 - canSmoothWith = "/turf/unsimulated/wall=0" - - var/walltype = "riveted" /turf/unsimulated/wall/fakeglass name = "window" icon_state = "fakewindows" opacity = 0 - canSmoothWith = null turf/unsimulated/wall/splashscreen name = "Space Station 13" icon = null icon_state = null layer = FLY_LAYER - canSmoothWith = null New() var/path = "icons/splashworks/" @@ -32,7 +27,6 @@ turf/unsimulated/wall/splashscreen /turf/unsimulated/wall/other icon_state = "r_wall" - canSmoothWith = null /turf/unsimulated/wall/cult name = "wall" @@ -40,7 +34,6 @@ turf/unsimulated/wall/splashscreen icon_state = "cult0" opacity = 1 density = 1 - canSmoothWith = null /turf/unsimulated/wall/cultify() ChangeTurf(/turf/unsimulated/wall/cult) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index e69bfa1d7a0..18a0a1bda89 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -143,9 +143,14 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/t = "" - for(var/gasid in env.gases) - var/datum/gas/gas = env.get_gas_by_id(gasid) - t += "[gas.display_name] : [env.gases[gasid]]
" + // AUTOFIXED BY fix_string_idiocy.py + // C:\Users\Rob\Documents\Projects\vgstation13\code\modules\admin\verbs\debug.dm:145: t+= "Nitrogen : [env.nitrogen]\n" + t += {"Nitrogen : [env.nitrogen] +Oxygen : [env.oxygen] +Plasma : [env.toxins] +CO2: [env.carbon_dioxide] +Pressure: [env.return_pressure()]"} + // END AUTOFIX usr.show_message(t, 1) feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -1031,7 +1036,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(Rad.anchored) if(!Rad.P) var/obj/item/weapon/tank/plasma/Plasma = new/obj/item/weapon/tank/plasma(Rad) - Plasma.air_contents.set_gas(PLASMA, 70) + Plasma.air_contents.toxins = 70 Rad.drain_ratio = 0 Rad.P = Plasma Plasma.loc = Rad diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 96cdd05ddb6..a4eb8ca7387 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -55,7 +55,7 @@ if(T.active_hotspot) burning = 1 - usr << "@[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.pressure] kPa [(burning)?("BURNING"):(null)]" + usr << "@[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("BURNING"):(null)]" for(var/datum/gas/trace_gas in GM.trace_gases) usr << "[trace_gas.type]: [trace_gas.moles]" feedback_add_details("admin_verb","DAST") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 92fd47debe5..73aa1324b8e 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -109,7 +109,7 @@ return /obj/item/weapon/tank/proc/detonate() //This happens when a bomb is told to explode - var/fuel_moles = air_contents.gases[PLASMA] + air_contents.gases[OXYGEN]/6 + var/fuel_moles = air_contents.toxins + air_contents.oxygen/6 var/strength = 1 var/turf/ground_zero = get_turf(loc) @@ -157,7 +157,7 @@ del(src) /obj/item/weapon/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out. - var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles) + var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles()) var/turf/simulated/T = get_turf(src) if(!T) return diff --git a/code/modules/atmos_automation/console.dm b/code/modules/atmos_automation/console.dm index 02f2a4442dd..cae9c8a6d91 100644 --- a/code/modules/atmos_automation/console.dm +++ b/code/modules/atmos_automation/console.dm @@ -360,7 +360,7 @@ var/datum/automation/if_statement/i = new (src) i.label = "Oxygen Injection" i.condition = MakeCompare( - MakeGetSensorData(sensor_tag,OXYGEN), + MakeGetSensorData(sensor_tag,"oxygen"), MakeNumber(20), "Less Than or Equal to" ) @@ -416,10 +416,10 @@ // Outlet Management /////////////////////////////////////////////////////////////// /* - if(get_sensor_data("pressure") >= 5000 && get_sensor_data(OXYGEN) >= 20) + if(get_sensor_data("pressure") >= 5000 && get_sensor_data("oxygen") >= 20) vent_on() else - if(get_sensor_data(OXYGEN) < 20 || get_sensor_data("pressure") < 100) + if(get_sensor_data("oxygen") < 20 || get_sensor_data("pressure") < 100) vent_off() */ @@ -444,7 +444,7 @@ ) and_on.children.Add( MakeCompare( - MakeGetSensorData(sensor_tag,OXYGEN), + MakeGetSensorData(sensor_tag,"oxygen"), MakeNumber(20), "Greater Than or Equal to" ) @@ -466,7 +466,7 @@ ) or_off.children.Add( MakeCompare( - MakeGetSensorData(sensor_tag,OXYGEN), + MakeGetSensorData(sensor_tag,"oxygen"), MakeNumber(20), "Less Than" ) diff --git a/code/modules/atmos_automation/implementation/sensors.dm b/code/modules/atmos_automation/implementation/sensors.dm index b10cdb7d760..f4ac1c4c0b0 100644 --- a/code/modules/atmos_automation/implementation/sensors.dm +++ b/code/modules/atmos_automation/implementation/sensors.dm @@ -34,10 +34,10 @@ field = input("Select a sensor output:", "Sensor Data", field) as null|anything in list( "temperature", "pressure", - OXYGEN, - PLASMA, - NITROGEN, - CARBON_DIOXIDE + "oxygen", + "toxins", + "nitrogen", + "carbon_dioxide" ) parent.updateUsrDialog() return 1 diff --git a/code/modules/bomberman/bomberman.dm b/code/modules/bomberman/bomberman.dm index f08d21eedcf..25eaf7691a9 100644 --- a/code/modules/bomberman/bomberman.dm +++ b/code/modules/bomberman/bomberman.dm @@ -845,11 +845,6 @@ var/global/list/arenas = list() sleep(2) //giving the game some time to process to avoid unbearable lag spikes when we create a large arena, plus it looks cool. pencil.y++ - pencil.x = x - pencil.y = y+h - T = pencil.loc - T.maptext = name - qdel(pencil) //RIP sweet prince for (var/datum/bomberman_spawn/S in spawns) //removing the soft walls near the spawns @@ -883,10 +878,6 @@ var/global/list/arenas = list() message_admins("[key_name_admin(user.client)] created a \"[size]\" Bomberman arena at [center.loc.name] ([center.x],[center.y],[center.z]) (JMP)") log_game("[key_name_admin(user.client)] created a \"[size]\" Bomberman arena at [center.loc.name] ([center.x],[center.y],[center.z]) ") - - for(var/mob/dead/observer/O in observers) - O << "[user.client.key] created a \"[size]\" Bomberman arena at [center.loc.name]. Click here to JUMP to it." - else qdel(src) @@ -966,9 +957,6 @@ var/global/list/arenas = list() E.visible_message("\icon[E] \The [E] brightens as it appears that a round is starting in [name].") flick("entertainment_arena",E) - for(var/mob/dead/observer/O in observers) - O << "A round has began in [name]!" - sleep(40) for(var/datum/bomberman_spawn/S in spawns) if(S.player) @@ -1125,7 +1113,6 @@ var/global/list/arenas = list() T.ChangeTurf(/turf/space) else T.ChangeTurf(/turf/simulated/floor/plating) - T.maptext = null turfs = list() arenas -= src return diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index 473fa83c3ce..f575092d70d 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -257,15 +257,24 @@ var/missing_gas = 0 for(var/gas in seed.consume_gasses) if(environment) - if(gas == OXYGEN) - if(environment.gases[OXYGEN] <= seed.consume_gasses[OXYGEN]) - missing_gas++ - continue - else - if(environment.gases[gas] >= seed.consume_gasses[gas]) - missing_gas++ - continue - environment.adjust_gas(gas,-seed.consume_gasses[gas]) + switch(gas) + if("oxygen") + if(environment.oxygen <= seed.consume_gasses[gas]) + missing_gas++ + continue + if("plasma") + if(environment.toxins >= seed.consume_gasses[gas]) + missing_gas++ + continue + if("nitrogen") + if(environment.nitrogen >= seed.consume_gasses[gas]) + missing_gas++ + continue + if("carbon_dioxide") + if(environment.carbon_dioxide >= seed.consume_gasses[gas]) + missing_gas++ + continue + environment.adjust_gas(gas,-seed.consume_gasses[gas],1) else missing_gas++ @@ -273,7 +282,7 @@ health -= missing_gas * HYDRO_SPEED_MULTIPLIER // Process it. - var/pressure = environment.pressure + var/pressure = environment.return_pressure() if(pressure < seed.lowkpa_tolerance || pressure > seed.highkpa_tolerance) health -= healthmod diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index df530f1403f..0eddda794e2 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -194,12 +194,12 @@ proc/populate_seed_list() if(prob(5)) consume_gasses = list() - var/gas = pick(OXYGEN,NITROGEN,PLASMA,CARBON_DIOXIDE) + var/gas = pick("oxygen","nitrogen","plasma","carbon_dioxide") consume_gasses[gas] = rand(3,9) if(prob(5)) exude_gasses = list() - var/gas = pick(OXYGEN,NITROGEN,PLASMA,CARBON_DIOXIDE) + var/gas = pick("oxygen","nitrogen","plasma","carbon_dioxide") exude_gasses[gas] = rand(3,9) chems = list() diff --git a/code/modules/hydroponics/vines.dm b/code/modules/hydroponics/vines.dm index d1d60240c94..daa76dd7a83 100644 --- a/code/modules/hydroponics/vines.dm +++ b/code/modules/hydroponics/vines.dm @@ -280,7 +280,7 @@ if(!environment) return - var/pressure = environment.pressure + var/pressure = environment.return_pressure() if(pressure < seed.lowkpa_tolerance || pressure > seed.highkpa_tolerance) die() return diff --git a/code/modules/media/broadcast/transmitters/broadcast.dm b/code/modules/media/broadcast/transmitters/broadcast.dm index 075df2b0848..4f649cd92dc 100644 --- a/code/modules/media/broadcast/transmitters/broadcast.dm +++ b/code/modules/media/broadcast/transmitters/broadcast.dm @@ -17,7 +17,6 @@ var/const/RADS_PER_TICK=150 var/const/MAX_TEMP=70 // Celsius - machine_flags = MULTITOOL_MENU /obj/machinery/media/transmitter/broadcast/initialize() testing("[type]/initialize() called!") @@ -50,18 +49,16 @@ broadcast() // Bzzt /obj/machinery/media/transmitter/broadcast/attackby(var/obj/item/W, mob/user) - . = ..() - if(.) - return . + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 /obj/machinery/media/transmitter/broadcast/attack_ai(var/mob/user as mob) src.add_hiddenprint(user) attack_hand(user) /obj/machinery/media/transmitter/broadcast/attack_hand(var/mob/user as mob) - . = ..() - if(.) - return . + update_multitool_menu(user) /obj/machinery/media/transmitter/broadcast/multitool_menu(var/mob/user,var/obj/item/device/multitool/P) // You need a multitool to use this, or be silicon @@ -178,7 +175,7 @@ var/datum/gas_mixture/env = L.return_air() if(env.temperature != MAX_TEMP + T0C) - var/transfer_moles = 0.25 * env.total_moles + var/transfer_moles = 0.25 * env.total_moles() var/datum/gas_mixture/removed = env.remove(transfer_moles) @@ -186,13 +183,13 @@ if(removed) - var/heat_capacity = removed.heat_capacity + var/heat_capacity = removed.heat_capacity() //world << "heating ([heat_capacity])" if(heat_capacity) // Added check to avoid divide by zero (oshi-) runtime errors -- TLE if(removed.temperature < MAX_TEMP + T0C) - removed.set_temperature(min(removed.temperature + heating_power/heat_capacity, 1000)) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE + removed.temperature = min(removed.temperature + heating_power/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE else - removed.set_temperature(max(removed.temperature - heating_power/heat_capacity, TCMB)) + removed.temperature = max(removed.temperature - heating_power/heat_capacity, TCMB) //world << "now at [removed.temperature]" diff --git a/code/modules/media/jukebox.dm b/code/modules/media/jukebox.dm index efbb6b2a502..80446c35fd6 100644 --- a/code/modules/media/jukebox.dm +++ b/code/modules/media/jukebox.dm @@ -184,7 +184,7 @@ var/global/loopModeNames=list( var/state_base = "jukebox2" - machine_flags = WRENCHMOVE | FIXED2WORK | EMAGGABLE | MULTITOOL_MENU + machine_flags = WRENCHMOVE | FIXED2WORK | EMAGGABLE mech_flags = MECH_SCAN_FAIL emag_cost = 0 // because fun/unlimited uses. @@ -353,9 +353,10 @@ var/global/loopModeNames=list( /obj/machinery/media/jukebox/attackby(obj/item/W, mob/user) - . = ..() - if(.) - return . + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 + ..() if(istype(W,/obj/item/weapon/card/id)) if(!selected_song || screen!=JUKEBOX_SCREEN_PAYMENT) visible_message("The machine buzzes.","You hear a buzz.") diff --git a/code/modules/media/tapedeck.dm b/code/modules/media/tapedeck.dm index 7a196686ebe..44962cae202 100644 --- a/code/modules/media/tapedeck.dm +++ b/code/modules/media/tapedeck.dm @@ -45,7 +45,6 @@ var/last_ad_cyc = 0 // Last world.time of an ad cycle var/list/ad_queue = 0 // Ads queued to play - machine_flags = MULTITOOL_MENU var/state_base = "tapedeck" /obj/machinery/media/tapedeck/attack_ai(var/mob/user) @@ -189,9 +188,9 @@ /obj/machinery/media/jukebox/attackby(obj/item/W, mob/user) - . = ..() - if(.) - return . + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 if(istype(W, /obj/item/weapon/card/emag)) current_song = 0 if(!emagged) @@ -204,7 +203,6 @@ user.visible_message("[user.name] slides something into the [src.name]'s card-reader.","You short out the [src.name].") update_icon() update_music() - return 1 else if(istype(W,/obj/item/weapon/wrench)) var/un = !anchored ? "" : "un" user.visible_message("[user.name] begins [un]locking \the [src.name]'s casters.","You begin [un]locking \the [src.name]'s casters.") diff --git a/code/modules/medical/cloning.dm b/code/modules/medical/cloning.dm index e530dfa6d68..04f2e8c86fe 100644 --- a/code/modules/medical/cloning.dm +++ b/code/modules/medical/cloning.dm @@ -26,10 +26,10 @@ var/resource_efficiency = 1 var/id_tag = "clone_pod" - machine_flags = EMAGGABLE | SCREWTOGGLE | CROWDESTROY | MULTITOOL_MENU + machine_flags = EMAGGABLE | SCREWTOGGLE | CROWDESTROY l_color = "#7BF9FF" - + /obj/machinery/cloning/clonepod/multitool_menu(var/mob/user, var/obj/item/device/multitool/P) return "" @@ -343,9 +343,6 @@ //Let's unlock this early I guess. Might be too early, needs tweaking. /obj/machinery/cloning/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob) - . = ..() - if(.) - return . if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (!src.check_access(W)) user << "Access Denied." @@ -361,6 +358,10 @@ user.drop_item(W) qdel(W) return + if(ismultitool(W)) + update_multitool_menu(user) + else + ..() //Put messages in the connected computer's temp var for display. /obj/machinery/cloning/clonepod/proc/connected_message(var/message) diff --git a/code/modules/medical/computer/cloning.dm b/code/modules/medical/computer/cloning.dm index bc865a2638a..f762569be5e 100644 --- a/code/modules/medical/computer/cloning.dm +++ b/code/modules/medical/computer/cloning.dm @@ -82,16 +82,17 @@ #undef CLONEPODRANGE /obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob) - . = ..() - if(.) - return . if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) user.drop_item(W, src) src.diskette = W user << "You insert [W]." src.updateUsrDialog() - return 1 + return + if(ismultitool(W)) + update_multitool_menu(user) + else + ..() return /obj/machinery/computer/cloning/attack_paw(mob/user as mob) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index b6c22104c49..a159934bac8 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -495,7 +495,7 @@ del(src) else var/datum/gas_mixture/environment = proj_turf.return_air() - var/pressure = environment.pressure + var/pressure = environment.return_pressure() if(pressure < 50) name = "strong resonance field" resonance_damage = 60 diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 1731cc2a178..e45b1a3df89 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -7,8 +7,8 @@ name = "Rock" icon = 'icons/turf/walls.dmi' icon_state = "rock" - starting_gases = list(OXYGEN = 0.01, - NITROGEN = 0.01) + oxygen = 0 + nitrogen = 0 opacity = 1 density = 1 blocks_air = 1 @@ -432,16 +432,16 @@ /**********************Asteroid**************************/ /turf/unsimulated/floor/airless //floor piece - starting_gases = list(OXYGEN = 0.01, - NITROGEN = 0.01) + oxygen = 0.01 + nitrogen = 0.01 temperature = TCMB /turf/unsimulated/floor/asteroid //floor piece name = "Asteroid" icon = 'icons/turf/floors.dmi' icon_state = "asteroid" - starting_gases = list(OXYGEN = 0.01, - NITROGEN = 0.01) + oxygen = 0.01 + nitrogen = 0.01 temperature = TCMB //icon_plating = "asteroid" var/dug = 0 //0 = has not yet been dug, 1 = has already been dug diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 933bd18a8a7..200ccaa28cb 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -35,8 +35,6 @@ var/mob/canclone = null incorporeal_move = 1 - var/obj/item/device/analyzer/analyzer //for gas scanning - /mob/dead/observer/New(var/mob/body=null, var/flags=1) sight |= SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF see_invisible = SEE_INVISIBLE_OBSERVER @@ -574,9 +572,44 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/datum/gas_mixture/environment = usr.loc.return_air() - if(!analyzer) - analyzer = new(usr) - usr << analyzer.output_gas_scan(environment, usr.loc, 1) + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles() + + src << "Results:" + if(abs(pressure - ONE_ATMOSPHERE) < 10) + src << "Pressure: [round(pressure,0.1)] kPa" + else + src << "Pressure: [round(pressure,0.1)] kPa" + if(total_moles) + var/o2_concentration = environment.oxygen/total_moles + var/n2_concentration = environment.nitrogen/total_moles + var/co2_concentration = environment.carbon_dioxide/total_moles + var/plasma_concentration = environment.toxins/total_moles + + var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) + if(abs(n2_concentration - N2STANDARD) < 20) + src << "Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)" + else + src << "Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)" + + if(abs(o2_concentration - O2STANDARD) < 2) + src << "Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)" + else + src << "Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)" + + if(co2_concentration > 0.01) + src << "CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)" + else + src << "CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)" + + if(plasma_concentration > 0.01) + src << "Plasma: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)" + + if(unknown_concentration > 0.01) + src << "Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)" + + src << "Temperature: [round(environment.temperature-T0C,0.1)]°C" + src << "Heat Capacity: [round(environment.heat_capacity(),0.1)]" /mob/dead/observer/verb/toggle_darkness() @@ -755,20 +788,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp // host.ckey = src.ckey // //host << "You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent." -/mob/dead/observer/verb/find_arena() - set category = "Ghost" - set name = "Search For Arenas" - set desc = "Try to find an Arena to polish your robust bomb placement skills.." - - if(!arenas.len) - usr << "There are no arenas in the world! Ask the admins to spawn one." - return - - var/datum/bomberman_arena/arena_target = input("Which arena do you wish to reach?", "Arena Search Panel") in arenas - usr << "Reached [arena_target]" - - usr.loc = arena_target.center - //BEGIN TELEPORT HREF CODE /mob/dead/observer/Topic(href, href_list) if(usr != src) @@ -817,15 +836,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return loc = T following = null - - if(href_list["jumptoarenacood"]) - var/x = text2num(href_list["X"]) - var/y = text2num(href_list["Y"]) - var/z = text2num(href_list["Z"]) - - var/client/C = usr.client - sleep(2) - C.jumptocoord(x,y,z) ..() //END TELEPORT HREF CODE diff --git a/code/modules/mob/dead/observer/spells.dm b/code/modules/mob/dead/observer/spells.dm index 4cdaf996ad4..ac3e06ec1cf 100644 --- a/code/modules/mob/dead/observer/spells.dm +++ b/code/modules/mob/dead/observer/spells.dm @@ -77,4 +77,4 @@ var/global/list/boo_phrases_silicon=list( A:spookymode=1 if(istype(A, /obj/machinery/ai_status_display)) - A:spookymode=1 + A:spookymode=1 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index ce17c5b84ea..ec3891da1a7 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -117,12 +117,12 @@ breath = location_as_object.handle_internal_lifeform(src, BREATH_VOLUME) else if(istype(loc, /turf/)) var/breath_moles = 0 - /*if(environment.pressure > ONE_ATMOSPHERE) + /*if(environment.return_pressure() > ONE_ATMOSPHERE) // Loads of air around (pressure effect will be handled elsewhere), so lets just take a enough to fill our lungs at normal atmos pressure (using n = Pv/RT) breath_moles = (ONE_ATMOSPHERE*BREATH_VOLUME/R_IDEAL_GAS_EQUATION*environment.temperature) else*/ // Not enough air around, take a percentage of what's there to model this properly - breath_moles = environment.total_moles*BREATH_PERCENTAGE + breath_moles = environment.total_moles()*BREATH_PERCENTAGE breath = loc.remove_air(breath_moles) @@ -170,26 +170,25 @@ //Aliens breathe in vaccuum return 0 - var/plasma_used = 0 - var/breath_pressure = (breath.total_moles*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME + var/toxins_used = 0 + var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME //Partial pressure of the toxins in our breath - var/plasma_gas = breath.gases[PLASMA] - var/Plasma_pp = (plasma_gas/breath.total_moles)*breath_pressure + var/Toxins_pp = (breath.toxins/breath.total_moles())*breath_pressure - if(Plasma_pp) // Detect toxins in air + if(Toxins_pp) // Detect toxins in air - adjustToxLoss(plasma_gas*250) + adjustToxLoss(breath.toxins*250) toxins_alert = max(toxins_alert, 1) - plasma_used = plasma_gas + toxins_used = breath.toxins else toxins_alert = 0 //Breathe in toxins and out oxygen - breath.adjust_gas(PLASMA, -plasma_used) - breath.adjust_gas(OXYGEN, plasma_used) + breath.toxins -= toxins_used + breath.oxygen += toxins_used if(breath.temperature > (T0C+66) && !(M_RESIST_HEAT in mutations)) // Hot air hurts :( if(prob(20)) diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 1bcc955fac5..24e00ab6280 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -98,12 +98,12 @@ breath = location_as_object.handle_internal_lifeform(src, BREATH_VOLUME) else if(istype(loc, /turf/)) var/breath_moles = 0 - /*if(environment.pressure > ONE_ATMOSPHERE) + /*if(environment.return_pressure() > ONE_ATMOSPHERE) // Loads of air around (pressure effect will be handled elsewhere), so lets just take a enough to fill our lungs at normal atmos pressure (using n = Pv/RT) breath_moles = (ONE_ATMOSPHERE*BREATH_VOLUME/R_IDEAL_GAS_EQUATION*environment.temperature) else*/ // Not enough air around, take a percentage of what's there to model this properly - breath_moles = environment.total_moles*BREATH_PERCENTAGE + breath_moles = environment.total_moles()*BREATH_PERCENTAGE breath = loc.remove_air(breath_moles) @@ -151,26 +151,25 @@ //Aliens breathe in vaccuum return 0 - var/plasma_used = 0 - var/breath_pressure = (breath.total_moles*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME + var/toxins_used = 0 + var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME //Partial pressure of the toxins in our breath - var/plasma_gas = breath.gases[PLASMA] - var/Plasma_pp = (plasma_gas/breath.total_moles)*breath_pressure + var/Toxins_pp = (breath.toxins/breath.total_moles())*breath_pressure - if(Plasma_pp) // Detect toxins in air + if(Toxins_pp) // Detect toxins in air - adjustToxLoss(plasma_gas*250) + adjustToxLoss(breath.toxins*250) toxins_alert = max(toxins_alert, 1) - plasma_used = plasma_gas + toxins_used = breath.toxins else toxins_alert = 0 //Breathe in toxins and out oxygen - breath.adjust_gas(PLASMA, -plasma_used) - breath.adjust_gas(OXYGEN, plasma_used) + breath.toxins -= toxins_used + breath.oxygen += toxins_used if(breath.temperature > (T0C+66) && !(M_RESIST_HEAT in mutations)) // Hot air hurts :( if(prob(20)) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index acfa07dce63..2d33533b427 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -72,7 +72,7 @@ proc/handle_environment(datum/gas_mixture/environment) if(!environment || (flags & INVULNERABLE)) return - var/environment_heat_capacity = environment.heat_capacity + var/environment_heat_capacity = environment.heat_capacity() if(istype(get_turf(src), /turf/space)) var/turf/heat_turf = get_turf(src) environment_heat_capacity = heat_turf.heat_capacity diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 7af586e8e3b..d33ce19cfcb 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -21,5 +21,3 @@ var/pulse = PULSE_NORM //current pulse level var/hasmouth = 1 // Used for food, etc. - - var/list/toxic_to_breathe = list(PLASMA) //the list of gases ignored when we try to find an internals tank - this does not actually impact breathing code diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 917a7b6f16d..d5caa0f1ad5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -72,7 +72,6 @@ if(!src.species) if(new_species_name) src.set_species(new_species_name) else src.set_species() - default_language = get_default_language() create_reagents(1000) @@ -166,7 +165,7 @@ del(internal) else stat("Internal Atmosphere Info", internal.name) - stat("Tank Pressure", internal.air_contents.pressure) + stat("Tank Pressure", internal.air_contents.return_pressure()) stat("Distribution Pressure", internal.distribute_pressure) if(mind) if(mind.changeling) @@ -1515,7 +1514,6 @@ else src.see_invisible = SEE_INVISIBLE_LIVING if((src.species.default_mutations.len > 0) || (src.species.default_blocks.len > 0)) src.do_deferred_species_setup = 1 - src.toxic_to_breathe = species.species_toxic_to_breathe //stops Vox breathing out of oxy tanks spawn() src.dna.species = new_species_name src.update_icons() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d3dfe93ec14..281024d23a6 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -550,12 +550,12 @@ var/global/list/organ_damage_overlays = list( breath = location_as_object.handle_internal_lifeform(src, BREATH_MOLES) else if(isturf(loc)) var/breath_moles = 0 - /*if(environment.pressure > ONE_ATMOSPHERE) + /*if(environment.return_pressure() > ONE_ATMOSPHERE) // Loads of air around (pressure effect will be handled elsewhere), so lets just take a enough to fill our lungs at normal atmos pressure (using n = Pv/RT) breath_moles = (ONE_ATMOSPHERE*BREATH_VOLUME/R_IDEAL_GAS_EQUATION*environment.temperature) else*/ // Not enough air around, take a percentage of what's there to model this properly - breath_moles = environment.total_moles*BREATH_PERCENTAGE + breath_moles = environment.total_moles()*BREATH_PERCENTAGE breath = loc.remove_air(breath_moles) @@ -600,9 +600,9 @@ var/global/list/organ_damage_overlays = list( //testing("Plasmaman [src] leakin'. coverflags=[cover_flags]") // OH FUCK HE LEAKIN'. // This was OP. - //environment.adjust(tx = environment.total_moles*BREATH_PERCENTAGE) // About one breath's worth. (I know we aren't breathing it out, but this should be about the right amount) + //environment.adjust(tx = environment.total_moles()*BREATH_PERCENTAGE) // About one breath's worth. (I know we aren't breathing it out, but this should be about the right amount) if(environment) - if(environment.total_moles && (environment.gases[OXYGEN] / environment.total_moles) >= OXYCONCEN_PLASMEN_IGNITION) //how's the concentration doing? + if(environment.oxygen && environment.total_moles() && (environment.oxygen / environment.total_moles()) >= OXYCONCEN_PLASMEN_IGNITION) //how's the concentration doing? if(!on_fire) src << "Your body reacts with the atmosphere and bursts into flame!" adjust_fire_stacks(0.5) @@ -640,7 +640,7 @@ var/global/list/organ_damage_overlays = list( if((status_flags & GODMODE) || (flags & INVULNERABLE)) return 0 - if(!breath || (breath.total_moles == 0) || suiciding) + if(!breath || (breath.total_moles() == 0) || suiciding) if(reagents.has_reagent("inaprovaline")) return 0 if(suiciding) @@ -738,7 +738,7 @@ var/global/list/organ_damage_overlays = list( // Account for massive pressure differences. Done by Polymorph // Made it possible to actually have something that can protect against high pressure... Done by Errorage. Polymorph now has an axe sticking from his head for his previous hardcoded nonsense! - var/pressure = environment.pressure + var/pressure = environment.return_pressure() var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob. if(status_flags & GODMODE) return 1 //godmode @@ -759,7 +759,7 @@ var/global/list/organ_damage_overlays = list( else pressure_alert = -1 - if(environment.gases[PLASMA] > MOLES_PLASMA_VISIBLE) + if(environment.toxins > MOLES_PLASMA_VISIBLE) pl_effects() return diff --git a/code/modules/mob/living/carbon/human/plasmaman/species.dm b/code/modules/mob/living/carbon/human/plasmaman/species.dm index 04658bbc8b8..4783100e71d 100644 --- a/code/modules/mob/living/carbon/human/plasmaman/species.dm +++ b/code/modules/mob/living/carbon/human/plasmaman/species.dm @@ -11,14 +11,12 @@ //default_mutations=list(SKELETON) // This screws things up - breath_type = PLASMA + breath_type = "plasma" heat_level_1 = 350 // Heat damage level 1 above this point. heat_level_2 = 400 // Heat damage level 2 above this point. heat_level_3 = 500 // Heat damage level 3 above this point. - species_toxic_to_breathe = list() - /datum/species/plasmaman/handle_speech(message, mob/living/carbon/human/H) return ..(replacetext(message, "s", stutter("ss")), H) @@ -117,29 +115,26 @@ var/safe_plasma_min = 16 // Minimum safe partial pressure of PLASMA, in kPa //var/safe_oxygen_max = 140 // Maximum safe partial pressure of PLASMA, in kPa (Not used for now) var/safe_co2_max = 10 // Yes it's an arbitrary value who cares? - var/N2O_para_min = 1 - var/N2O_sleep_min = 5 - var/N2O_emote_min = 0.15 + var/SA_para_min = 1 + var/SA_sleep_min = 5 var/plasma_used = 0 var/nitrogen_used = 0 - var/breath_pressure = (breath.total_moles*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME + var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME // Partial pressure of plasma - var/Plasma_pp = (breath.gases[PLASMA]/breath.total_moles)*breath_pressure + var/Toxins_pp = (breath.toxins/breath.total_moles())*breath_pressure // And CO2, lets say a PP of more than 10 will be bad (It's a little less really, but eh, being passed out all round aint no fun) - var/CO2_pp = (breath.gases[CARBON_DIOXIDE]/breath.total_moles)*breath_pressure // Tweaking to fit the hacky bullshit I've done with atmo -- TLE + var/CO2_pp = (breath.carbon_dioxide/breath.total_moles())*breath_pressure // Tweaking to fit the hacky bullshit I've done with atmo -- TLE - var/N2O_pp = (breath.gases[NITROUS_OXIDE]/breath.total_moles)*breath_pressure - - if(Plasma_pp < safe_plasma_min) + if(Toxins_pp < safe_plasma_min) if(prob(20)) spawn(0) H.emote("gasp") - if(Plasma_pp > 0) - var/ratio = safe_plasma_min/Plasma_pp + if(Toxins_pp > 0) + var/ratio = safe_plasma_min/Toxins_pp H.adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS)) // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!) H.failed_last_breath = 1 - plasma_used = breath.gases[PLASMA]*ratio/6 + plasma_used = breath.toxins*ratio/6 else H.adjustOxyLoss(HUMAN_MAX_OXYLOSS) H.failed_last_breath = 1 @@ -148,12 +143,12 @@ else // We're in safe limits H.failed_last_breath = 0 H.adjustOxyLoss(-5) - plasma_used = breath.gases[PLASMA]/6 + plasma_used = breath.toxins/6 H.oxygen_alert = 0 - breath.adjust_gas(PLASMA, -plasma_used) - breath.adjust_gas(NITROGEN, -nitrogen_used) - breath.adjust_gas(CARBON_DIOXIDE, plasma_used) + breath.toxins -= plasma_used + breath.nitrogen -= nitrogen_used + breath.carbon_dioxide += plasma_used //CO2 does not affect failed_last_breath. So if there was enough oxygen in the air but too much co2, this will hurt you, but only once per 4 ticks, instead of once per tick. if(CO2_pp > safe_co2_max) @@ -171,15 +166,18 @@ else H.co2overloadtime = 0 - if(N2O_pp > N2O_para_min) // Enough to make us paralysed for a bit - H.Paralyse(3) // 3 gives them one second to wake up and run away a bit! - if(N2O_pp > N2O_sleep_min) // Enough to make us sleep as well - H.sleeping = min(H.sleeping+2, 10) - else if(N2O_pp > N2O_emote_min) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning - if(prob(20)) - spawn(0) - H.emote(pick("giggle", "laugh")) - breath.adjust_gas(NITROUS_OXIDE, -breath.gases[NITROUS_OXIDE]) + if(breath.trace_gases.len) // If there's some other shit in the air lets deal with it here. + for(var/datum/gas/sleeping_agent/SA in breath.trace_gases) + var/SA_pp = (SA.moles/breath.total_moles())*breath_pressure + if(SA_pp > SA_para_min) // Enough to make us paralysed for a bit + H.Paralyse(3) // 3 gives them one second to wake up and run away a bit! + if(SA_pp > SA_sleep_min) // Enough to make us sleep as well + H.sleeping = min(H.sleeping+2, 10) + else if(SA_pp > 0.15) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning + if(prob(20)) + spawn(0) + H.emote(pick("giggle", "laugh")) + SA.moles = 0 if( (abs(310.15 - breath.temperature) > 50) && !(M_RESIST_HEAT in H.mutations)) // Hot air hurts :( if(H.status_flags & GODMODE) diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index 4412400289c..4716cc88b75 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -158,7 +158,7 @@ adjustToxLoss(rand(10,20)) return - //var/environment_heat_capacity = environment.heat_capacity + //var/environment_heat_capacity = environment.heat_capacity() var/loc_temp = T0C if(istype(get_turf(src), /turf/space)) //environment_heat_capacity = loc:heat_capacity diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 70892cc7aa6..fd6b932b301 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -253,7 +253,7 @@ var/obj/location_as_object = loc breath = location_as_object.handle_internal_lifeform(src, BREATH_VOLUME) else if(istype(loc, /turf/)) - var/breath_moles = environment.total_moles*BREATH_PERCENTAGE + var/breath_moles = environment.total_moles()*BREATH_PERCENTAGE breath = loc.remove_air(breath_moles) // Handle chem smoke effect -- Doohl @@ -313,20 +313,17 @@ var/safe_co2_max = 10 // Yes it's an arbitrary value who cares? var/safe_toxins_max = 0.5 var/safe_toxins_mask = 5 - var/N2O_para_min = 0.5 - var/N2O_sleep_min = 5 - var/N2O_emote_min = 0.01 + var/SA_para_min = 0.5 + var/SA_sleep_min = 5 var/oxygen_used = 0 - var/breath_pressure = (breath.total_moles*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME + var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME //Partial pressure of the O2 in our breath - var/O2_pp = (breath.gases[OXYGEN]/breath.total_moles)*breath_pressure + var/O2_pp = (breath.oxygen/breath.total_moles())*breath_pressure // Same, but for the toxins - var/Plasma_pp = (breath.gases[PLASMA]/breath.total_moles)*breath_pressure + var/Toxins_pp = (breath.toxins/breath.total_moles())*breath_pressure // And CO2, lets say a PP of more than 10 will be bad (It's a little less really, but eh, being passed out all round aint no fun) - var/CO2_pp = (breath.gases[CARBON_DIOXIDE]/breath.total_moles)*breath_pressure - - var/N2O_pp = (breath.gases[NITROUS_OXIDE]/breath.total_moles)*breath_pressure + var/CO2_pp = (breath.carbon_dioxide/breath.total_moles())*breath_pressure if(O2_pp < safe_oxygen_min) // Too little oxygen if(prob(20)) @@ -335,7 +332,7 @@ O2_pp = 0.01 var/ratio = safe_oxygen_min/O2_pp adjustOxyLoss(min(5*ratio, 7)) // Don't fuck them up too fast (space only does 7 after all!) - oxygen_used = breath.gases[OXYGEN]*ratio/6 + oxygen_used = breath.oxygen*ratio/6 oxygen_alert = max(oxygen_alert, 1) /*else if (O2_pp > safe_oxygen_max) // Too much oxygen (commented this out for now, I'll deal with pressure damage elsewhere I suppose) spawn(0) emote("cough") @@ -345,11 +342,11 @@ oxygen_alert = max(oxygen_alert, 1)*/ else // We're in safe limits adjustOxyLoss(-5) - oxygen_used = breath.gases[OXYGEN]/6 + oxygen_used = breath.oxygen/6 oxygen_alert = 0 - breath.adjust_gas(OXYGEN, -oxygen_used) - breath.adjust_gas(CARBON_DIOXIDE,oxygen_used) + breath.oxygen -= oxygen_used + breath.carbon_dioxide += oxygen_used if(CO2_pp > safe_co2_max) if(!co2overloadtime) // If it's the first breath with too much CO2 in it, lets start a counter, then have them pass out after 12s or so. @@ -365,30 +362,32 @@ else co2overloadtime = 0 - if(Plasma_pp > safe_toxins_max) // Too much toxins - var/plasma_level = breath.gases[PLASMA] - var/ratio = (plasma_level/safe_toxins_max) * 10 + if(Toxins_pp > safe_toxins_max) // Too much toxins + var/ratio = (breath.toxins/safe_toxins_max) * 10 //adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) //Limit amount of damage toxin exposure can do per second if(wear_mask) if(wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT) - if(plasma_level > safe_toxins_mask) - ratio = (plasma_level/safe_toxins_mask) * 10 + if(breath.toxins > safe_toxins_mask) + ratio = (breath.toxins/safe_toxins_mask) * 10 else ratio = 0 if(ratio) if(reagents) - reagents.add_reagent(PLASMA, Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) + reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) toxins_alert = max(toxins_alert, 1) - else - toxins_alert = 0 + else + toxins_alert = 0 - if(N2O_pp > N2O_para_min) // Enough to make us paralysed for a bit - Paralyse(3) // 3 gives them one second to wake up and run away a bit! - if(N2O_pp > N2O_sleep_min) // Enough to make us sleep as well - sleeping = max(sleeping+2, 10) - else if(N2O_pp > N2O_emote_min) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning - if(prob(20)) - spawn(0) emote(pick("giggle", "laugh")) + if(breath.trace_gases.len) // If there's some other shit in the air lets deal with it here. + for(var/datum/gas/sleeping_agent/SA in breath.trace_gases) + var/SA_pp = (SA.moles/breath.total_moles())*breath_pressure + if(SA_pp > SA_para_min) // Enough to make us paralysed for a bit + Paralyse(3) // 3 gives them one second to wake up and run away a bit! + if(SA_pp > SA_sleep_min) // Enough to make us sleep as well + sleeping = max(sleeping+2, 10) + else if(SA_pp > 0.01) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning + if(prob(20)) + spawn(0) emote(pick("giggle", "laugh")) if(breath.temperature > (T0C+66)) // Hot air hurts :( @@ -398,6 +397,7 @@ else fire_alert = 0 + //Temporary fixes to the alerts. return 1 @@ -409,7 +409,7 @@ if(hat && istype(hat, /obj/item/clothing/head/helmet/space) && uniform && istype(uniform, /obj/item/clothing/monkeyclothes/space)) spaceproof = 1 //quick and dirt cheap. no need for the Life() of monkeys to become as complicated as the Life() of humans. man that's deep. - var/environment_heat_capacity = environment.heat_capacity + var/environment_heat_capacity = environment.heat_capacity() if(istype(get_turf(src), /turf/space)) var/turf/heat_turf = get_turf(src) environment_heat_capacity = heat_turf.heat_capacity @@ -424,7 +424,7 @@ //Account for massive pressure differences - var/pressure = environment.pressure + var/pressure = environment.return_pressure() var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob. switch(adjusted_pressure) if(HAZARD_HIGH_PRESSURE to INFINITY) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index f13d5dc62f5..1ed5cf0b7e5 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -89,8 +89,7 @@ update_muts=1 if(!istype(src, /mob/living/carbon/monkey/diona)) - add_language(LANGUAGE_MONKEY) - default_language = all_languages[LANGUAGE_MONKEY] + add_language("Chimpanzee") ..() update_icons() diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index ee9a6c544a6..ab876de4455 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -46,7 +46,7 @@ var/global/list/whitelisted_species = list("Human") var/punch_throw_speed = 1 var/mutantrace // Safeguard due to old code. - var/breath_type = OXYGEN // Non-oxygen gas breathed, if any. + var/breath_type = "oxygen" // Non-oxygen gas breathed, if any. var/survival_gear = /obj/item/weapon/storage/box/survival // For spawnin'. var/cold_level_1 = 260 // Cold damage level 1 below this point. @@ -103,7 +103,6 @@ var/global/list/whitelisted_species = list("Human") var/wear_mask_icons = 'icons/mob/mask.dmi' var/back_icons = 'icons/mob/back.dmi' - var/species_toxic_to_breathe = list(PLASMA) //Used in icon caching. var/race_key = 0 @@ -173,26 +172,23 @@ var/global/list/whitelisted_species = list("Human") var/safe_oxygen_min = 16 // Minimum safe partial pressure of O2, in kPa //var/safe_oxygen_max = 140 // Maximum safe partial pressure of O2, in kPa (Not used for now) var/safe_co2_max = 10 // Yes it's an arbitrary value who cares? - var/safe_plasma_max = 0.5 - var/safe_plasma_mask = 5 - var/N2O_para_min = 1 - var/N2O_sleep_min = 5 - var/N2O_emote_min = 0.15 + var/safe_toxins_max = 0.5 + var/safe_toxins_mask = 5 + var/SA_para_min = 1 + var/SA_sleep_min = 5 var/oxygen_used = 0 var/nitrogen_used = 0 - var/breath_pressure = (breath.total_moles*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME + var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME var/vox_oxygen_max = 1 // For vox. //Partial pressure of the O2 in our breath - var/O2_pp = (breath.gases[OXYGEN]/breath.total_moles)*breath_pressure + var/O2_pp = (breath.oxygen/breath.total_moles())*breath_pressure // Same, but for the toxins - var/Plasma_pp = (breath.gases[PLASMA]/breath.total_moles)*breath_pressure + var/Toxins_pp = (breath.toxins/breath.total_moles())*breath_pressure // And CO2, lets say a PP of more than 10 will be bad (It's a little less really, but eh, being passed out all round aint no fun) - var/CO2_pp = (breath.gases[CARBON_DIOXIDE]/breath.total_moles)*breath_pressure // Tweaking to fit the hacky bullshit I've done with atmo -- TLE + var/CO2_pp = (breath.carbon_dioxide/breath.total_moles())*breath_pressure // Tweaking to fit the hacky bullshit I've done with atmo -- TLE // Nitrogen, for Vox. - var/Nitrogen_pp = (breath.gases[NITROGEN]/breath.total_moles)*breath_pressure - - var/N2O_pp = (breath.gases[NITROUS_OXIDE]/breath.total_moles)*breath_pressure + var/Nitrogen_pp = (breath.nitrogen/breath.total_moles())*breath_pressure // TODO: Split up into Voxs' own proc. if(O2_pp < safe_oxygen_min && name != "Vox") // Too little oxygen @@ -203,7 +199,7 @@ var/global/list/whitelisted_species = list("Human") var/ratio = safe_oxygen_min/O2_pp H.adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS)) // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!) H.failed_last_breath = 1 - oxygen_used = breath.gases[OXYGEN]*ratio/6 + oxygen_used = breath.oxygen*ratio/6 else H.adjustOxyLoss(HUMAN_MAX_OXYLOSS) H.failed_last_breath = 1 @@ -216,7 +212,7 @@ var/global/list/whitelisted_species = list("Human") var/ratio = safe_oxygen_min/Nitrogen_pp H.adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS)) H.failed_last_breath = 1 - nitrogen_used = breath.gases[NITROGEN]*ratio/6 + nitrogen_used = breath.nitrogen*ratio/6 else H.adjustOxyLoss(HUMAN_MAX_OXYLOSS) H.failed_last_breath = 1 @@ -225,12 +221,12 @@ var/global/list/whitelisted_species = list("Human") else // We're in safe limits H.failed_last_breath = 0 H.adjustOxyLoss(-5) - oxygen_used = breath.gases[OXYGEN]/6 + oxygen_used = breath.oxygen/6 H.oxygen_alert = 0 - breath.adjust_gas(OXYGEN, -oxygen_used) - breath.adjust_gas(NITROGEN, -nitrogen_used) - breath.adjust_gas(CARBON_DIOXIDE, oxygen_used) + breath.oxygen -= oxygen_used + breath.nitrogen -= nitrogen_used + breath.carbon_dioxide += oxygen_used //CO2 does not affect failed_last_breath. So if there was enough oxygen in the air but too much co2, this will hurt you, but only once per 4 ticks, instead of once per tick. if(CO2_pp > safe_co2_max) @@ -247,13 +243,13 @@ var/global/list/whitelisted_species = list("Human") else H.co2overloadtime = 0 - if(Plasma_pp > safe_plasma_max) // Too much toxins - var/ratio = (breath.gases[PLASMA]/safe_plasma_max) * 10 + if(Toxins_pp > safe_toxins_max) // Too much toxins + var/ratio = (breath.toxins/safe_toxins_max) * 10 //adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) //Limit amount of damage toxin exposure can do per second if(H.wear_mask) if(H.wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT) - if(breath.gases[PLASMA] > safe_plasma_mask) - ratio = (breath.gases[PLASMA]/safe_plasma_mask) * 10 + if(breath.toxins > safe_toxins_mask) + ratio = (breath.toxins/safe_toxins_mask) * 10 else ratio = 0 if(ratio) @@ -261,20 +257,23 @@ var/global/list/whitelisted_species = list("Human") H.reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) H.toxins_alert = max(H.toxins_alert, 1) else if(O2_pp > vox_oxygen_max && name == "Vox") //Oxygen is toxic to vox. - var/ratio = (breath.gases[OXYGEN]/vox_oxygen_max) * 1000 + var/ratio = (breath.oxygen/vox_oxygen_max) * 1000 H.adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) H.toxins_alert = max(H.toxins_alert, 1) else H.toxins_alert = 0 - if(N2O_pp > N2O_para_min) // Enough to make us paralysed for a bit - H.Paralyse(3) // 3 gives them one second to wake up and run away a bit! - if(N2O_pp > N2O_sleep_min) // Enough to make us sleep as well - H.sleeping = min(H.sleeping+2, 10) - else if(N2O_pp > N2O_emote_min) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning - if(prob(20)) - spawn(0) H.emote(pick("giggle", "laugh")) - breath.adjust_gas(NITROUS_OXIDE, -breath.gases[NITROUS_OXIDE]) //purge it + if(breath.trace_gases.len) // If there's some other shit in the air lets deal with it here. + for(var/datum/gas/sleeping_agent/SA in breath.trace_gases) + var/SA_pp = (SA.moles/breath.total_moles())*breath_pressure + if(SA_pp > SA_para_min) // Enough to make us paralysed for a bit + H.Paralyse(3) // 3 gives them one second to wake up and run away a bit! + if(SA_pp > SA_sleep_min) // Enough to make us sleep as well + H.sleeping = min(H.sleeping+2, 10) + else if(SA_pp > 0.15) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning + if(prob(20)) + spawn(0) H.emote(pick("giggle", "laugh")) + SA.moles = 0 if( (abs(310.15 - breath.temperature) > 50) && !(M_RESIST_HEAT in H.mutations)) // Hot air hurts :( if(H.status_flags & GODMODE) return 1 //godmode @@ -535,8 +534,7 @@ var/global/list/whitelisted_species = list("Human") cold_level_3 = 0 eyes = "vox_eyes_s" - breath_type = NITROGEN - species_toxic_to_breathe = list(OXYGEN, PLASMA) + breath_type = "nitrogen" flags = IS_WHITELISTED | NO_SCAN diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index c2f59e5d003..4ad87c6d127 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -168,7 +168,7 @@ if(istype(T)) var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment if(G) - oxy=G.gases[OXYGEN] + oxy=G.oxygen if(oxy < 1 || fire_stacks <= 0) ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire return 1 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 07b94a82541..834d3f99fa1 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -79,7 +79,6 @@ var/list/ai_list = list() add_language(LANGUAGE_MONKEY, 1) add_language(LANGUAGE_VOX, 1) add_language(LANGUAGE_TRADEBAND, 1) - default_language = all_languages[LANGUAGE_SOL_COMMON] real_name = pickedName name = real_name anchored = 1 diff --git a/code/modules/mob/living/silicon/mommi/hud.dm b/code/modules/mob/living/silicon/mommi/hud.dm index afae69e33e1..9bd4b95beba 100644 --- a/code/modules/mob/living/silicon/mommi/hud.dm +++ b/code/modules/mob/living/silicon/mommi/hud.dm @@ -109,7 +109,7 @@ mymob.oxygen = new /obj/screen() mymob.oxygen.icon = 'icons/mob/screen1_robot.dmi' mymob.oxygen.icon_state = "oxy0" - mymob.oxygen.name = OXYGEN + mymob.oxygen.name = "oxygen" mymob.oxygen.screen_loc = ui_oxygen // Fire diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 01d5394aa1c..98df59728d6 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -50,8 +50,6 @@ var/obj/item/radio/integrated/signal/sradio // AI's signaller - var/obj/item/device/analyzer/analyzer = new //scanner for air - /mob/living/silicon/pai/New(var/obj/item/device/paicard) canmove = 0 diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 3ee492ebce0..e423fea0828 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -569,7 +569,28 @@ else var/datum/gas_mixture/environment = T.return_air() - dat += analyzer.output_gas_scan(environment, T, 1) + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles() + + dat += "Air Pressure: [round(pressure,0.1)] kPa
" + + if (total_moles) + var/o2_level = environment.oxygen/total_moles + var/n2_level = environment.nitrogen/total_moles + var/co2_level = environment.carbon_dioxide/total_moles + var/plasma_level = environment.toxins/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+plasma_level) + + // AUTOFIXED BY fix_string_idiocy.py + // C:\Users\Rob\Documents\Projects\vgstation13\code\modules\mob\living\silicon\pai\software.dm:547: dat += "Nitrogen: [round(n2_level*100)]%
" + dat += {"Nitrogen: [round(n2_level*100)]%
+ Oxygen: [round(o2_level*100)]%
+ Carbon Dioxide: [round(co2_level*100)]%
+ Plasma: [round(plasma_level*100)]%
"} + // END AUTOFIX + if(unknown_level > 0.01) + dat += "OTHER: [round(unknown_level)]%
" + dat += "Temperature: [round(environment.temperature-T0C)]°C
" // AUTOFIXED BY fix_string_idiocy.py // C:\Users\Rob\Documents\Projects\vgstation13\code\modules\mob\living\silicon\pai\software.dm:554: dat += "Refresh Reading
" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 33a5325d8fd..147ba6b00e9 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -147,7 +147,6 @@ cell_component.installed = 1 playsound(loc, startup_sound, 75, 1) - default_language = all_languages[LANGUAGE_SOL_COMMON] // setup the PDA and its name /mob/living/silicon/robot/proc/setup_PDA() @@ -506,7 +505,7 @@ var/obj/item/weapon/tank/jetpack/current_jetpack = installed_jetpack() if (current_jetpack) stat("Internal Atmosphere Info", current_jetpack.name) - stat("Tank Pressure", current_jetpack.air_contents.pressure) + stat("Tank Pressure", current_jetpack.air_contents.return_pressure()) // this function returns the robots jetpack, if one is installed diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 38ccb77fdab..0de3ef3fb85 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -57,8 +57,7 @@ ..() name = text("[initial(name)] ([rand(1, 1000)])") real_name = name - add_language(LANGUAGE_CULT) - default_language = all_languages[LANGUAGE_CULT] + add_language("Cult") for(var/spell in construct_spells) src.add_spell(new spell, "const_spell_ready") updateicon() diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider/base_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider/base_spider.dm index 6f95fe3600e..b4e28971eb4 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider/base_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider/base_spider.dm @@ -68,13 +68,13 @@ var/global/list/spider_types = typesof(/mob/living/simple_animal/hostile/giant_s if(!istype(lT) || !lT.zone) return 0 var/datum/gas_mixture/myenv=lT.return_air() - var/pressure=myenv.pressure + var/pressure=myenv.return_pressure() for(var/dir in cardinal) var/turf/simulated/T=get_turf(get_step(loc,dir)) if(T && istype(T) && T.zone) var/datum/gas_mixture/environment = T.return_air() - var/pdiff = abs(pressure - environment.pressure) + var/pdiff = abs(pressure - environment.return_pressure()) if(pdiff > SPIDER_MAX_PRESSURE_DIFF) return pdiff return 0 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index d56aa53e885..17a68adf949 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -205,41 +205,41 @@ bodytemperature += ((Environment.temperature - bodytemperature) / 5) if(min_oxy) - if(Environment.gases[OXYGEN] < min_oxy) + if(Environment.oxygen < min_oxy) atmos_suitable = 0 oxygen_alert = 1 else oxygen_alert = 0 if(max_oxy) - if(Environment.gases[OXYGEN] > max_oxy) + if(Environment.oxygen > max_oxy) atmos_suitable = 0 if(min_tox) - if(Environment.gases[PLASMA] < min_tox) + if(Environment.toxins < min_tox) atmos_suitable = 0 if(max_tox) - if(Environment.gases[PLASMA] > max_tox) + if(Environment.toxins > max_tox) atmos_suitable = 0 toxins_alert = 1 else toxins_alert = 0 if(min_n2) - if(Environment.gases[NITROGEN] < min_n2) + if(Environment.nitrogen < min_n2) atmos_suitable = 0 if(max_n2) - if(Environment.gases[NITROGEN] > max_n2) + if(Environment.nitrogen > max_n2) atmos_suitable = 0 if(min_co2) - if(Environment.gases[CARBON_DIOXIDE] < min_co2) + if(Environment.carbon_dioxide < min_co2) atmos_suitable = 0 if(max_co2) - if(Environment.gases[CARBON_DIOXIDE] > max_co2) + if(Environment.carbon_dioxide > max_co2) atmos_suitable = 0 //Atmos effect diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index beab61c1a22..1a77cd57b34 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -66,11 +66,15 @@ // AUTOFIXED BY fix_string_idiocy.py // C:\Users\Rob\Documents\Projects\vgstation13\code\modules\mob\mob.dm:25: t+= " Temperature: [environment.temperature] \n" - t += {" Temperature: [environment.temperature] \n"} - for(var/gasid in environment.gases) - var/datum/gas/gas = environment.get_gas_by_id(gasid) - t += {" [gas.display_name]: [environment.gases[gasid]] \n"} + t += {" Temperature: [environment.temperature] \n + Nitrogen: [environment.nitrogen] \n + Oxygen: [environment.oxygen] \n + Plasma : [environment.toxins] \n + Carbon Dioxide: [environment.carbon_dioxide] \n"} // END AUTOFIX + for(var/datum/gas/trace_gas in environment.trace_gases) + usr << " [trace_gas.type]: [trace_gas.moles] \n" + usr.show_message(t, 1) /mob/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 2451e0119b1..f5d7344823b 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -75,8 +75,8 @@ lastgen = 0 if(air1 && air2) - var/air1_heat_capacity = air1.heat_capacity - var/air2_heat_capacity = air2.heat_capacity + var/air1_heat_capacity = air1.heat_capacity() + var/air2_heat_capacity = air2.heat_capacity() var/delta_temperature = abs(air2.temperature - air1.temperature) if(delta_temperature > 0 && air1_heat_capacity > 0 && air2_heat_capacity > 0) @@ -86,11 +86,11 @@ lastgen = energy_transfer*efficiency*0.05 if(air2.temperature > air1.temperature) - air2.set_temperature(air2.temperature - energy_transfer/air2_heat_capacity) - air1.set_temperature(air1.temperature + heat/air1_heat_capacity) + air2.temperature = air2.temperature - energy_transfer/air2_heat_capacity + air1.temperature = air1.temperature + heat/air1_heat_capacity else - air2.set_temperature(air2.temperature + heat/air2_heat_capacity) - air1.set_temperature(air1.temperature - energy_transfer/air1_heat_capacity) + air2.temperature = air2.temperature + heat/air2_heat_capacity + air1.temperature = air1.temperature - energy_transfer/air1_heat_capacity //Transfer the air circ1.air2.merge(air1) @@ -152,14 +152,14 @@ // C:\Users\Rob\Documents\Projects\vgstation13\code\modules\power\generator.dm:142: t += "Output : [round(lastgen)] W

" t += {"Output : [round(lastgen)] W
Primary Circulator (top or right) -Inlet Pressure: [round(circ1.air1.pressure, 0.1)] kPa +Inlet Pressure: [round(circ1.air1.return_pressure(), 0.1)] kPa Inlet Temperature: [round(circ1.air1.temperature, 0.1)] K -Outlet Pressure: [round(circ1.air2.pressure, 0.1)] kPa +Outlet Pressure: [round(circ1.air2.return_pressure(), 0.1)] kPa Outlet Temperature: [round(circ1.air2.temperature, 0.1)] K
Secondary Circulator (bottom or left)
-Inlet Pressure: [round(circ2.air1.pressure, 0.1)] kPa +Inlet Pressure: [round(circ2.air1.return_pressure(), 0.1)] kPa Inlet Temperature: [round(circ2.air1.temperature, 0.1)] K -Outlet Pressure: [round(circ2.air2.pressure, 0.1)] kPa +Outlet Pressure: [round(circ2.air2.return_pressure(), 0.1)] kPa Outlet Temperature: [round(circ2.air2.temperature, 0.1)] K
"} // END AUTOFIX else diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm index f6cfd4136ec..507fb6030f0 100644 --- a/code/modules/power/generator_type2.dm +++ b/code/modules/power/generator_type2.dm @@ -41,8 +41,8 @@ hot_air = air2 cold_air = air1 - var/hot_air_heat_capacity = hot_air.heat_capacity - var/cold_air_heat_capacity = cold_air.heat_capacity + var/hot_air_heat_capacity = hot_air.heat_capacity() + var/cold_air_heat_capacity = cold_air.heat_capacity() var/delta_temperature = hot_air.temperature - cold_air.temperature @@ -54,8 +54,8 @@ var/heat = energy_transfer*(1-efficiency) lastgen = energy_transfer*efficiency - hot_air.set_temperature(hot_air.temperature - energy_transfer/hot_air_heat_capacity) - cold_air.set_temperature(cold_air.temperature + heat/cold_air_heat_capacity) + hot_air.temperature = hot_air.temperature - energy_transfer/hot_air_heat_capacity + cold_air.temperature = cold_air.temperature + heat/cold_air_heat_capacity //world << "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]" @@ -93,7 +93,7 @@ return {"Cold Loop ([dir2text(loop_dir)])
  • Temperature: [round(loop.air_contents.temperature, 0.1)] K
    • -
  • Pressure: [round(loop.air_contents.pressure, 0.1)] kPa
    • +
  • Pressure: [round(loop.air_contents.return_pressure(), 0.1)] kPa
"} /obj/machinery/power/generator/type2/interact(mob/user) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index b15c7123bf3..8f655640a30 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -30,14 +30,15 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector/process() if (P) - if (P.air_contents.gases[PLASMA] <= 0) + if (P.air_contents.toxins <= 0) investigation_log(I_SINGULO,"out of fuel.") - P.air_contents.adjust_gas(PLASMA, -P.air_contents.gases[PLASMA]) //set it to 0 + P.air_contents.toxins = 0 eject() else if(!active) return else - P.air_contents.adjust_gas(PLASMA, (0.001 * drain_ratio)) //updates automatically + P.air_contents.toxins -= (0.001 * drain_ratio) + P.air_contents.update_values() /obj/machinery/power/rad_collector/attack_hand(mob/user as mob) if(anchored) @@ -45,7 +46,7 @@ var/global/list/rad_collectors = list() toggle_power() user.visible_message("[user] turns the [src] [active? "on":"off"].", \ "You turn the [src] [active? "on":"off"].") - investigation_log(I_SINGULO,"turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.gases[PLASMA]/0.29)]%":"It is empty"].") + investigation_log(I_SINGULO,"turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.toxins/0.29)]%":"It is empty"].") return else user << "The controls are locked!" @@ -127,7 +128,7 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector/proc/receive_pulse(const/pulse_strength) if (P && active) - var/power_produced = P.air_contents.gases[PLASMA] * pulse_strength * 3.5 // original was 20, nerfed to 2 now 3.5 should get you about 500kw + var/power_produced = P.air_contents.toxins * pulse_strength * 3.5 // original was 20, nerfed to 2 now 3.5 should get you about 500kw add_avail(power_produced) last_power = power_produced diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 0b97712f0d1..d2fecf576b4 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -20,7 +20,7 @@ var/shot_number = 0 var/locked = 0 - machine_flags = EMAGGABLE | WRENCHMOVE | FIXED2WORK | WELD_FIXED | MULTITOOL_MENU + machine_flags = EMAGGABLE | WRENCHMOVE | FIXED2WORK | WELD_FIXED var/frequency = 0 var/id_tag = null @@ -249,9 +249,11 @@ return -1 /obj/machinery/power/emitter/attackby(obj/item/W, mob/user) - . = ..() - if(.) - return . + if(..()) + return 1 + + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) if(emagged) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index afc5d592aca..3bb6f289367 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -67,7 +67,7 @@ return rpm = 0.9* rpm + 0.1 * rpmtarget var/datum/gas_mixture/environment = inturf.return_air() - var/transfer_moles = environment.total_moles/10 + var/transfer_moles = environment.total_moles()/10 //var/transfer_moles = rpm/10000*capacity var/datum/gas_mixture/removed = inturf.remove_air(transfer_moles) gas_contained.merge(removed) @@ -123,14 +123,14 @@ lastgen = ((compressor.rpm / TURBGENQ)**TURBGENG) *TURBGENQ add_avail(lastgen) - var/newrpm = ((compressor.gas_contained.temperature) * compressor.gas_contained.total_moles)/4 + var/newrpm = ((compressor.gas_contained.temperature) * compressor.gas_contained.total_moles())/4 newrpm = max(0, newrpm) if(!compressor.starter || newrpm > 1000) compressor.rpmtarget = newrpm - if(compressor.gas_contained.total_moles>0) - var/oamount = min(compressor.gas_contained.total_moles, (compressor.rpm+100)/35000*compressor.capacity) + if(compressor.gas_contained.total_moles()>0) + var/oamount = min(compressor.gas_contained.total_moles(), (compressor.rpm+100)/35000*compressor.capacity) var/datum/gas_mixture/removed = compressor.gas_contained.remove(oamount) outturf.assume_air(removed) diff --git a/code/modules/projectiles/guns/projectile/pneumatic.dm b/code/modules/projectiles/guns/projectile/pneumatic.dm index 81f5e4d97fc..71f2872ddcc 100644 --- a/code/modules/projectiles/guns/projectile/pneumatic.dm +++ b/code/modules/projectiles/guns/projectile/pneumatic.dm @@ -64,7 +64,7 @@ ..() user << "The valve is dialed to [pressure_setting]%." if(tank) - user << "The tank dial reads [tank.air_contents.pressure] kPa." + user << "The tank dial reads [tank.air_contents.return_pressure()] kPa." else user << "Nothing is attached to the tank valve!" @@ -114,7 +114,7 @@ if (!istype(targloc) || !istype(curloc)) return - var/fire_pressure = (tank.air_contents.pressure/100)*pressure_setting + var/fire_pressure = (tank.air_contents.return_pressure()/100)*pressure_setting if (fire_pressure < minimum_tank_pressure) user << "There isn't enough gas in the tank to fire [src]." diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index add440047e7..9a6e360a925 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -11,7 +11,7 @@ wabbajack(change) -/obj/item/projectile/change/proc/wabbajack(var/mob/living/M) //WHY: as mob in living_mob_list +/obj/item/projectile/change/proc/wabbajack(var/mob/M) //WHY: as mob in living_mob_list if(istype(M, /mob/living) && M.stat != DEAD) if(M.monkeyizing) return @@ -53,9 +53,7 @@ switch(randomize) if("monkey") new_mob = new /mob/living/carbon/monkey(M.loc) - var/mob/living/carbon/monkey/Monkey = new_mob - Monkey.languages |= M.languages - if(M.default_language) Monkey.default_language = M.default_language + new_mob.languages |= M.languages if("robot") new_mob = new /mob/living/silicon/robot(M.loc) new_mob.setGender(M.gender) @@ -64,8 +62,7 @@ var/mob/living/silicon/robot/Robot = new_mob Robot.mmi = new /obj/item/device/mmi(new_mob) Robot.mmi.transfer_identity(M) //Does not transfer key/client. - Robot.languages |= M.languages - if(M.default_language) Robot.default_language = M.default_language + new_mob.languages |= M.languages if("mommi") new_mob = new /mob/living/silicon/robot/mommi(M.loc) new_mob.setGender(M.gender) @@ -74,8 +71,6 @@ var/mob/living/silicon/robot/mommi/MoMMI = new_mob MoMMI.mmi = new /obj/item/device/mmi(new_mob) MoMMI.mmi.transfer_identity(M) //Does not transfer key/client. - MoMMI.languages |= M.languages - if(M.default_language) MoMMI.default_language = M.default_language if("slime") var/slimey = pick("",\ "/purple",\ @@ -105,9 +100,7 @@ slimey = text2path("/mob/living/carbon/slime[slimey]") new_mob = new slimey(M.loc) - var/mob/living/carbon/slime/Slime = new_mob - Slime.languages |= M.languages - if(M.default_language) Slime.default_language = M.default_language + new_mob.languages |= M.languages if("xeno") var/alien_caste = pick("Hunter","Sentinel","Drone","Larva") switch(alien_caste) @@ -115,9 +108,7 @@ if("Sentinel") new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc) if("Drone") new_mob = new /mob/living/carbon/alien/humanoid/drone(M.loc) else new_mob = new /mob/living/carbon/alien/larva(M.loc) - var/mob/living/carbon/alien/Alien = new_mob - Alien.languages |= M.languages - if(M.default_language) Alien.default_language = M.default_language + new_mob.languages |= M.languages if("human") new_mob = new /mob/living/carbon/human(M.loc, delay_ready_dna=1) @@ -130,8 +121,6 @@ var/newspecies = pick(all_species) H.set_species(newspecies) H.generate_name() - H.languages |= M.languages - if(M.default_language) H.default_language = M.default_language if("furry") new_mob = new /mob/living/carbon/human(M.loc, delay_ready_dna=1) @@ -142,8 +131,6 @@ var/mob/living/carbon/human/H = new_mob H.set_species("Tajaran") // idfk - H.languages |= M.languages - if(M.default_language) H.default_language = M.default_language H.generate_name() /* RIP if("cluwne") diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 891df36dcd7..5b4ccfff401 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -195,7 +195,7 @@ obj/item/projectile/kinetic/New() if(!istype(proj_turf, /turf)) return var/datum/gas_mixture/environment = proj_turf.return_air() - var/pressure = environment.pressure + var/pressure = environment.return_pressure() if(pressure < 50) name = "full strength kinetic force" damage = 30 diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 634674a33b6..01709c333b2 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -29,7 +29,7 @@ datum //Chemical Reactions - Initialises all /datum/chemical_reaction into a list // It is filtered into multiple lists within a list. // For example: - // chemical_reaction_list[PLASMA] is a list of all reactions relating to plasma + // chemical_reaction_list["plasma"] is a list of all reactions relating to plasma chemical_reactions_list = list() diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 38fd52e19d5..6a646bf7880 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -316,8 +316,8 @@ var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) - var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles ) - lowertemp.set_temperature( Clamp(lowertemp.temperature-2000, 0, lowertemp.temperature / 2) ) + var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() ) + lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) lowertemp.react() T.assume_air(lowertemp) qdel(hotspot) @@ -328,8 +328,8 @@ var/turf/T = get_turf(O) var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) - var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles ) - lowertemp.set_temperature( Clamp(lowertemp.temperature-2000, 0, lowertemp.temperature / 2) ) + var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() ) + lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) lowertemp.react() T.assume_air(lowertemp) qdel(hotspot) @@ -1616,13 +1616,17 @@ var/turf/the_turf = get_turf(O) if(!the_turf) return 0 var/datum/gas_mixture/napalm = new - napalm.set_gas(VOLATILE_FUEL, 5, 0) + var/datum/gas/volatile_fuel/fuel = new + fuel.moles = 5 + napalm.trace_gases += fuel the_turf.assume_air(napalm) /datum/reagent/plasma/reaction_turf(var/turf/T, var/volume) src = null var/datum/gas_mixture/napalm = new - napalm.set_gas(VOLATILE_FUEL, 5, 0) + var/datum/gas/volatile_fuel/fuel = new + fuel.moles = 5 + napalm.trace_gases += fuel T.assume_air(napalm) return @@ -2889,8 +2893,8 @@ T.wet(800) var/hotspot = (locate(/obj/fire) in T) if(hotspot) - var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles ) - lowertemp.set_temperature( Clamp(lowertemp.temperature-2000, 0, lowertemp.temperature / 2) ) + var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() ) + lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) lowertemp.react() T.assume_air(lowertemp) del(hotspot) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index f49bb2c0af2..5f57f4a606f 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -467,8 +467,12 @@ datum for(var/turf/simulated/floor/target_tile in range(0,location)) var/datum/gas_mixture/napalm = new - napalm.set_temperature(400+T0C) - napalm.set_gas(VOLATILE_FUEL, created_volume) + var/datum/gas/volatile_fuel/fuel = new + fuel.moles = created_volume + napalm.trace_gases += fuel + + napalm.temperature = 400+T0C + napalm.update_values() target_tile.assume_air(napalm) spawn (0) target_tile.hotspot_expose(700, 400,surfaces=1) @@ -1415,8 +1419,8 @@ datum var/datum/gas_mixture/napalm = new - napalm.set_gas(PLASMA, 25) - napalm.set_temperature(1400) + napalm.toxins = 25 + napalm.temperature = 1400 target_tile.assume_air(napalm) spawn (0) target_tile.hotspot_expose(700, 400,surfaces=1) @@ -2539,4 +2543,4 @@ datum name = "Tide" id = "greytea" result = "greytea" - required_reagents = list("water" = 5, "fuel" = 5) + required_reagents = list("water" = 5, "fuel" = 5) \ No newline at end of file diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 7871dce66ff..313b249021e 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -24,7 +24,7 @@ var/frequency = 1367 var/datum/radio_frequency/radio_connection - machine_flags = SCREWTOGGLE | CROWDESTROY | MULTITOOL_MENU + machine_flags = SCREWTOGGLE | CROWDESTROY /obj/machinery/conveyor/centcom_auto id_tag = "round_end_belt" @@ -188,6 +188,9 @@ . = ..() if(.) return . + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 user.drop_item(W, src.loc) return 0 @@ -289,7 +292,6 @@ var/frequency = 1367 var/datum/radio_frequency/radio_connection - machine_flags = MULTITOOL_MENU anchored = 1 @@ -377,9 +379,9 @@ radio_connection.post_signal(src, signal, range = CONVEYOR_CONTROL_RANGE) /obj/machinery/conveyor_switch/attackby(var/obj/item/W, mob/user) - . = ..() - if(.) - return . + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 if(istype(W, /obj/item/weapon/wrench)) user << "Deconstructing \the [src]..." if(do_after(user,50)) @@ -390,6 +392,7 @@ new /obj/item/stack/rods(T,1) del(src) return 1 + return ..() /obj/machinery/conveyor_switch/oneway var/convdir = 1 //Set to 1 or -1 depending on which way you want the conveyor to go. (In other words keep at 1 and set the proper dir on the belts.) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index bef779cd7d3..85ce36f28dc 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -216,7 +216,7 @@ /obj/machinery/disposal/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/list/data[0] - data["pressure"] = round(100 * air_contents.pressure / (SEND_PRESSURE)) + data["pressure"] = round(100 * air_contents.return_pressure() / (SEND_PRESSURE)) data["flush"] = flush data["mode"] = mode data["isAI"] = isAI(user) @@ -325,7 +325,7 @@ src.updateDialog() - if(flush && air_contents.pressure >= SEND_PRESSURE ) // flush can happen even without power + if(flush && air_contents.return_pressure() >= SEND_PRESSURE ) // flush can happen even without power spawn(0) flush() @@ -343,7 +343,7 @@ var/atom/L = loc // recharging from loc turf var/datum/gas_mixture/env = L.return_air() - var/pressure_delta = (SEND_PRESSURE*1.01) - air_contents.pressure + var/pressure_delta = (SEND_PRESSURE*1.01) - air_contents.return_pressure() if(env.temperature > 0) var/transfer_moles = 0.1 * pressure_delta*air_contents.volume/(env.temperature * R_IDEAL_GAS_EQUATION) @@ -354,7 +354,7 @@ // if full enough, switch to ready mode - if(air_contents.pressure >= SEND_PRESSURE) + if(air_contents.return_pressure() >= SEND_PRESSURE) mode = 2 update_icon() return diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 5a0d647fa90..7f7e805bf68 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -113,16 +113,16 @@ var/datum/gas_mixture/env = L.return_air() if(env.temperature < (heat_amt+T0C)) - var/transfer_moles = 0.25 * env.total_moles + var/transfer_moles = 0.25 * env.total_moles() var/datum/gas_mixture/removed = env.remove(transfer_moles) if(removed) - var/heat_capacity = removed.heat_capacity + var/heat_capacity = removed.heat_capacity() if(heat_capacity == 0 || heat_capacity == null) heat_capacity = 1 - removed.set_temperature(min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000)) + removed.temperature = min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000) env.merge(removed) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index da2db20e1d6..77bc9e7f7d3 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -152,13 +152,13 @@ var/list/valid_secondary_effect_types = list(\ else if(env.temperature > 375) trigger_hot = 1 - if(env.gases[PLASMA] >= 10) + if(env.toxins >= 10) trigger_plasma = 1 - if(env.gases[OXYGEN] >= 10) + if(env.oxygen >= 10) trigger_oxy = 1 - if(env.gases[CARBON_DIOXIDE] >= 10) + if(env.carbon_dioxide >= 10) trigger_co2 = 1 - if(env.gases[NITROGEN] >= 10) + if(env.nitrogen >= 10) trigger_nitro = 1 //COLD ACTIVATION diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm index 96cf5656eec..fcdb163ac79 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm @@ -14,10 +14,10 @@ if(holder) var/datum/gas_mixture/env = holder.loc.return_air() if(env) - env.set_temperature(env.temperature - rand(5,50)) + env.temperature = max(env.temperature - rand(5,50), 0) /datum/artifact_effect/cold/DoEffectAura() if(holder) var/datum/gas_mixture/env = holder.loc.return_air() if(env && env.temperature > target_temp) - env.set_temperature(env.temperature - pick(0, 0, 1)) + env.temperature -= pick(0, 0, 1) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gas.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gas.dm deleted file mode 100644 index 303c8524555..00000000000 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gas.dm +++ /dev/null @@ -1,45 +0,0 @@ -/datum/artifact_effect/gas - effecttype = "gas" - var/max_pressure - - var/produced_gas = OXYGEN //the gas id - -/datum/artifact_effect/gas/New() - ..() - effect = pick(EFFECT_TOUCH, EFFECT_AURA) - max_pressure = rand(115,1000) - effect_type = pick(6,7) - //effecttype = "gas[produced_gas]" //generate the id - - -/datum/artifact_effect/gas/DoEffectTouch(var/mob/user) - if(holder) - var/datum/gas_mixture/env = holder.loc.return_air() - if(env) - env.adjust_gas(produced_gas, rand(2,15), 1, 0) - -/datum/artifact_effect/gas/DoEffectAura() - if(holder) - var/datum/gas_mixture/env = holder.loc.return_air() - if(env && env.total_moles() < max_pressure) - env.adjust_gas(produced_gas, pick(0, 0, 0.1, rand()), 1, 0) - -/datum/artifact_effect/gas/oxy - effecttype = "gasoxy" - produced_gas = OXYGEN - -/datum/artifact_effect/gas/co2 - effecttype = "gasco2" - produced_gas = CARBON_DIOXIDE - -/datum/artifact_effect/gas/nitro - effecttype = "gasnitro" - produced_gas = NITROGEN - -/datum/artifact_effect/gas/plasma - effecttype = "gasplasma" - produced_gas = PLASMA - -/datum/artifact_effect/gas/sleeping - effecttype = "gassleeping" - produced_gas = NITROUS_OXIDE diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasco2.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasco2.dm new file mode 100644 index 00000000000..c9cafa4e718 --- /dev/null +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasco2.dm @@ -0,0 +1,26 @@ + +/datum/artifact_effect/gasco2 + effecttype = "gasco2" + var/max_pressure + var/target_percentage + +/datum/artifact_effect/heat/New() + ..() + effect_type = pick(6,7) + +/datum/artifact_effect/gasco2/New() + ..() + effect = pick(EFFECT_TOUCH, EFFECT_AURA) + max_pressure = rand(115,1000) + +/datum/artifact_effect/gasco2/DoEffectTouch(var/mob/user) + if(holder) + var/datum/gas_mixture/env = holder.loc.return_air() + if(env) + env.carbon_dioxide += rand(2,15) + +/datum/artifact_effect/gasco2/DoEffectAura() + if(holder) + var/datum/gas_mixture/env = holder.loc.return_air() + if(env && env.total_moles < max_pressure) + env.carbon_dioxide += pick(0, 0, 0.1, rand()) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasnitro.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasnitro.dm new file mode 100644 index 00000000000..527c2592aa9 --- /dev/null +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasnitro.dm @@ -0,0 +1,23 @@ + +/datum/artifact_effect/gasnitro + effecttype = "gasnitro" + var/max_pressure + var/target_percentage + +/datum/artifact_effect/gasnitro/New() + ..() + effect = pick(EFFECT_TOUCH, EFFECT_AURA) + effect_type = pick(6,7) + max_pressure = rand(115,1000) + +/datum/artifact_effect/gasnitro/DoEffectTouch(var/mob/user) + if(holder) + var/datum/gas_mixture/env = holder.loc.return_air() + if(env) + env.nitrogen += rand(2,15) + +/datum/artifact_effect/gasnitro/DoEffectAura() + if(holder) + var/datum/gas_mixture/env = holder.loc.return_air() + if(env && env.total_moles < max_pressure) + env.nitrogen += pick(0, 0, 0.1, rand()) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasoxy.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasoxy.dm new file mode 100644 index 00000000000..d0daa6951fb --- /dev/null +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasoxy.dm @@ -0,0 +1,23 @@ + +/datum/artifact_effect/gasoxy + effecttype = "gasoxy" + var/max_pressure + +/datum/artifact_effect/gasoxy/New() + ..() + effect = pick(EFFECT_TOUCH, EFFECT_AURA) + max_pressure = rand(115,1000) + effect_type = pick(6,7) + + +/datum/artifact_effect/gasoxy/DoEffectTouch(var/mob/user) + if(holder) + var/datum/gas_mixture/env = holder.loc.return_air() + if(env) + env.oxygen += rand(2,15) + +/datum/artifact_effect/gasoxy/DoEffectAura() + if(holder) + var/datum/gas_mixture/env = holder.loc.return_air() + if(env && env.total_moles < max_pressure) + env.oxygen += pick(0, 0, 0.1, rand()) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasplasma.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasplasma.dm new file mode 100644 index 00000000000..c375e746e28 --- /dev/null +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasplasma.dm @@ -0,0 +1,23 @@ + +/datum/artifact_effect/gasplasma + effecttype = "gasplasma" + var/max_pressure + var/target_percentage + +/datum/artifact_effect/gasplasma/New() + ..() + effect = pick(EFFECT_TOUCH, EFFECT_AURA) + max_pressure = rand(115,1000) + effect_type = pick(6,7) + +/datum/artifact_effect/gasplasma/DoEffectTouch(var/mob/user) + if(holder) + var/datum/gas_mixture/env = holder.loc.return_air() + if(env) + env.toxins += rand(2,15) + +/datum/artifact_effect/gasplasma/DoEffectAura() + if(holder) + var/datum/gas_mixture/env = holder.loc.return_air() + if(env && env.total_moles < max_pressure) + env.toxins += pick(0, 0, 0.1, rand()) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gassleeping.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gassleeping.dm new file mode 100644 index 00000000000..5ce5256736c --- /dev/null +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gassleeping.dm @@ -0,0 +1,31 @@ + +/datum/artifact_effect/gassleeping + effecttype = "gassleeping" + var/max_pressure + var/target_percentage + +/datum/artifact_effect/gassleeping/New() + ..() + effect = pick(EFFECT_TOUCH, EFFECT_AURA) + max_pressure = rand(115,1000) + effect_type = pick(6,7) + +/datum/artifact_effect/gassleeping/DoEffectTouch(var/mob/user) + if(holder) + var/datum/gas_mixture/env = holder.loc.return_air() + if(env) + var/datum/gas/sleeping_agent/trace_gas = new + env.trace_gases += trace_gas + trace_gas.moles = rand(2,15) + env.update_values() + + +/datum/artifact_effect/gassleeping/DoEffectAura() + if(holder) + var/datum/gas_mixture/env = holder.loc.return_air() + if(env && env.total_moles < max_pressure) + var/datum/gas/sleeping_agent/trace_gas = new + env.trace_gases += trace_gas + trace_gas.moles = pick(0, 0, 0.1, rand()) + env.update_values() + diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm index 1feb7fc6ebc..da59078a1b9 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm @@ -17,10 +17,10 @@ if(holder) var/datum/gas_mixture/env = holder.loc.return_air() if(env) - env.set_temperature(env.temperature + rand(5,50)) + env.temperature += rand(5,50) /datum/artifact_effect/heat/DoEffectAura() if(holder) var/datum/gas_mixture/env = holder.loc.return_air() if(env && env.temperature < target_temp) - env.set_temperature(env.temperature + pick(0, 0, 1)) + env.temperature += pick(0, 0, 1) diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_base.dm b/code/modules/research/xenoarchaeology/machinery/analysis_base.dm index 79ac242b1f4..90bbc93ce36 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_base.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_base.dm @@ -69,22 +69,22 @@ //Add 3000 joules when active. This is about 0.6 degrees per tick. //May need adjustment - if(use_power == 1 && loc) + if(use_power == 1) var/heat_added = active_power_usage *XENOARCH_HEAT_COEFFICIENT if(temperature < max_temp) temperature += heat_added/XENOARCH_HEAT_CAPACITY var/temperature_difference = abs(environmental_temp-temperature) - var/datum/gas_mixture/removed = env.remove(env.total_moles*0.25) - var/heat_capacity = removed.heat_capacity + var/datum/gas_mixture/removed = loc.remove_air(env.total_moles*0.25) + var/heat_capacity = removed.heat_capacity() heat_added = max(temperature_difference*heat_capacity, XENOARCH_MAX_ENERGY_TRANSFER) if(temperature > environmental_temp) //cool down to match the air temperature = max(TCMB, temperature - heat_added/XENOARCH_HEAT_CAPACITY) - removed.set_temperature(max(TCMB, removed.temperature + heat_added/heat_capacity)) + removed.temperature = max(TCMB, removed.temperature + heat_added/heat_capacity) if(temperature_difference > 10 && prob(5)) src.visible_message("\icon[src] hisses softly.", 2) @@ -92,7 +92,7 @@ else //heat up to match the air temperature = max(TCMB, temperature + heat_added/XENOARCH_HEAT_CAPACITY) - removed.set_temperature(max(TCMB, removed.temperature - heat_added/heat_capacity)) + removed.temperature = max(TCMB, removed.temperature - heat_added/heat_capacity) if(temperature_difference > 10 && prob(5)) src.visible_message("\icon[src] plinks quietly.", 2) diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index 54d4cd9dbbf..a44b999cfde 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -66,7 +66,6 @@ //Add types to this list so it doesn't make a message or get desroyed by the Supermatter on touch. var/list/message_exclusions = list(/obj/effect/effect/sparks) - machine_flags = MULTITOOL_MENU /obj/machinery/power/supermatter/shard //Small subtype, less efficient and more sensitive, but less boom. name = "Supermatter Shard" @@ -228,7 +227,7 @@ damage = max( damage + ( (removed.temperature - 800) / 150 ) , 0 ) //Ok, 100% oxygen atmosphere = best reaction //Maxes out at 100% oxygen pressure - oxygen = Clamp((removed.gases[OXYGEN] - (removed.gases[NITROGEN] * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 0, 1) + oxygen = max(min((removed.oxygen - (removed.nitrogen * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 1), 0) var/temp_factor = 100 @@ -254,14 +253,16 @@ //Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock //is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall. - removed.set_temperature(removed.temperature + (device_energy / THERMAL_RELEASE_MODIFIER)) + removed.temperature += (device_energy / THERMAL_RELEASE_MODIFIER) - removed.set_temperature(Clamp(removed.temperature, 0, 2500)) + removed.temperature = max(0, min(removed.temperature, 2500)) //Calculate how much gas to release - removed.adjust_gas(PLASMA, max(device_energy / PLASMA_RELEASE_MODIFIER, 0)) + removed.toxins += max(device_energy / PLASMA_RELEASE_MODIFIER, 0) - removed.adjust_gas(OXYGEN, max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)) + removed.oxygen += max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0) + + removed.update_values() env.merge(removed) @@ -338,9 +339,9 @@ return /obj/machinery/power/supermatter/attackby(obj/item/weapon/W as obj, mob/living/user as mob) - . = ..() - if(.) - return . + if(istype(W, /obj/item/device/multitool)) + update_multitool_menu(user) + return 1 user.visible_message("\The [user] touches \a [W] to \the [src] as a silence fills the room...",\ "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\ diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index 9ab1cfc823d..1d87754669d 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -391,12 +391,12 @@ return var/datum/gas_mixture/GM = new if(prob(10)) - GM.adjust_gas(PLASMA, 100, 0) + GM.toxins += 100 //GM.temperature = 1500+T0C //should be enough to start a fire mob << "You exhale a large plume of toxic gas!" else - GM.adjust_gas(PLASMA, 10, 0) - GM.set_temperature(istype(T) ? T.air.temperature : T20C) + GM.toxins += 10 + GM.temperature = istype(T) ? T.air.temperature : T20C mob << " A toxic gas emanates from your pores!" T.assume_air(GM) return diff --git a/code/setup.dm b/code/setup.dm index f6d675cceb5..bad2da6a314 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -25,29 +25,6 @@ var/global/disable_vents = 0 #define CELL_VOLUME 2500 //liters in a cell #define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) //moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC -/////GAS FLAGS & DEFINES////// - -#define SPECIFIC_HEAT_AIR 20 -#define SPECIFIC_HEAT_CDO 30 -#define SPECIFIC_HEAT_PLASMA 200 -#define SPECIFIC_HEAT_NIO 40 - -#define IS_FUEL 1 //if it burns in a fire -#define IS_OXIDISER 2 //if it acts like oxygen for a fire -#define ALWAYS_SHOW 4 //if the scanner will record its level even if it isn't there - oxygen and nitrogen do this -#define AUTO_FILTERED 8 //if portable scrubbers and whatnot filter it by default -#define AUTO_LOGGING 16 //if we monitor its transfer. This is used for canisters - -#define OXYGEN "oxygen" -#define NITROGEN "nitrogen" -#define CARBON_DIOXIDE "carbon_dioxide" -#define PLASMA "plasma" -#define NITROUS_OXIDE "nitrous_oxide" -#define VOLATILE_FUEL "volatile_fuel" -//#define OXYGEN_AGENT_B "oxygen_agent_b" - -///////END GASES///////// - #define O2STANDARD 0.21 #define N2STANDARD 0.79 @@ -55,7 +32,6 @@ var/global/disable_vents = 0 #define MOLES_N2STANDARD MOLES_CELLSTANDARD*N2STANDARD // N2 standard value (79%) #define MOLES_PLASMA_VISIBLE 0.7 //Moles in a standard cell after which plasma is visible -#define MOLES_N2O_VISIBLE 1 #define MIN_PLASMA_DAMAGE 1 #define MAX_PLASMA_DAMAGE 10 @@ -986,7 +962,6 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse #define FIXED2WORK 16 //does it need to be anchored to work? Try to use this with WRENCHMOVE - hooks into power code #define EJECTNOTDEL 32 //when we destroy the machine, does it remove all its items or destroy them? #define WELD_FIXED 64 //if it is attacked by a welder and is anchored, it'll toggle between welded and unwelded to the floor -#define MULTITOOL_MENU 128 //if it has multitool menu functionality inherently #define MAX_N_OF_ITEMS 999 // Used for certain storage machinery, BYOND infinite loop detector doesn't look things over 1000. @@ -1177,12 +1152,11 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse #define LANGUAGE_CLATTER "Clatter" #define LANGUAGE_MONKEY "Monkey" #define LANGUAGE_VOX "Vox-pidgin" -#define LANGUAGE_CULT "Cult" //#define SAY_DEBUG 0 #ifdef SAY_DEBUG #warning SOME ASSHOLE FORGOT TO COMMENT SAY_DEBUG BEFORE COMMITTING #define say_testing(a,x) a << ("([__FILE__]L[__LINE__] SAYDEBUG) [x]") #else - #define say_testing(a,x) null << "[x][a]" -#endif \ No newline at end of file + #define say_testing(a,x) +#endif diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index 576d8f08388..1bf56379426 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi index 9c42f4f8b5c..691f53a76f3 100644 Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi index ace091594fe..e9e4eddc0a6 100644 Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ diff --git a/maps/defficiency.dmm b/maps/defficiency.dmm index 0395de3b275..10cbb4fa17c 100644 --- a/maps/defficiency.dmm +++ b/maps/defficiency.dmm @@ -96,7 +96,7 @@ "abR" = (/turf/simulated/wall/r_wall,/area/engineering/atmos) "abS" = (/obj/machinery/atmospherics/miner/sleeping_agent,/turf/simulated/floor/engine/n20,/area/engineering/atmos) "abT" = (/turf/simulated/floor/engine/n20,/area/engineering/atmos) -"abU" = (/obj/machinery/atmospherics/miner/plasma,/turf/simulated/floor/engine/n20,/area/engineering/atmos) +"abU" = (/obj/machinery/atmospherics/miner/toxins,/turf/simulated/floor/engine/n20,/area/engineering/atmos) "abV" = (/obj/machinery/atmospherics/miner/carbon_dioxide,/turf/simulated/floor/engine/n20,/area/engineering/atmos) "abW" = (/obj/machinery/atmospherics/miner/oxygen,/turf/simulated/floor/engine/n20,/area/engineering/atmos) "abX" = (/obj/machinery/atmospherics/miner/nitrogen,/turf/simulated/floor/engine/n20,/area/engineering/atmos) @@ -121,18 +121,18 @@ "acq" = (/turf/simulated/shuttle/wall{icon_state = "swall11"},/area/shuttle/arrival/station) "acr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "acs" = (/obj/machinery/door/airlock/external{name = "Arrival Airlock"},/turf/simulated/floor/plating,/area/hallway/secondary/entry) -"act" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) -"acu" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "waste_sensor"; output = 63},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) +"act" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) +"acu" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "waste_sensor"; output = 63},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) "acv" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/n20,/area/engineering/atmos) "acw" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2o_sensor"},/turf/simulated/floor/engine/n20,/area/engineering/atmos) -"acx" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) -"acy" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "tox_sensor"},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) -"acz" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) -"acA" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "co2_sensor"},/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) -"acB" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"acC" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"acD" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"acE" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) +"acx" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"acy" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "tox_sensor"},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"acz" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) +"acA" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "co2_sensor"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) +"acB" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"acC" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"acD" = (/obj/machinery/atmospherics/unary/vent_pump{external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"acE" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) "acF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/wood,/area/derelictparts/stripclub) "acG" = (/turf/simulated/floor/wood{icon_state = "wood-broken3"},/area/derelictparts/stripclub) "acH" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/wood,/area/derelictparts/stripclub) @@ -156,18 +156,18 @@ "acZ" = (/turf/simulated/shuttle/wall{icon_state = "swall3"},/area/shuttle/arrival/station) "ada" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/arrival/station) "adb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/secondary/entry) -"adc" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) -"add" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "waste_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) +"adc" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) +"add" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "waste_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) "ade" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/engine/n20,/area/engineering/atmos) "adf" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "n2o_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine/n20,/area/engineering/atmos) -"adg" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) -"adh" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "tox_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) -"adi" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) -"adj" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "co2_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) -"adk" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"adl" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "o2_in"; on = 1},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"adm" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"adn" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "n2_in"; on = 1},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) +"adg" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"adh" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "tox_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"adi" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) +"adj" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "co2_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) +"adk" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"adl" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "o2_in"; on = 1},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"adm" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"adn" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1441; icon_state = "on"; id_tag = "n2_in"; on = 1},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) "ado" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/derelictparts/stripclub) "adp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood,/area/derelictparts/stripclub) "adq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 1; pixel_y = 24; pixel_x = 0},/turf/simulated/floor/plating,/area/maintenance/fpmaint3) @@ -353,8 +353,8 @@ "agO" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/engineering/atmos) "agP" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/structure/lattice,/turf/space,/area) "agQ" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/meter{frequency = 1443; id_tag = "mair_out_meter"; name = "Mixed Air Tank Out"},/turf/simulated/floor/plating,/area/engineering/atmos) -"agR" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"agS" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) +"agR" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"agS" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) "agT" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fore) "agU" = (/obj/structure/closet/emcloset,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/fore) "agV" = (/obj/structure/closet/firecloset,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/fore) @@ -404,8 +404,8 @@ "ahN" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "arrival"},/area/engineering/atmos) "ahO" = (/obj/machinery/atmospherics/trinary/mixer{dir = 4; icon_state = "intact_on"; name = "Gas mixer (N2/O2)"; node1_concentration = 0.8; node2_concentration = 0.2; on = 1; target_pressure = 4500},/turf/simulated/floor{icon_state = "arrival"; dir = 6},/area/engineering/atmos) "ahP" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/plating,/area/engineering/atmos) -"ahQ" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1443; icon_state = "on"; id_tag = "air_in"; on = 1},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"ahR" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) +"ahQ" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1443; icon_state = "on"; id_tag = "air_in"; on = 1},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"ahR" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) "ahS" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/research/station) "ahT" = (/obj/structure/lattice,/obj/effect/landmark{name = "carpspawn"},/turf/space,/area) "ahU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) @@ -780,7 +780,7 @@ "aoZ" = (/obj/machinery/telecomms/receiver/preset_right,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber) "apa" = (/obj/machinery/telecomms/bus/preset_three,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber) "apb" = (/obj/machinery/telecomms/processor/preset_three,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber) -"apc" = (/turf/simulated/floor/plating/airless{starting_gases = list("plasma" = 5000, "oxygen" = 5000)},/area) +"apc" = (/turf/simulated/floor/plating/airless{oxygen = 5000; toxins = 5000},/area) "apd" = (/obj/structure/table,/obj/item/weapon/wirecutters,/obj/item/device/t_scanner,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plating{icon_state = "platingdmg1"},/area/maintenance/fore) "ape" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/device/assembly/igniter,/turf/simulated/floor{icon_state = "damaged4"; dir = 1},/area/maintenance/fore) "apf" = (/obj/structure/table,/obj/item/weapon/screwdriver{pixel_y = 8},/obj/item/weapon/cell/high,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/fore) @@ -1148,7 +1148,7 @@ "awd" = (/obj/machinery/door/airlock/external{req_access_txt = "13"},/turf/simulated/floor/plating,/area/maintenance/fore) "awe" = (/obj/item/stack/sheet/metal{amount = 50},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/storage/primary) "awf" = (/obj/item/stack/sheet/glass/glass{amount = 50},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/storage/primary) -"awg" = (/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 6},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) +"awg" = (/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 6},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) "awh" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/break_room) "awi" = (/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/medical/surgery) "awj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/medbay) @@ -1176,7 +1176,7 @@ "awF" = (/turf/simulated/floor,/area/security/checkpoint2) "awG" = (/obj/machinery/computer/secure_data,/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_x = 32},/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/checkpoint2) "awH" = (/obj/structure/table,/obj/machinery/light/small{dir = 8},/obj/map/spawner/assistant/tools,/obj/map/spawner/assistant/tools,/obj/map/spawner/assistant/tools,/turf/simulated/floor{icon_state = "floorgrime"},/area/storage/primary) -"awI" = (/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) +"awI" = (/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) "awJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/computer/atmoscontrol,/turf/simulated/floor{dir = 1; icon_state = "caution"},/area/engineering/atmos) "awK" = (/obj/machinery/computer/general_air_control{frequency = 1441; name = "Tank Monitor"; sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank")},/obj/machinery/camera{c_tag = "Atmospherics Monitoring"},/obj/machinery/door_control{id_tag = "atmos"; name = "Atmospherics Lockdown"; pixel_y = 24; req_access_txt = "24"},/turf/simulated/floor{dir = 1; icon_state = "caution"},/area/engineering/atmos) "awL" = (/obj/structure/closet/crate,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/plasteel{amount = 30},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/storage/primary) @@ -1368,7 +1368,7 @@ "aAp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aAq" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/sortjunction{dir = 1; icon_state = "pipe-j2s"; sortType = 21},/obj/effect/nmpi,/obj/effect/nmpi{tag = "icon-maintguide (SOUTHEAST)"; icon_state = "maintguide"; dir = 6},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aAr" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "bot"},/area/science/storage) -"aAs" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "bot"},/area/science/storage) +"aAs" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "bot"},/area/science/storage) "aAt" = (/obj/machinery/portable_atmospherics/canister/air,/obj/structure/window/reinforced{dir = 8},/obj/structure/sign/nosmoking_2{pixel_y = 32},/turf/simulated/floor{icon_state = "bot"},/area/science/storage) "aAu" = (/turf/simulated/wall,/area/science/storage) "aAv" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/simulated/floor{icon_state = "floorgrime"},/area/science/storage) @@ -3033,9 +3033,9 @@ "bgq" = (/obj/structure/table,/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/machinery/light,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) "bgr" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) "bgs" = (/obj/machinery/smartfridge/extract,/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) -"bgt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"bgu" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"bgv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) +"bgt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"bgu" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"bgv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) "bgw" = (/obj/machinery/door/airlock{name = "Private Restroom"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/science/rd) "bgx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engineering/engine) "bgy" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "white"},/area/science/rd) @@ -3105,9 +3105,9 @@ "bhK" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall,/area/science/xenobiology) "bhL" = (/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) "bhM" = (/obj/structure/sink{dir = 4; pixel_x = 11},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) -"bhN" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"bhO" = (/obj/machinery/alarm/server{dir = 1; pixel_y = -24},/obj/machinery/camera{c_tag = "Server Room"; dir = 1; network = list("SS13","RD"); pixel_x = 22},/obj/machinery/light/small,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"bhP" = (/obj/machinery/r_n_d/server/core,/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) +"bhN" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"bhO" = (/obj/machinery/alarm/server{dir = 1; pixel_y = -24},/obj/machinery/camera{c_tag = "Server Room"; dir = 1; network = list("SS13","RD"); pixel_x = 22},/obj/machinery/light/small,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"bhP" = (/obj/machinery/r_n_d/server/core,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) "bhQ" = (/obj/machinery/light/small{dir = 1},/obj/structure/toilet{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/science/rd) "bhR" = (/obj/structure/sink{dir = 4; pixel_x = 11},/turf/simulated/floor{icon_state = "freezerfloor"},/area/science/rd) "bhS" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor{icon_state = "white"},/area/science/rd) @@ -7276,14 +7276,14 @@ "cJV" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Holodeck Projector Floor"},/area/holodeck/source_wildlife) "cJW" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{icon_state = "iron3"},/area) "cJX" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Holodeck Projector Floor"},/area/holodeck/source_plating) -"cJY" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; starting_gases = list("oxygen" = 2500, "plasma" = 5000); temperature = 370},/area/holodeck/source_burntest) +"cJY" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; nitrogen = 0; oxygen = 2500; temperature = 370; toxins = 5000},/area/holodeck/source_burntest) "cJZ" = (/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_emptycourt) "cKa" = (/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_emptycourt) "cKb" = (/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_emptycourt) "cKc" = (/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{icon_state = "iron3"},/area) "cKd" = (/turf/space/transit/east,/area) "cKe" = (/obj/effect/landmark{name = "Holocarp Spawn"},/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Holodeck Projector Floor"},/area/holodeck/source_wildlife) -"cKf" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; starting_gases = list("oxygen" = 2500, "plasma" = 5000); temperature = 370},/area/holodeck/source_burntest) +"cKf" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; nitrogen = 0; oxygen = 2500; temperature = 370; toxins = 5000},/area/holodeck/source_burntest) "cKg" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "red"},/area/holodeck/source_emptycourt) "cKh" = (/turf/simulated/floor/holofloor,/area/holodeck/source_emptycourt) "cKi" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "red"},/area/holodeck/source_emptycourt) @@ -8131,7 +8131,7 @@ "das" = (/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/no_ethereal) "dat" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/research_outpost/power) "dau" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/security/rec_room) -"dav" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("plasma","nitrous_oxide")},/turf/simulated/floor,/area/security/brig) +"dav" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/security/rec_room) "daw" = (/obj/structure/lattice,/obj/item/stack/rods,/obj/item/weapon/shard{icon_state = "medium"},/turf/space,/area) "dax" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/power/emitter{active = 1; anchored = 1; dir = 1; locked = 0; powered = 1; state = 2; unacidable = 1},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom) "day" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/emitter{active = 1; anchored = 1; dir = 1; locked = 0; powered = 1; state = 2; unacidable = 1},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom) @@ -8144,7 +8144,7 @@ "daF" = (/obj/machinery/power/smes/magical,/obj/structure/cable,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom) "daG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/door/window{dir = 1; name = "Execution Room"; req_access_txt = "63"},/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) "daH" = (/obj/machinery/flasher{id_tag = "Cell 4"; pixel_y = -28},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) -"daI" = (/obj/machinery/atmospherics/miner/plasma,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom) +"daI" = (/obj/machinery/atmospherics/miner/toxins,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom) "daJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/engineering/engine_storage) "daK" = (/obj/machinery/atmospherics/miner/oxygen,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom) "daL" = (/obj/machinery/light/small{dir = 1},/obj/structure/sign/biohazard{pixel_y = 32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom) @@ -8253,7 +8253,7 @@ "dcK" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/derelict/solar_control) "dcL" = (/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/derelict/solar_control) "dcM" = (/turf/simulated/floor/plating,/area/derelict/solar_control) -"dcN" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor/plating,/area/engineering/engine_storage) +"dcN" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/plating,/area/engineering/engine_storage) "dcO" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom) "dcP" = (/obj/machinery/door/airlock/external{name = "External Engineering"},/turf/simulated/floor/plating,/area/derelict/solar_control) "dcQ" = (/obj/machinery/recharge_station,/turf/simulated/floor,/area/derelict/solar_control) @@ -8696,8 +8696,8 @@ "dll" = (/turf/simulated/floor/airless,/area/derelict/hallway/secondary) "dlm" = (/obj/structure/disposalpipe/segment,/obj/structure/catwalk,/turf/space,/area) "dln" = (/obj/machinery/door/airlock/maintenance{name = "Aux Storage"; req_access_txt = "23"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary) -"dlo" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) -"dlp" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"dlo" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"dlp" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dlq" = (/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary) "dlr" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless,/area/derelict/hallway/secondary) "dls" = (/turf/simulated/floor/airless{icon_state = "derelict9"},/area/derelict/hallway/secondary) @@ -8739,7 +8739,7 @@ "dmc" = (/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary) "dmd" = (/obj/machinery/power/smes,/obj/structure/cable,/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload) "dme" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload) -"dmf" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"dmf" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dmg" = (/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload) "dmh" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload) "dmi" = (/turf/simulated/floor/plating/airless,/area/derelict/bridge/ai_upload) @@ -8781,19 +8781,19 @@ "dmS" = (/turf/simulated/wall/r_wall,/area/derelict/atmos) "dmT" = (/obj/structure/sign/nosmoking_1,/turf/simulated/wall/r_wall,/area/derelict/atmos) "dmU" = (/obj/machinery/door/airlock/external{name = "Toxins Tank Access"},/turf/simulated/floor/plating/airless,/area/derelict/atmos) -"dmV" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) -"dmW" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"dmV" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"dmW" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dmX" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "dmY" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "dmZ" = (/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dna" = (/obj/machinery/air_sensor{frequency = 1438; id_tag = "tox_sensor"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) -"dnb" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"dnb" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dnc" = (/turf/simulated/wall/r_wall,/area/derelict/research) "dnd" = (/obj/machinery/floodlight,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "dne" = (/obj/machinery/r_n_d/fabricator/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHWEST)"; icon_state = "warning"; dir = 9},/turf/simulated/floor/airless,/area/derelict/research) "dnf" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/airless,/area/derelict/research) "dng" = (/obj/machinery/computer/rdconsole/core,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor/airless,/area/derelict/research) -"dnh" = (/obj/machinery/atmospherics/miner/plasma,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) +"dnh" = (/obj/machinery/atmospherics/miner/toxins,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dni" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dnj" = (/obj/machinery/floodlight,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "dnk" = (/obj/machinery/r_n_d/destructive_analyzer,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHWEST)"; icon_state = "warning"; dir = 10},/turf/simulated/floor/airless,/area/derelict/research) @@ -8801,7 +8801,7 @@ "dnm" = (/obj/machinery/r_n_d/fabricator/protolathe,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor/airless,/area/derelict/research) "dnn" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; external_pressure_bound = 120; frequency = 1438; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dno" = (/obj/effect/decal/warning_stripes{icon_state = "plasma"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) -"dnp" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"dnp" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dnq" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "dnr" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar/panel{id_tag = "derelictsolar"; name = "Derelict Solar Array"},/turf/simulated/floor/airless,/area/solar/derelict_aft) "dns" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/research_outpost/solars) @@ -9119,7 +9119,7 @@ "dts" = (/obj/machinery/light/small,/turf/simulated/floor,/area/research_outpost/iso2) "dtt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) "dtu" = (/obj/machinery/space_heater/air_conditioner,/turf/simulated/floor{icon_state = "dark"},/area/research_outpost/maintstore2) -"dtv" = (/obj/structure/closet/crate,/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/plating/airless{starting_gases = list("plasma" = 5000, "oxygen" = 5000)},/area/mine/unexplored) +"dtv" = (/obj/structure/closet/crate,/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/plating/airless{oxygen = 5000; toxins = 5000},/area/mine/unexplored) "dtw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "dtx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) "dty" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) @@ -9231,7 +9231,7 @@ "dvA" = (/obj/item/weapon/coin/iron,/turf/simulated/floor/engine/cult,/area/mine/unexplored) "dvB" = (/turf/simulated/wall/cult{icon_state = "cult1"},/area/mine/unexplored) "dvC" = (/turf/simulated/floor/engine/cult,/area/mine/unexplored) -"dvD" = (/turf/simulated/floor/plating/airless{starting_gases = list("plasma" = 5000, "oxygen" = 5000)},/area/mine/unexplored) +"dvD" = (/turf/simulated/floor/plating/airless{oxygen = 5000; toxins = 5000},/area/mine/unexplored) "dvE" = (/obj/item/candle{desc = "This strange candle is made of some mystery wax. It never seems to burn out."; icon_state = "candle1_lit"; lit = 1; name = "Blood Candle"; pixel_x = 2; wax = 50000},/turf/simulated/floor/engine/cult,/area/mine/unexplored) "dvF" = (/obj/structure/cult/pylon,/turf/simulated/floor/engine/cult,/area/mine/unexplored) "dvG" = (/obj/machinery/light/small{dir = 4},/turf/unsimulated/floor/asteroid,/area/mine/explored) @@ -9662,7 +9662,7 @@ "dDP" = (/obj/structure/closet/radiation,/turf/simulated/floor,/area/engineering/engine) "dDQ" = (/obj/structure/displaycase/captains_laser,/turf/simulated/floor/carpet,/area/crew_quarters/captain) "dDR" = (/obj/structure/stool/bed/chair{dir = 4},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor,/area/security/brig) -"dDS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("plasma","nitrous_oxide")},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/security/rec_room) +"dDS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/security/brig) "dDT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/engineering/engine) "dDU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/mine/living_quarters) "dDV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/engineering/engine) diff --git a/maps/metaclub.dmm b/maps/metaclub.dmm index 5b5e2f457e2..24b5f72a9ae 100644 --- a/maps/metaclub.dmm +++ b/maps/metaclub.dmm @@ -59,7 +59,7 @@ "abg" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/shuttle/wall{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area/shuttle/escape_pod2/station) "abh" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/security/prison) "abi" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/item/seeds/ambrosiavulgarisseed,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) -"abj" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) +"abj" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "abk" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "abl" = (/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "abm" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/item/seeds/glowshroom,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) @@ -105,7 +105,7 @@ "aca" = (/obj/structure/stool,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "acb" = (/obj/structure/table,/obj/structure/bedsheetbin,/obj/structure/window/reinforced,/obj/machinery/camera{c_tag = "Security - Prison Permabrig"; dir = 8; network = list("SS13","Prison")},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/security/prison) "acc" = (/obj/machinery/light{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/supply/miningdock{name = "\improper Mining Office"}) -"acd" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/cobweb,/obj/machinery/door_control{id_tag = "Cabin4"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/carpet{icon_state = "bcarpet05"},/area/crew_quarters/sleep) +"acd" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/supply/miningdock{name = "\improper Mining Office"}) "ace" = (/obj/machinery/status_display{density = 0; pixel_x = 0; pixel_y = 32; supply_display = 1},/obj/machinery/mineral/equipment_locker,/turf/simulated/floor{dir = 9; icon_state = "brown"},/area/supply/miningdock{name = "\improper Mining Office"}) "acf" = (/obj/machinery/light_switch{pixel_x = 0; pixel_y = 32},/obj/machinery/mineral/equipment_locker,/turf/simulated/floor{dir = 1; icon_state = "brown"},/area/supply/miningdock{name = "\improper Mining Office"}) "acg" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark/start{name = "Security Officer"},/turf/simulated/floor{icon_state = "red"},/area/security/main) @@ -120,7 +120,7 @@ "acp" = (/obj/structure/stool,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/security/prison) "acq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/main) "acr" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"acs" = (/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{dir = 9; icon_state = "floor"},/area/engineering/supermatter_room) +"acs" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/storage/firstaid/regular{pixel_x = 0; pixel_y = 2},/turf/simulated/floor{dir = 6; icon_state = "whitered"},/area/security/medical) "act" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/light/small{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "acu" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Infirmary"; req_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{dir = 4; icon_state = "whitered"; tag = "icon-whitehall (WEST)"},/area/security/medical) "acv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/stool/bed/chair{dir = 8},/obj/effect/landmark/start{name = "Security Officer"},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/main) @@ -140,7 +140,7 @@ "acJ" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "acK" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "acL" = (/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) -"acM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "red"; dir = 6},/area/security/main) +"acM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) "acN" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) "acO" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) "acP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/junction{dir = 4; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)"},/turf/simulated/floor{dir = 8; icon_state = "whitered"; tag = "icon-whitehall (WEST)"},/area/security/medical) @@ -153,7 +153,7 @@ "acW" = (/obj/machinery/shower{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) "acX" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Unisex Showers"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) "acY" = (/obj/machinery/flasher_button{id_tag = "PCell 2"; pixel_x = 6; pixel_y = -24},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) -"acZ" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/item/weapon/storage/firstaid/regular{pixel_x = 0; pixel_y = 2},/turf/simulated/floor{dir = 6; icon_state = "whitered"},/area/security/medical) +"acZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/door_control{id_tag = "permabolt2"; name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_x = 0; pixel_y = -26; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor,/area/security/prison) "ada" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/obj/machinery/light,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "adb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/machinery/flasher_button{id_tag = "PCell 1"; pixel_x = 6; pixel_y = -24},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "adc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) @@ -186,8 +186,8 @@ "adD" = (/obj/structure/table,/obj/item/stack/medical/ointment{pixel_x = 3; pixel_y = -2},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline,/obj/item/weapon/reagent_containers/syringe{pixel_x = -1; pixel_y = 3},/obj/item/device/healthanalyzer{pixel_y = -2},/obj/machinery/light{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 8; icon_state = "whitered"; tag = "icon-whitehall (WEST)"},/area/security/medical) "adE" = (/turf/simulated/floor{icon_state = "white"},/area/security/medical) "adF" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/security/medical) -"adG" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("nitrous_oxide","oxygen","plasma")},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/engineering/supermatter_room) -"adH" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 8},/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor/plating,/area/security/gas_chamber) +"adG" = (/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 9; icon_state = "floor"},/area/engineering/supermatter_room) +"adH" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 8},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/plating,/area/security/gas_chamber) "adI" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/camera{c_tag = "Solar - Fore Starboard (NE)"; dir = 4; network = list("SS13")},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) "adJ" = (/obj/machinery/computer/security/telescreen{desc = "Used for watching proceedings in the interrogation room."; dir = 1; layer = 4; name = "interrogation monitor"; network = list("interrogation"); pixel_x = 0; pixel_y = -30},/turf/simulated/floor{icon_state = "grimy"},/area/security/rec_room) "adK" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/terminal,/obj/machinery/light/small{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) @@ -227,9 +227,9 @@ "aes" = (/obj/structure/toilet{dir = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison) "aet" = (/obj/machinery/flasher{id_tag = "PCell 2"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "aeu" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) -"aev" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) +"aev" = (/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "aew" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/wall,/area/security/prison) -"aex" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "dark"},/area/security/warden) +"aex" = (/obj/machinery/flasher{id_tag = "PCell 1"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "aey" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "aez" = (/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "aeA" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/prison) @@ -266,7 +266,7 @@ "aff" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/security/armory) "afg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{icon_state = "dark"},/area/security/armory) "afh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/security/armory) -"afi" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) +"afi" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/security/armory) "afj" = (/obj/structure/table/woodentable,/obj/machinery/newscaster/security_unit{pixel_x = 0; pixel_y = 30},/obj/item/weapon/folder/red,/obj/item/weapon/folder/red,/obj/structure/reagent_dispensers/peppertank{pixel_x = -30; pixel_y = 0},/obj/item/weapon/storage/secure/safe/HoS{pixel_x = -25; pixel_y = 30},/obj/item/weapon/folder/red,/turf/simulated/floor{icon_state = "dark"},/area/security/hos) "afk" = (/turf/simulated/floor{icon_state = "dark"},/area/security/hos) "afl" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "dark"},/area/security/hos) @@ -293,7 +293,7 @@ "afG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "afH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "afI" = (/obj/structure/stool/bed/chair/office/dark,/obj/effect/landmark/start{name = "Warden"},/turf/simulated/floor{icon_state = "dark"},/area/security/warden) -"afJ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "dark"},/area/security/range{name = "\improper Security E.V.A"}) +"afJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/security/prison) "afK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/stool/bed,/obj/machinery/camera{c_tag = "Security - Prison Solitary Confinement Cell"; network = list("SS13","Prison")},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/security/prison) "afL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/pen,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/security/prison) "afM" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/reinforced,/obj/machinery/light_switch{pixel_x = -24; pixel_y = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/book/manual/security_space_law{pixel_x = -3; pixel_y = 5},/turf/simulated/floor{icon_state = "dark"},/area/security/warden) @@ -311,7 +311,7 @@ "afY" = (/obj/structure/filingcabinet/security{pixel_x = 4},/obj/machinery/firealarm{dir = 4; pixel_x = 28},/obj/machinery/light/small,/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/warden) "afZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/security/armory) "aga" = (/obj/structure/rack,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/grenade/empgrenade,/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/gun/grenadelauncher,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/armory) -"agb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) +"agb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/security/warden) "agc" = (/obj/structure/rack,/obj/item/weapon/gun/energy/laser{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/energy/laser,/obj/item/weapon/gun/energy/laser{pixel_x = 3; pixel_y = -3},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/armory) "agd" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/security/armory) "age" = (/obj/structure/rack,/obj/item/weapon/storage/lockbox/loyalty,/obj/machinery/bot/secbot{health = 35; name = "Securitron #359"; on = 0},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 28; pixel_y = 0},/obj/item/weapon/storage/secure/safe{pixel_x = 6; pixel_y = 28},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/armory) @@ -320,7 +320,7 @@ "agh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor{icon_state = "dark"},/area/security/hos) "agi" = (/obj/structure/stool/bed/chair/comfy/black,/turf/simulated/floor{icon_state = "dark"},/area/security/hos) "agj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "dark"},/area/security/hos) -"agk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/security/main) +"agk" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 32},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "dark"},/area/security/hos) "agl" = (/obj/machinery/light{dir = 4},/obj/structure/reagent_dispensers/peppertank{pixel_x = 30; pixel_y = 0},/turf/simulated/floor{icon_state = "dark"},/area/security/hos) "agm" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/main) "agn" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Security E.V.A"; req_access_txt = "0"; req_one_access_txt = "1;4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/security/range{name = "\improper Security E.V.A"}) @@ -661,18 +661,18 @@ "amK" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/junction{dir = 4; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)"},/turf/simulated/floor,/area/security/brig) "amL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 8; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "amM" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"amN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/security/warden) +"amN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "amO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "amP" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "amQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "amR" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/security/brig) "amS" = (/obj/structure/table,/obj/item/weapon/book/manual/security_space_law{pixel_x = -3; pixel_y = 5},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/decal/warning_stripes{dir = 1; icon_state = "warning"; pixel_y = -6; tag = "icon-warning (NORTH)"},/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) "amT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -28},/obj/machinery/light/small,/turf/simulated/floor,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"amU" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/power_control,/obj/item/weapon/cell{maxcharge = 2000},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "floorgrime"},/area/supply/sorting{name = "\improper Warehouse"}) +"amU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "amV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "amW" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fore) "amX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor,/area/engineering/supermatter_room) -"amY" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor,/area/engineering/supermatter_room) +"amY" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor,/area/engineering/supermatter_room) "amZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/engineering/supermatter_room) "ana" = (/turf/simulated/floor/plating,/area/engineering/supermatter_room) "anb" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/structure/cable,/obj/machinery/power/rad_collector{anchored = 1},/turf/simulated/floor/plating,/area/engineering/supermatter_room) @@ -696,7 +696,7 @@ "ant" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/item/weapon/bucket_sensor,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "anu" = (/obj/item/weapon/grown/log,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "anv" = (/obj/machinery/light_construct/small{dir = 4},/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/secure/briefcase,/obj/item/weapon/disk/data,/obj/item/weapon/storage/secure/safe{pixel_x = 35; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"anw" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor{icon_state = "dark"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"anw" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor{icon_state = "dark"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "anx" = (/turf/simulated/floor{icon_state = "dark"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "any" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/machinery/door_control{dir = 2; id_tag = "SecJusticeChamber"; layer = 4; name = "Justice Vent Control"; pixel_x = -26; pixel_y = -5; req_access_txt = "3"},/obj/effect/decal/warning_stripes{dir = 1; icon_state = "warning"; pixel_y = -6; tag = "icon-warning (NORTH)"},/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) "anz" = (/obj/structure/table,/obj/item/device/radio/electropack,/obj/item/device/assembly/signaler,/obj/item/clothing/head/helmet,/obj/item/weapon/screwdriver,/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) @@ -780,7 +780,7 @@ "aoZ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/security/brig) "apa" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/security/gas_chamber) "apb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/security/main) -"apc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/engineering/engine) +"apc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/security/warden) "apd" = (/obj/structure/closet/secure_closet/miner,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{dir = 4; icon_state = "brown"},/area/supply/miningdock{name = "\improper Mining Office"}) "ape" = (/obj/structure/rack,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/box/seccarts{pixel_x = -3; pixel_y = -2},/obj/machinery/light/small,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/security/warden) "apf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor,/area/security/warden) @@ -800,10 +800,10 @@ "apt" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor,/area/security/main) "apu" = (/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 1},/turf/simulated/floor/plating,/area/security/gas_chamber) "apv" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/obj/structure/window/reinforced{dir = 8},/obj/machinery/computer/atmoscontrol/gas_chamber{pixel_x = 4},/obj/item/weapon/paper/Gaschamber,/turf/simulated/floor/plating,/area/security/gas_chamber) -"apw" = (/obj/effect/landmark/start{name = "Detective"},/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor/carpet,/area/security/detectives_office) +"apw" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/security/gas_chamber) "apx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/maintenance{name = "Storage Room"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fore) "apy" = (/obj/machinery/light_switch{pixel_x = -26},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 8; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) -"apz" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor/wood,/area/maintenance/ghettobar) +"apz" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "apA" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "apB" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/crew_quarters/fitness{name = "\improper Recreation Area"}) "apC" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/fitness{name = "\improper Recreation Area"}) @@ -815,7 +815,7 @@ "apI" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/engineering/supermatter_room) "apJ" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/engineering/supermatter_room) "apK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/engineering/supermatter_room) -"apL" = (/obj/machinery/flasher{id_tag = "Cell 3"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) +"apL" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_CO2 = 0; scrub_O2 = 1; scrub_Toxins = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/engineering/supermatter_room) "apM" = (/turf/simulated/floor/engine/vacuum,/area/engineering/supermatter_room) "apN" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine/vacuum,/area/engineering/supermatter_room) "apO" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/plating,/area/engineering/supermatter_room) @@ -913,7 +913,7 @@ "arC" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/glass_security{name = "Prison Wing"; req_access_txt = "1"},/turf/simulated/floor{icon_state = "red"},/area/security/brig) "arD" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Prison Wing"; req_access_txt = "1"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "red"},/area/security/brig) "arE" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/alarm{pixel_y = 23},/obj/structure/closet/l3closet/security,/turf/simulated/floor,/area/security/warden) -"arF" = (/obj/machinery/flasher{id_tag = "Cell 1"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) +"arF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/obj/machinery/light/small,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "arG" = (/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{icon_state = "dark"},/area/security/warden) "arH" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor,/area/security/warden) "arI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/cable/yellow,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/security/warden) @@ -982,7 +982,7 @@ "asT" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Detective's Office"; req_access = null; req_access_txt = "4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/security/detectives_office) "asU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "red"; dir = 10},/area/security/main) "asV" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/security/range{name = "\improper Security E.V.A"}) -"asW" = (/obj/machinery/flasher{id_tag = "Cell 2"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) +"asW" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/security/range{name = "\improper Security E.V.A"}) "asX" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "dark"},/area/security/range{name = "\improper Security E.V.A"}) "asY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "redfull"},/area/security/main) "asZ" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "red"},/area/security/main) @@ -1034,12 +1034,12 @@ "atT" = (/obj/machinery/light{dir = 1},/obj/machinery/vending/security,/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/security/main) "atU" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 26},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/security/main) "atV" = (/obj/machinery/light{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/security/main) -"atW" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/storage/nuke_storage) +"atW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/security/main) "atX" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/detector,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/security/main) "atY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/security/brig) "atZ" = (/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/brig) "aua" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/brig) -"aub" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/supply/miningdock{name = "\improper Mining Office"}) +"aub" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "red"; dir = 6},/area/security/main) "auc" = (/turf/simulated/wall,/area/security/rec_room) "aud" = (/turf/simulated/floor{icon_state = "white"},/area/security/gas_chamber) "aue" = (/obj/machinery/door/poddoor{density = 1; icon_state = "pdoor1"; id_tag = "SecJusticeChamber"; name = "Justice Vent"; opacity = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/plating,/area/security/gas_chamber) @@ -1056,7 +1056,7 @@ "aup" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/security/brig) "auq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/glass_engineering{name = "Supermatter Room"; req_access_txt = "0"; req_one_access_txt = "10;24"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/engineering/supermatter_room) "aur" = (/obj/machinery/vending/suitdispenser,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/carpet{icon_state = "bcarpet05"},/area/crew_quarters/sleep) -"aus" = (/obj/structure/grille,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating/airless,/area/engineering/engine) +"aus" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/cobweb,/obj/machinery/door_control{id_tag = "Cabin4"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/carpet{icon_state = "bcarpet05"},/area/crew_quarters/sleep) "aut" = (/obj/machinery/door/poddoor/shutters/preopen{dir = 2; id_tag = "store"; name = "Store Door Shutters"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 8; icon_state = "dark neutral full"},/area/crew_quarters/sleep) "auu" = (/mob/living/carbon/monkey,/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fore) "auv" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/extinguisher,/turf/simulated/floor/plating,/area/maintenance/fore) @@ -1142,7 +1142,7 @@ "avX" = (/obj/structure/flora/pottedplant/random{tag = "icon-plant-16"; icon_state = "plant-16"},/obj/structure/window/full/reinforced,/turf/simulated/floor/grass,/area/security/brig) "avY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/engineering/engine) "avZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/structure/cable/yellow,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"awa" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plating/airless,/area/engineering/engine) +"awa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/security/brig) "awb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/window/full/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "briglockdown"; name = "Security Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig) "awc" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Uniforms"; req_access_txt = "63"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/security/brig) "awd" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/security/brig) @@ -1160,9 +1160,9 @@ "awp" = (/obj/machinery/power/apc{cell_type = 10000; dir = 1; name = "Interrogation Room APC"; pixel_x = 1; pixel_y = 26},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor{icon_state = "dark"},/area/security/rec_room) "awq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "dark"},/area/security/rec_room) "awr" = (/turf/simulated/floor{icon_state = "dark"},/area/security/rec_room) -"aws" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor/carpet{icon_state = "bcarpet05"},/area/crew_quarters/sleep) +"aws" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/security/rec_room) "awt" = (/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) -"awu" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/security/brig) +"awu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor,/area/crew_quarters/sleep) "awv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "aww" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/sleep) "awx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall,/area/crew_quarters/sleep) @@ -1231,7 +1231,7 @@ "axI" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "axJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/crew_quarters/sleep) "axK" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep) -"axL" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/security/brig) +"axL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet{icon_state = "bcarpet05"},/area/crew_quarters/sleep) "axM" = (/turf/simulated/floor/carpet{icon_state = "bcarpet05"},/area/crew_quarters/sleep) "axN" = (/obj/machinery/door/airlock/maintenance{name = "Storage Room"; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/fore) "axO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/engineering/supermatter_room) @@ -1265,7 +1265,7 @@ "ayq" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/security/brig) "ayr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door_timer/cell_2,/turf/simulated/floor{icon_state = "red"},/area/security/brig) "ays" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{cell_type = 2500; dir = 2; name = "Prisoner Education Chamber APC"; pixel_y = -24},/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) -"ayt" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id_tag = "Cabin5"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor/carpet{icon_state = "bcarpet05"},/area/crew_quarters/sleep) +"ayt" = (/obj/effect/landmark/start{name = "Detective"},/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet,/area/security/detectives_office) "ayu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/brig) "ayv" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor{icon_state = "red"; dir = 5},/area/security/brig) "ayw" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) @@ -1289,7 +1289,7 @@ "ayO" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "ayP" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor,/area/crew_quarters/sleep) "ayQ" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id_tag = "Cabin2"; name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/carpet{icon_state = "bcarpet05"},/area/crew_quarters/sleep) -"ayR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/security/brig) +"ayR" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/door_control{id_tag = "Cabin5"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/carpet{icon_state = "bcarpet05"},/area/crew_quarters/sleep) "ayS" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/obj/machinery/light/small{dir = 2},/turf/simulated/floor/plating{blocks_air = 1},/area/engineering/engine) "ayT" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/stack/sheet/mineral/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/mineral/gold{pixel_y = 2},/obj/item/stack/sheet/mineral/gold{pixel_x = 1; pixel_y = -2},/obj/item/weapon/storage/belt/champion,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/machinery/light/small{dir = 8},/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/storage/nuke_storage) "ayU" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/fore) @@ -1344,7 +1344,7 @@ "azR" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/glass_security{name = "Prison Wing"; req_access_txt = "1"},/turf/simulated/floor,/area/security/prison) "azS" = (/obj/machinery/computer/med_data,/turf/simulated/floor{icon_state = "dark"},/area/security/detectives_office) "azT" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/security/main) -"azU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor,/area/crew_quarters/sleep) +"azU" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/security/brig) "azV" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "azW" = (/obj/structure/filingcabinet,/obj/machinery/light/small{dir = 1},/obj/machinery/light_switch{pixel_y = 25},/obj/machinery/camera{c_tag = "Security - Detective's Office"; dir = 2; network = list("SS13")},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "azX" = (/turf/simulated/wall/r_wall,/area/security/detectives_office) @@ -1375,7 +1375,7 @@ "aAw" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plating/airless,/area/engineering/engine) "aAx" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/engineering/engine) "aAy" = (/obj/structure/grille,/turf/simulated/floor/plating/airless,/area) -"aAz" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/machinery/door_control{id_tag = "permabolt2"; name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_x = 0; pixel_y = -26; req_access_txt = "0"; specialfunctions = 4},/turf/simulated/floor,/area/security/prison) +"aAz" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/power_control,/obj/item/weapon/cell{maxcharge = 2000},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/supply/sorting{name = "\improper Warehouse"}) "aAA" = (/turf/simulated/floor{icon_state = "dark"},/area/security/medical) "aAB" = (/turf/simulated/shuttle/floor,/area/shuttle/mining/station) "aAC" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) @@ -1383,7 +1383,7 @@ "aAE" = (/obj/item/weapon/ore/iron,/turf/simulated/floor{dir = 9; icon_state = "floor"},/area/supply/miningdock{name = "\improper Mining Office"}) "aAF" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) "aAG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) -"aAH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber) +"aAH" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/security/prison) "aAI" = (/obj/machinery/power/apc{dir = 1; name = "Mining APC"; pixel_y = 24},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor{dir = 1; icon_state = "brown"},/area/supply/miningdock{name = "\improper Mining Office"}) "aAJ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{dir = 1; icon_state = "brown"},/area/supply/miningdock{name = "\improper Mining Office"}) "aAK" = (/obj/structure/rack{dir = 1},/obj/item/weapon/storage/toolbox/emergency{pixel_x = 2; pixel_y = -3},/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor{dir = 5; icon_state = "brown"},/area/supply/miningdock{name = "\improper Mining Office"}) @@ -1392,7 +1392,7 @@ "aAN" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/turf/simulated/floor{icon_state = "floorgrime"},/area/supply/sorting{name = "\improper Warehouse"}) "aAO" = (/obj/machinery/alarm{pixel_y = 28},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "floorgrime"},/area/supply/sorting{name = "\improper Warehouse"}) "aAP" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/supply/sorting{name = "\improper Warehouse"}) -"aAQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/security/gas_chamber) +"aAQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/storage/nuke_storage) "aAR" = (/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/storage/nuke_storage) "aAS" = (/obj/machinery/nuclearbomb{r_code = "LOLNO"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/storage/nuke_storage) "aAT" = (/turf/simulated/floor{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/storage/nuke_storage) @@ -1400,10 +1400,10 @@ "aAV" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/security/gas_chamber) "aAW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/pen,/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "aAX" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"aAY" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/security/armory) +"aAY" = (/obj/machinery/flasher{id_tag = "Cell 1"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) "aAZ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) "aBa" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) -"aBb" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 32},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "dark"},/area/security/hos) +"aBb" = (/obj/machinery/flasher{id_tag = "Cell 2"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) "aBc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/security/brig) "aBd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/main) "aBe" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Security Office"; req_access_txt = "0"; req_one_access_txt = "1;4"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/security/main) @@ -1411,7 +1411,7 @@ "aBg" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Prison Wing"; req_access_txt = "1"},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/prison) "aBh" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/security/range{name = "\improper Security E.V.A"}) "aBi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 26},/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/security/brig) -"aBj" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/security/prison) +"aBj" = (/obj/machinery/flasher{id_tag = "Cell 3"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) "aBk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) "aBl" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Security Office"; req_access_txt = "0"; req_one_access_txt = "1;4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/security/main) "aBm" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Gear Room"; req_access_txt = "0"; req_one_access_txt = "1;4"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "dark"},/area/security/warden) @@ -1442,7 +1442,7 @@ "aBL" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fore) "aBM" = (/obj/structure/grille,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating/airless,/area/engineering/engine) "aBN" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; dir = 1; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor{dir = 8; icon_state = "floor"},/area/engineering/engine) -"aBO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/security/prison) +"aBO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/engineering/engine) "aBP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/sign/securearea{pixel_y = 32},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engineering/engine) "aBQ" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/obj/machinery/power/terminal{dir = 8},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor{dir = 8; icon_state = "floor"},/area/engineering/engine) "aBR" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/plating/airless,/area/engineering/engine) @@ -1489,8 +1489,8 @@ "aCG" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/maintenance/fore) "aCH" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fore) "aCI" = (/obj/structure/disposalpipe/junction{dir = 4; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/security/brig) -"aCJ" = (/obj/machinery/flasher{id_tag = "PCell 1"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) -"aCK" = (/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) +"aCJ" = (/obj/structure/mirror{pixel_x = 28},/obj/machinery/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"aCK" = (/obj/structure/mirror{pixel_x = -28},/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aCL" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/portable_atmospherics/scrubber,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/crew_quarters/locker) "aCM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "aCN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/sleep) @@ -1602,7 +1602,7 @@ "aEP" = (/obj/machinery/conveyor{dir = 4; id_tag = "garbage"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/disposal) "aEQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/full/reinforced,/turf/simulated/shuttle/plating,/area/shuttle/escape_pod5/station) "aER" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/rag{pixel_y = 5},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"aES" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/hallway/primary/central) +"aES" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "aET" = (/obj/machinery/camera{c_tag = "MiniSat - Teleporter Room"; dir = 2; network = list("SS13")},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "aEU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/hallway/primary/fore) "aEV" = (/obj/machinery/computer/forensic_scanning/detective,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) @@ -1665,7 +1665,7 @@ "aGa" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/hallway/primary/fore) "aGb" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/maintenance{req_access_txt = "12"; req_one_access_txt = "0"},/turf/simulated/floor/plating,/area/maintenance/starboard) "aGc" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=1.5-Fore-Central"; location = "1-BrigCells"},/turf/simulated/floor,/area/hallway/primary/fore) -"aGd" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/hallway/primary/starboard) +"aGd" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/fore) "aGe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/hallway/primary/fore) "aGf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/hallway/primary/fore) "aGg" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/hallway/primary/fore) @@ -1696,7 +1696,7 @@ "aGF" = (/obj/structure/plasticflaps{opacity = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/plating,/area/supply/storage) "aGG" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/camera{c_tag = "Fore (N) Primary Hallway - NW"; dir = 1; network = list("SS13")},/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) "aGH" = (/turf/simulated/floor{dir = 10; icon_state = "floor"},/area/engineering/engine) -"aGI" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/hallway/primary/port) +"aGI" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 2; icon_state = "floor"},/area/engineering/engine) "aGJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "floor"},/area/engineering/engine) "aGK" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/starboard) "aGL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/starboard) @@ -1734,7 +1734,7 @@ "aHr" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/fore) "aHs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/wall/r_wall,/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "aHt" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) -"aHu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/supply/office{name = "\improper Cargo Office"}) +"aHu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 8; icon_state = "dark neutral full"},/area/crew_quarters/sleep) "aHv" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) "aHw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) "aHx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -30},/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) @@ -1820,7 +1820,7 @@ "aIZ" = (/obj/machinery/door/airlock/science{name = "Mechanics Workshop"; req_access_txt = "501"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "dark"},/area/engineering/mechanics) "aJa" = (/turf/simulated/wall,/area/lawoffice{name = "\improper Internal Affairs Office"}) "aJb" = (/obj/machinery/door/airlock/maintenance{name = "Internal Affairs Maintenance"; req_access_txt = "38"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fore) -"aJc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/storage/tech) +"aJc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light_switch{pixel_x = -26},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) "aJd" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore) "aJe" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor,/area/hallway/primary/central) "aJf" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor,/area/hallway/primary/central) @@ -1864,7 +1864,7 @@ "aJR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{dir = 6; icon_state = "floor"; tag = "icon-warnwhite (NORTHEAST)"},/area/supply/storage) "aJS" = (/obj/machinery/camera{c_tag = "Storage Wing - W (Vault Access)"; dir = 1; network = list("SS13")},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) "aJT" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) -"aJU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{tag = "icon-warningcorner (NORTH)"; icon_state = "floor"; dir = 1},/area/hallway/secondary/entry) +"aJU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) "aJV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) "aJW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -26},/turf/simulated/floor{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) "aJX" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; initialize_directions = 11},/obj/machinery/light,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{dir = 4; icon_state = "browncorner"},/area/construction/Storage{name = "Storage Wing"}) @@ -1873,7 +1873,7 @@ "aKa" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/construction/Storage{name = "Storage Wing"}) "aKb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/construction/Storage{name = "Storage Wing"}) "aKc" = (/obj/machinery/light_switch{pixel_x = 28; pixel_y = 0},/turf/simulated/floor/carpet/arcade,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) -"aKd" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/bridge) +"aKd" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/newscaster/security_unit{pixel_x = 0; pixel_y = -30},/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/fore) "aKe" = (/obj/structure/table,/obj/item/weapon/folder/red,/obj/item/weapon/handcuffs,/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/fore) "aKf" = (/obj/structure/table,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/recharger,/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/fore) "aKg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) @@ -2075,7 +2075,7 @@ "aNU" = (/turf/simulated/floor,/area/supply/storage) "aNV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor,/area/supply/storage) "aNW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/requests_console{announcementConsole = 0; department = "Engineering"; departmentType = 4; name = "Engineering RC"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) -"aNX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/engineering/ce) +"aNX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/effect/decal/warning_stripes{tag = "icon-loading_area (WEST)"; icon_state = "loading_area"; dir = 8},/turf/simulated/floor,/area/supply/storage) "aNY" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #3"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/bot/mulebot{home_destination = "QM #3"; suffix = "#3"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/firealarm{dir = 4; pixel_x = 28},/turf/simulated/floor,/area/supply/storage) "aNZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "aOa" = (/obj/structure/rack,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/storage/primary) @@ -2083,8 +2083,8 @@ "aOc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor,/area/storage/primary) "aOd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor,/area/storage/primary) "aOe" = (/obj/structure/table,/obj/item/device/assembly/igniter{pixel_x = -4; pixel_y = -4},/obj/item/device/assembly/igniter,/obj/item/weapon/screwdriver{pixel_y = 16},/turf/simulated/floor{dir = 4; icon_state = "brown"},/area/storage/primary) -"aOf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "brown"},/area/supply/office{name = "\improper Cargo Office"}) -"aOg" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/bridge) +"aOf" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/security/brig) +"aOg" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/window/full/reinforced,/obj/machinery/ai_status_display{pixel_y = 0},/turf/simulated/floor/plating,/area/bridge) "aOh" = (/obj/structure/table,/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Core Modules"; req_access_txt = "20"},/obj/structure/window/reinforced,/obj/machinery/flasher{pixel_x = 0; pixel_y = 24; id_tag = "AI"},/obj/item/weapon/aiModule/freeform/core,/obj/item/weapon/aiModule/core/asimov,/obj/item/weapon/aiModule/core/robocop,/obj/item/weapon/aiModule/core/corp,/obj/item/weapon/aiModule/core/paladin,/obj/item/weapon/aiModule/core/robocop,/obj/item/weapon/aiModule/standard/protectStation,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "aOi" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "aOj" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) @@ -2115,7 +2115,7 @@ "aOI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aOJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/junction{dir = 4; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)"},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aOK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/locker) -"aOL" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/bridge) +"aOL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor,/area/crew_quarters/locker) "aOM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=14.5-Recreation"; location = "14.3-Lockers-Dorms"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aON" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/closet/secure_closet/exile,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{dir = 2; icon_state = "floor"},/area/gateway) "aOO" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor{dir = 2; icon_state = "floor"},/area/gateway) @@ -2173,7 +2173,7 @@ "aPO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "aPP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "aPQ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/ai_slipper{icon_state = "motion0"; uses = 8},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) -"aPR" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{icon_state = "0-8"},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/bridge) +"aPR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "aPS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "aPT" = (/obj/machinery/turret{dir = 8},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) "aPU" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{icon_state = "0-8"},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/bridge) @@ -2239,7 +2239,7 @@ "aRc" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 5; icon_state = "floor"},/area/supply/storage) "aRd" = (/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/carpet/arcade,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "aRe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor,/area/supply/qm) -"aRf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/security/checkpoint2{name = "Customs"}) +"aRf" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/supply/qm) "aRg" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/locker) "aRh" = (/obj/structure/table,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/item/weapon/pen/red,/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = 32; pixel_y = 0},/turf/simulated/floor,/area/supply/qm) "aRi" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = -28},/turf/simulated/floor{dir = 2; icon_state = "brown"},/area/supply/qm) @@ -2263,7 +2263,7 @@ "aRA" = (/obj/machinery/vending/boozeomat,/obj/machinery/door_control{id_tag = "barwindow"; name = "Window Shutter Control"; pixel_x = 0; pixel_y = 22; req_access_txt = "28"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "aRB" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/primary/starboard) "aRC" = (/obj/machinery/light,/turf/simulated/floor{dir = 2; icon_state = "redcorner"},/area/hallway/primary/fore) -"aRD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/hallway/secondary/entry) +"aRD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "brown"},/area/supply/office{name = "\improper Cargo Office"}) "aRE" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/primary/starboard) "aRF" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Head of Personnel's Desk"; departmentType = 5; name = "Head of Personnel RC"; pixel_y = 30},/obj/item/weapon/storage/secure/briefcase,/obj/structure/table,/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/heads/hop) "aRG" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/machinery/light/small{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/crew_quarters/locker) @@ -2371,7 +2371,7 @@ "aTE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) "aTF" = (/obj/structure/closet/secure_closet/bar{req_access_txt = "25"},/obj/item/device/radio/headset/headset_service,/obj/item/device/eftpos{eftpos_name = "HoP EFTPOS scanner"},/obj/structure/sign/securearea{desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; icon_state = "monkey_painting"; name = "Mr. Deempisi portrait"; pixel_x = 0; pixel_y = 22},/turf/simulated/floor/wood,/area/crew_quarters/bar) "aTG" = (/obj/machinery/reagentgrinder,/obj/structure/table/woodentable,/obj/machinery/requests_console{department = "Bar"; departmentType = 2; pixel_x = 0; pixel_y = 30},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"aTH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"aTH" = (/obj/machinery/camera{c_tag = "Engineering - Foyer - E"; dir = 8; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/engineering/break_room) "aTI" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) "aTJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) "aTK" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"; req_one_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -2384,7 +2384,7 @@ "aTR" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/hallway/secondary/entry) "aTS" = (/turf/simulated/floor,/area/hallway/secondary/entry) "aTT" = (/obj/structure/closet,/turf/simulated/floor{icon_state = "dark"},/area/engineering/break_room) -"aTU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) +"aTU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/courtroom) "aTV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -25},/turf/simulated/floor{dir = 2; icon_state = "arrival"},/area/hallway/secondary/entry) "aTW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "arrival"},/area/hallway/secondary/entry) "aTX" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor{dir = 1; icon_state = "arrival"},/area/hallway/secondary/entry) @@ -2451,7 +2451,7 @@ "aVg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor,/area/hallway/secondary/entry) "aVh" = (/obj/item/device/radio/beacon,/turf/simulated/floor,/area/hallway/secondary/entry) "aVi" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/hallway/secondary/entry) -"aVj" = (/obj/machinery/door/airlock/hatch{icon = 'icons/obj/doors/hightechsecurity.dmi'; name = "Telecoms Control Room"; req_access_txt = "61;501"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) +"aVj" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/secondary/entry) "aVk" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry) "aVl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/supply/storage) "aVm" = (/obj/machinery/conveyor_switch/oneway{convdir = -1; id_tag = "QMLoad"},/turf/simulated/floor{dir = 8; icon_state = "floor"},/area/supply/storage) @@ -2465,7 +2465,7 @@ "aVu" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/storage/primary) "aVv" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/storage/primary) "aVw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/storage/primary) -"aVx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/item/device/radio/intercom{dir = 2; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) +"aVx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/storage/primary) "aVy" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor{dir = 4; icon_state = "brown"},/area/storage/primary) "aVz" = (/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload_foyer) "aVA" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/table/reinforced,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/door/window/brigdoor{dir = 2; name = "Arrivals Security Checkpoint"; req_access = "63"; req_one_access = null},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/security/checkpoint2{name = "Customs"}) @@ -2473,7 +2473,7 @@ "aVC" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (NORTH)"; icon_state = "warning_corner"; dir = 1},/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_x = 28; pixel_y = 0},/obj/machinery/camera{c_tag = "AI Upload Access"; dir = 2; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/door_control{id_tag = "ai shutter"; name = "AI Upload Privacy Shutter Control"; pixel_x = -1; pixel_y = 24; req_access_txt = "19"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "aVD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/light/small,/turf/simulated/floor{icon_state = "dark"},/area/janitor) "aVE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/camera{c_tag = "Security - Courtroom - Gallery"; dir = 8; network = list("SS13")},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/courtroom) -"aVF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/engineering/atmos_control) +"aVF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light{dir = 8},/turf/simulated/floor,/area/crew_quarters/courtroom) "aVG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/crew_quarters/courtroom) "aVH" = (/obj/machinery/power/apc{cell_type = 2500; dir = 2; name = "Courtroom APC"; pixel_x = 1; pixel_y = -24},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/courtroom) "aVI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/courtroom) @@ -2720,7 +2720,7 @@ "bap" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating/airless,/area/engineering/engine) "baq" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/turf/simulated/floor/plating/airless,/area/engineering/engine) "bar" = (/turf/simulated/wall/r_wall,/area/turret_protected/ai) -"bas" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/computer/general_air_control/large_tank_control{name = "Telecomms Room Monitoring"; sensors = list("tcomms_sensor" = "Server Room")},/turf/simulated/floor{icon_state = "dark"},/area) +"bas" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/camera{c_tag = "MiniSat - AI Core - W"; dir = 4; network = list("SS13","MiniSat","RD")},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "bat" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/machinery/door/window{dir = 4; name = "Secondary AI Core Access"; pixel_x = 0; req_access_txt = "16"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) "bau" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/landmark{name = "tripai"},/obj/item/device/radio/intercom{anyai = 1; broadcasting = 0; freerange = 1; frequency = 1447; name = "Private Channel"; pixel_x = 0; pixel_y = -26},/obj/item/device/radio/intercom{broadcasting = 1; freerange = 1; listening = 1; name = "Common Channel"; pixel_y = 25},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) "bav" = (/obj/item/device/radio/intercom{broadcasting = 1; freerange = 1; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/effect/landmark/start{name = "AI"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/light/small{dir = 1; invisibility = 1},/obj/item/device/radio/intercom{anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; pixel_x = -27; pixel_y = 4},/obj/item/device/radio/intercom{anyai = 1; broadcasting = 0; freerange = 1; frequency = 1447; name = "Private Channel"; pixel_x = 28; pixel_y = 5},/turf/simulated/floor/bluegrid,/area/turret_protected/ai) @@ -2734,7 +2734,7 @@ "baD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "baE" = (/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/secondary/entry) "baF" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (WEST)"; icon_state = "warning_corner"; dir = 8},/turf/simulated/floor,/area/hallway/secondary/entry) -"baG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/hallway/primary/port) +"baG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-warningcorner (NORTH)"; icon_state = "floor"; dir = 1},/area/hallway/secondary/entry) "baH" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry) "baI" = (/turf/simulated/wall,/area/security/checkpoint2{name = "Customs"}) "baJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -2755,7 +2755,7 @@ "baY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/hallway/primary/central) "baZ" = (/obj/machinery/door/airlock{name = "Custodial Closet"; req_access_txt = "26"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/janitor) "bba" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/hallway/primary/central) -"bbb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) +"bbb" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) "bbc" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/hallway/primary/central) "bbd" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/hologram/holopad,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/hallway/primary/central) "bbe" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "L2"},/area/hallway/primary/central) @@ -2770,9 +2770,9 @@ "bbn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/central) "bbo" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=15-Court"; location = "14.9-CrewQuarters-Central"},/turf/simulated/floor,/area/hallway/primary/central) "bbp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/hallway/primary/central) -"bbq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) +"bbq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) "bbr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) -"bbs" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/hatch{name = "MiniSat Central Foyer"; req_one_access_txt = "32;19;501"},/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) +"bbs" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/engineering/mechanics) "bbt" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/engineering/mechanics) "bbu" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/engineering/mechanics) "bbv" = (/obj/machinery/door/airlock/maintenance{name = "Store Maintenance"; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fore) @@ -2780,7 +2780,7 @@ "bbx" = (/turf/simulated/wall/r_wall,/area/storage/tech) "bby" = (/obj/machinery/power/apc{dir = 8; name = "Tech Storage APC"; pixel_x = -27; pixel_y = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor{icon_state = "dark"},/area/storage/tech) "bbz" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/storage/tech) -"bbA" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/hatch{name = "MiniSat Transit Tube"; req_one_access_txt = "32;19;501"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/engineering/break_room) +"bbA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/storage/tech) "bbB" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "dark"},/area/storage/tech) "bbC" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = -3; pixel_y = 3},/obj/item/stack/cable_coil,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{icon_state = "dark"},/area/storage/tech) "bbD" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/engineering/mechanics) @@ -2931,7 +2931,7 @@ "bes" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry) "bet" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_command{name = "Council Chamber"; req_access_txt = "19"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/bridge) "beu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/checkpoint2{name = "Customs"}) -"bev" = (/obj/structure/table/woodentable,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/gun/projectile/russian,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/obj/machinery/alarm{pixel_y = 23},/obj/item/weapon/rsf,/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bev" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/security/checkpoint2{name = "Customs"}) "bew" = (/obj/machinery/power/apc{dir = 4; name = "Security Checkpoint APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable/yellow,/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/checkpoint2{name = "Customs"}) "bex" = (/turf/simulated/wall,/area/storage/emergency2) "bey" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -2988,7 +2988,7 @@ "bfx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "dark"},/area/storage/tech) "bfy" = (/obj/item/weapon/folder/blue,/obj/item/weapon/stamp/hop,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table,/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/heads/hop) "bfz" = (/obj/structure/stool/bed/chair/office/light,/obj/machinery/door_control{desc = "A remote control-switch for secure storage."; id_tag = "Secure Storage"; name = "Engineering Secure Storage"; pixel_x = -24; pixel_y = 5; req_access_txt = "11"},/obj/machinery/door_control{id_tag = "transittube"; name = "Transit Tube Lockdown"; pixel_x = -24; pixel_y = -5; req_access_txt = "24"},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/engineering/ce) -"bfA" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) +"bfA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/engineering/ce) "bfB" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/engineering/ce) "bfC" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/engineering/ce) "bfD" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/engineering/ce) @@ -2999,7 +2999,7 @@ "bfI" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) "bfJ" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) "bfK" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"},/obj/item/weapon/wrench,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door_control{id_tag = "Singularity"; name = "Shutters Control"; pixel_x = 0; pixel_y = -24; req_access_txt = "11"},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) -"bfL" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"},/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) +"bfL" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"},/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) "bfM" = (/obj/structure/table,/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/light_switch{pixel_x = 0; pixel_y = -28},/obj/item/weapon/circuitboard/power_control,/obj/item/weapon/circuitboard/airlock,/turf/simulated/floor{icon_state = "dark"},/area/storage/tech) "bfN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/engineering/engine) "bfO" = (/obj/machinery/portable_atmospherics/canister/plasma,/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine) @@ -3168,7 +3168,7 @@ "biV" = (/obj/structure/stool/bed/chair/comfy/brown{tag = "icon-comfychair_brown (WEST)"; icon_state = "comfychair_brown"; dir = 8},/turf/simulated/floor/carpet/arcade,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "biW" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/photo_album{pixel_y = -4},/obj/item/device/camera{pixel_y = 4},/obj/item/weapon/storage/secure/safe{pixel_x = -24},/turf/simulated/floor/carpet/arcade,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "biX" = (/turf/simulated/floor/carpet/arcade,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) -"biY" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/carpet/arcade,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) +"biY" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/carpet/arcade,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "biZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/carpet/arcade,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bja" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/central) "bjb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/camera{c_tag = "Central Primary Hallway - NE"; dir = 8; network = list("SS13")},/turf/simulated/floor{dir = 4; icon_state = "yellowcorner"},/area/hallway/primary/central) @@ -3229,8 +3229,8 @@ "bke" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/primary/port) "bkf" = (/obj/structure/disposalpipe/sortjunction{dir = 2; icon_state = "pipe-j1s"; sortType = 2},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/primary/port) "bkg" = (/turf/simulated/floor{dir = 2; icon_state = "browncorner"},/area/hallway/primary/port) -"bkh" = (/obj/structure/table,/obj/item/weapon/storage/fancy/crayons,/obj/item/weapon/storage/fancy/crayons,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/storage/art) -"bki" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/hallway/primary/port) +"bkh" = (/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 4},/obj/item/weapon/pen,/obj/structure/window/reinforced,/obj/structure/table,/obj/machinery/door_control{id_tag = "hop2"; name = "Privacy Shutters Control"; pixel_x = -24; pixel_y = -6; req_access_txt = "28"},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/heads/hop) +"bki" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) "bkj" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) "bkk" = (/obj/machinery/power/apc{dir = 8; name = "Custodial Closet APC"; pixel_x = -24},/obj/structure/table,/obj/item/clothing/gloves/orange,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor{icon_state = "dark"},/area/janitor) "bkl" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/mob/living/simple_animal/lizard{name = "Wags-His-Tail"; real_name = "Wags-His-Tail"},/turf/simulated/floor{icon_state = "dark"},/area/janitor) @@ -3303,7 +3303,7 @@ "blA" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"; req_one_access_txt = "0"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "blB" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/airlock/glass_mining{name = "Cargo Bay"; req_access_txt = "31"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/supply/storage) "blC" = (/obj/machinery/conveyor_switch/oneway{convdir = -1; id_tag = "packageExternal"; pixel_y = 18},/obj/effect/decal/warning_stripes{tag = "icon-loading_area (EAST)"; icon_state = "loading_area"; dir = 4},/turf/simulated/floor,/area/supply/office{name = "\improper Cargo Office"}) -"blD" = (/obj/machinery/computer/security/mining,/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/heads/hop) +"blD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/supply/office{name = "\improper Cargo Office"}) "blE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/supply/office{name = "\improper Cargo Office"}) "blF" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor,/area/supply/office{name = "\improper Cargo Office"}) "blG" = (/obj/item/device/radio/intercom{dir = 2; name = "Station Intercom (General)"; pixel_x = 27; pixel_y = 0},/obj/machinery/cooking/still,/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -3313,7 +3313,7 @@ "blK" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/light_switch{pixel_x = 27; pixel_y = 0},/turf/simulated/floor{dir = 4; icon_state = "brown"},/area/supply/office{name = "\improper Cargo Office"}) "blL" = (/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/hallway/primary/port) "blM" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor,/area/hallway/primary/port) -"blN" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/heads/hop) +"blN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/port) "blO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) "blP" = (/obj/structure/table,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/turf/simulated/floor{icon_state = "dark"},/area/janitor) "blQ" = (/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 4},/obj/item/weapon/pen,/obj/structure/table,/obj/machinery/door_control{id_tag = "hop2"; name = "Privacy Shutters Control"; pixel_x = -24; pixel_y = -6; req_access_txt = "28"},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/heads/hop) @@ -3331,7 +3331,7 @@ "bmc" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{dir = 4; icon_state = "darkbluecorners"; tag = "icon-darkblue (NORTH)"},/area/bridge) "bmd" = (/obj/machinery/computer/security/mining,/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = 24},/turf/simulated/floor{tag = "icon-darkblue (NORTH)"; icon_state = "darkblue"; dir = 1},/area/bridge) "bme" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Bridge"; departmentType = 5; name = "Bridge RC"; pixel_x = 32; pixel_y = 0},/obj/machinery/computer/ordercomp,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{dir = 5; icon_state = "darkblue"; tag = "icon-darkblue (NORTH)"},/area/bridge) -"bmf" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/hallway/primary/central) +"bmf" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/starboard) "bmg" = (/turf/simulated/wall,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bmh" = (/obj/machinery/power/apc{aidisabled = 0; dir = 2; name = "MiniSat Exterior APC"; pixel_y = -24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bmi" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/binary/valve,/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/plating,/area/construction/hallway{name = "\improper MiniSat Exterior"}) @@ -3350,7 +3350,7 @@ "bmv" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/hallway/primary/starboard) "bmw" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/junction{dir = 2; icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/hallway/primary/starboard) "bmx" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor,/area/hallway/primary/starboard) -"bmy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) +"bmy" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/hallway/primary/starboard) "bmz" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/hallway/primary/starboard) "bmA" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/hallway/primary/starboard) "bmB" = (/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) @@ -3369,7 +3369,7 @@ "bmO" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/simulated/shuttle/wall{tag = "icon-swall_f5"; icon_state = "swall_f5"; dir = 2},/area/shuttle/escape_pod5/station) "bmP" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s9"; icon_state = "swall_s9"; dir = 2},/area/shuttle/escape_pod5/station) "bmQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{icon_state = "dark vault full"},/area/engineering/antimatter_room) -"bmR" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{icon_state = "dark vault stripe"},/area/engineering/antimatter_room) +"bmR" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "dark vault stripe"},/area/engineering/antimatter_room) "bmS" = (/turf/simulated/floor{icon_state = "dark vault stripe"},/area/engineering/antimatter_room) "bmT" = (/obj/machinery/camera{c_tag = "Engineering - AME Room"; dir = 1; network = list("SS13")},/turf/simulated/floor{icon_state = "dark vault stripe"},/area/engineering/antimatter_room) "bmU" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "dark vault stripe"},/area/engineering/antimatter_room) @@ -3428,12 +3428,12 @@ "bnV" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor{dir = 2; icon_state = "brown"},/area/hallway/primary/port) "bnW" = (/obj/structure/rack,/obj/item/weapon/screwdriver{pixel_y = 10},/obj/item/weapon/storage/box/labels,/obj/item/weapon/hand_labeler,/obj/item/weapon/storage/box/labels,/obj/item/weapon/hand_labeler,/turf/simulated/floor{dir = 2; icon_state = "floor"},/area/supply/storage) "bnX" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/command{name = "Captain's Office"; req_access = null; req_access_txt = "20"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/bridge) -"bnY" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/transit_tube/station{dir = 8},/obj/structure/transit_tube_pod,/turf/simulated/floor{icon_state = "dark"},/area/engineering/break_room) -"bnZ" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/hatch{name = "MiniSat Transit Tube"; req_one_access_txt = "32;19;501"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/engineering/break_room) -"boa" = (/obj/structure/mirror{pixel_x = 28},/obj/machinery/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) -"bob" = (/obj/structure/closet/walllocker/emerglocker/west{pixel_x = 32},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/engine,/area/tcomms/chamber) +"bnY" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) +"bnZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) +"boa" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/window{dir = 2; name = "HoP's Desk"; pixel_y = 0; req_access_txt = "57"},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/heads/hop) +"bob" = (/obj/structure/closet/walllocker/emerglocker/west{pixel_x = 32},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor/engine,/area/tcomms/chamber) "boc" = (/obj/item/device/radio/off,/turf/simulated/floor/plating,/area/maintenance/maintcentral) -"bod" = (/obj/structure/mirror{pixel_x = -28},/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"bod" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) "boe" = (/turf/simulated/floor{dir = 8; icon_state = "darkblue"; tag = "icon-darkblue (NORTH)"},/area/bridge) "bof" = (/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/carpet/arcade,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bog" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/carpet/arcade,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) @@ -3530,7 +3530,7 @@ "bpT" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bpU" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bpV" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/maintcentral) -"bpW" = (/obj/machinery/camera{c_tag = "Command - Bridge - W"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor{dir = 8; icon_state = "darkblue"; tag = "icon-darkblue (NORTH)"},/area/bridge) +"bpW" = (/obj/machinery/camera{c_tag = "Command - Bridge - W"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{dir = 8; icon_state = "darkblue"; tag = "icon-darkblue (NORTH)"},/area/bridge) "bpX" = (/turf/simulated/floor{dir = 2; icon_state = "darkblue"; tag = "icon-darkblue (NORTH)"},/area/bridge) "bpY" = (/turf/simulated/floor{dir = 6; icon_state = "darkblue"; tag = "icon-darkblue (NORTH)"},/area/bridge) "bpZ" = (/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/hatch{icon = 'icons/obj/doors/hightechsecurity.dmi'; icon_state = "door_closed"; name = "MoMMI Nest"; req_one_access_txt = "16"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/construction/mommi_nest) @@ -3575,7 +3575,7 @@ "bqM" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor{icon_state = "grimy"},/area/hallway/primary/port) "bqN" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/turret{dir = 2; health = 160},/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) "bqO" = (/obj/structure/stool/bed/chair/comfy/beige,/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor{icon_state = "grimy"},/area/hallway/primary/port) -"bqP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/machinery/newscaster/security_unit{pixel_x = 0; pixel_y = -30},/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/fore) +"bqP" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/port) "bqQ" = (/obj/structure/transit_tube{tag = "icon-D-NE"; icon_state = "D-NE"},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "bqR" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "bqS" = (/obj/item/device/radio/beacon,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) @@ -3638,7 +3638,7 @@ "brX" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 4; icon_state = "brown"},/area/hallway/primary/port) "brY" = (/obj/machinery/light_switch{pixel_x = -25; pixel_y = 0},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) "brZ" = (/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) -"bsa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) +"bsa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) "bsb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/hallway/primary/port) "bsc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/item/device/radio/intercom{dir = 2; name = "Station Intercom (General)"; pixel_x = -26; pixel_y = 0},/turf/simulated/floor{dir = 10; icon_state = "darkblue"; tag = "icon-darkblue (NORTH)"},/area/bridge) "bsd" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) @@ -3706,7 +3706,7 @@ "btn" = (/obj/machinery/power/solar/control{id_tag = "minisatsolar"; name = "MiniSat Solar Control"; track = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/prison/solar_control{name = "\improper MiniSat Solar Array Control"}) "bto" = (/obj/structure/closet/secure_closet/engineering_mechanic,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/engineering/mechanics) "btp" = (/obj/structure/transit_tube{tag = "icon-W-SE"; icon_state = "W-SE"},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) -"btq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/engineering/break_room) +"btq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "dark"},/area/engineering/break_room) "btr" = (/obj/machinery/r_n_d/fabricator/circuit_imprinter,/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor{icon_state = "dark"},/area/engineering/mechanics) "bts" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "btt" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) @@ -3754,15 +3754,15 @@ "buj" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j1s"; sortType = 3},/turf/simulated/floor,/area/hallway/primary/port) "buk" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/hallway/primary/port) "bul" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor,/area/hallway/primary/port) -"bum" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/effect/decal/warning_stripes{tag = "icon-loading_area (WEST)"; icon_state = "loading_area"; dir = 8},/turf/simulated/floor,/area/supply/storage) +"bum" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bun" = (/obj/structure/transit_tube{tag = "icon-E-SW"; icon_state = "E-SW"},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/engineering/break_room) "buo" = (/obj/structure/table/woodentable,/obj/item/weapon/hand_tele,/obj/structure/window/reinforced,/obj/item/device/radio/intercom{dir = 2; name = "Station Intercom (General)"; pixel_x = 27; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bup" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/hallway/primary/central) -"buq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{dir = 2; icon_state = "floor"},/area/engineering/engine) +"buq" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/hallway/primary/central) "bur" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/blue,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/item/weapon/stamp/captain,/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bus" = (/obj/machinery/light_switch{pixel_x = 32; pixel_y = -4},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) "but" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) -"buu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{dir = 8; icon_state = "dark neutral full"},/area/crew_quarters/sleep) +"buu" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/red,/obj/item/weapon/folder/red,/obj/item/weapon/folder/red,/obj/item/clothing/glasses/sunglasses/big,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/lawoffice{name = "\improper Internal Affairs Office"}) "buv" = (/obj/machinery/door/airlock/maintenance{name = "Bar Storage"; req_access_txt = "12"; req_one_access_txt = "0"},/turf/simulated/floor/wood,/area/maintenance/ghettobar) "buw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/hallway/primary/central) "bux" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/command{name = "Head of Personnel"; req_access = null; req_access_txt = "57"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/heads/hop) @@ -3770,7 +3770,7 @@ "buz" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/primary/port) "buA" = (/turf/simulated/wall,/area/bridge) "buB" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/vending/coffee{pixel_x = 1},/obj/structure/window/reinforced,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/carpet,/area/bridge) -"buC" = (/obj/machinery/door_control{id_tag = "bridge blast"; name = "Bridge Blast Door Control"; pixel_x = -1; pixel_y = -24; req_access_txt = "19"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/machinery/camera{c_tag = "Command - Bridge - C"; dir = 1; network = list("SS13")},/obj/structure/window/reinforced,/turf/simulated/floor/carpet,/area/bridge) +"buC" = (/obj/machinery/door_control{id_tag = "bridge blast"; name = "Bridge Blast Door Control"; pixel_x = -1; pixel_y = -24; req_access_txt = "19"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/machinery/camera{c_tag = "Command - Bridge - C"; dir = 1; network = list("SS13")},/obj/structure/window/reinforced,/turf/simulated/floor/carpet,/area/bridge) "buD" = (/obj/structure/window/reinforced,/turf/simulated/floor/carpet,/area/bridge) "buE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/door_control{id_tag = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -1; pixel_y = -24; req_access_txt = "19"},/obj/structure/window/reinforced,/turf/simulated/floor/carpet,/area/bridge) "buF" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/vending/cigarette{pixel_x = -1},/obj/structure/window/reinforced,/turf/simulated/floor/carpet,/area/bridge) @@ -3793,7 +3793,7 @@ "buW" = (/obj/effect/landmark/start{name = "Bartender"},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) "buX" = (/turf/simulated/floor/wood,/area/crew_quarters/bar) "buY" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"buZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"buZ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bva" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light/small,/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) "bvb" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) "bvc" = (/obj/structure/disposalpipe/sortjunction{dir = 2; icon_state = "pipe-j1s"; sortType = 19},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -3837,7 +3837,7 @@ "bvO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) "bvP" = (/obj/machinery/door/airlock/hatch{name = "MiniSat East Wing"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) "bvQ" = (/obj/machinery/alarm{pixel_y = 26},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) -"bvR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/hallway/primary/fore) +"bvR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomeast{name = "\improper MiniSat East Wing"}) "bvS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/device/radio/intercom{dir = 2; name = "Station Intercom (General)"; pixel_x = 27; pixel_y = 0},/turf/simulated/floor{dir = 1; icon_state = "darkbluecorners"; tag = "icon-darkblue (NORTH)"},/area/bridge) "bvT" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bvU" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/space,/area) @@ -3895,7 +3895,7 @@ "bwU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) "bwV" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/storage/art) "bwW" = (/obj/machinery/power/apc{dir = 2; name = "Art Storage APC"; pixel_y = -24},/obj/structure/cable/yellow,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/storage/art) -"bwX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"bwX" = (/obj/structure/table,/obj/item/weapon/storage/fancy/crayons,/obj/item/weapon/storage/fancy/crayons,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/storage/art) "bwY" = (/obj/structure/table,/obj/item/device/camera,/obj/machinery/firealarm{dir = 4; pixel_x = 28},/turf/simulated/floor,/area/storage/art) "bwZ" = (/obj/structure/closet/gmcloset{desc = "It's a storage unit."; icon_closed = "black"; icon_state = "black"; name = "spare gear"},/obj/item/weapon/table_parts,/obj/item/weapon/table_parts,/obj/item/weapon/table_parts/wood,/obj/item/weapon/table_parts/wood,/obj/item/weapon/table_parts/wood/poker,/obj/item/weapon/table_parts/wood/poker,/obj/item/weapon/wrench,/obj/machinery/camera{c_tag = "Service - Bar - Backroom"; dir = 1; network = list("SS13")},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bxa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -3935,7 +3935,7 @@ "bxI" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/bluegrid{icon_state = "bcircuitoff"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) "bxJ" = (/obj/structure/disposalpipe/segment,/obj/machinery/camera{c_tag = "Command - Captain's Office"; dir = 4; network = list("SS13")},/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "bxK" = (/obj/machinery/light/small,/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/turret{dir = 1; health = 160},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) -"bxL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/machinery/light_switch{pixel_x = -26},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"bxL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) "bxM" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "bcircuitoff"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) "bxN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/bluegrid{icon_state = "bcircuitoff"},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "bxO" = (/obj/machinery/light/small,/obj/machinery/turret{dir = 8; health = 160},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) @@ -3999,7 +3999,7 @@ "byU" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "courtroompriv"; name = "Privacy Shutters"; opacity = 0},/obj/machinery/door/airlock{name = "Internal Affairs"; req_access_txt = "38"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/courtroom) "byV" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) "byW" = (/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) -"byX" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 28},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"byX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/bar) "byY" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor/wood,/area/crew_quarters/bar) "byZ" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor{dir = 8; icon_state = "caution"},/area/hallway/primary/starboard) "bza" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) @@ -4039,7 +4039,7 @@ "bzI" = (/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/hallway/secondary/entry) "bzJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/hallway/secondary/entry) "bzK" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/hallway/secondary/entry) -"bzL" = (/obj/machinery/shower{tag = "icon-shower (WEST)"; icon_state = "shower"; dir = 8},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) +"bzL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/hallway/secondary/entry) "bzM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/hallway/secondary/entry) "bzN" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/hallway/secondary/entry) "bzO" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Unisex Restrooms"; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet{name = "\improper Restrooms"}) @@ -4158,7 +4158,7 @@ "bBX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{icon_state = "neutral"},/area/hallway/primary/port) "bBY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor{icon_state = "neutral"},/area/hallway/primary/port) "bBZ" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor{icon_state = "neutral"; dir = 6},/area/hallway/primary/port) -"bCa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/storage/primary) +"bCa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/port) "bCb" = (/obj/structure/sign/map/meta/left{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-left-MS"; pixel_y = -32},/turf/simulated/floor{icon_state = "neutral"; dir = 10},/area/hallway/primary/port) "bCc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/sign/map/meta/right{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-right-MS"; pixel_y = -32},/turf/simulated/floor{icon_state = "neutral"},/area/hallway/primary/port) "bCd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "neutral"; dir = 6},/area/hallway/primary/port) @@ -4275,8 +4275,8 @@ "bEk" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_x = 0; pixel_y = 32},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bEl" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/flasher{id_tag = "hopflash"; pixel_x = 28},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bEm" = (/turf/simulated/wall/r_wall,/area/bridge/meeting_room{name = "\improper Command Hallway"}) -"bEn" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload_foyer) -"bEo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor/wood,/area/bridge) +"bEn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/device/radio/intercom{dir = 2; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/carpet,/area/crew_quarters/captain{name = "\improper Captain's Quarters"}) +"bEo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/wood,/area/bridge) "bEp" = (/obj/machinery/door_control{id_tag = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = 0; pixel_y = -24; req_access_txt = "19"},/turf/simulated/floor/carpet,/area/bridge) "bEq" = (/obj/structure/stool/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/carpet,/area/bridge) "bEr" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/white,/turf/simulated/floor/carpet,/area/bridge) @@ -4285,7 +4285,7 @@ "bEu" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/carpet,/area/bridge) "bEv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/wood{tag = "icon-wood-broken4"; icon_state = "wood-broken4"},/area/bridge) "bEw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/aft{name = "Aft Maintenance"}) -"bEx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/hallway/primary/central) +"bEx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/hallway/primary/central) "bEy" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 5},/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3; pixel_y = 3},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bEz" = (/obj/structure/stool/bed/chair/wood/wings{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bEA" = (/obj/machinery/teleport/station,/turf/simulated/floor/plating,/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) @@ -4293,7 +4293,7 @@ "bEC" = (/obj/machinery/teleport/hub,/turf/simulated/floor/plating,/area/turret_protected/tcomfoyer{name = "\improper MiniSat Teleporter Foyer"}) "bED" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/science/hallway{name = "Research Division"}) "bEE" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/obj/machinery/light{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/central) -"bEF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor,/area/hallway/primary/central) +"bEF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor,/area/hallway/primary/central) "bEG" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) "bEH" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/matches{pixel_y = 5},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bEI" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -4309,12 +4309,12 @@ "bES" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{glass = 0; icon = 'icons/obj/doors/doorresearch.dmi'; id_tag = ""; name = "Research Division"; opacity = 1; req_access_txt = "0"; req_one_access_txt = "47"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/hallway{name = "Research Division"}) "bET" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) "bEU" = (/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/starboard) -"bEV" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload) +"bEV" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) "bEW" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine) "bEX" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=12-Central-Starboard"; location = "11.1-Command-Starboard"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/hallway/primary/central) "bEY" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/clothing/gloves/yellow,/obj/item/device/t_scanner,/obj/item/device/multitool,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 28},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/item/device/multitool,/turf/simulated/floor{icon_state = "dark"},/area/storage/tech) "bEZ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{dir = 8; icon_state = "caution"},/area/engineering/atmos_control) -"bFa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/machinery/light{dir = 8},/turf/simulated/floor,/area/crew_quarters/courtroom) +"bFa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/engineering/atmos_control) "bFb" = (/turf/simulated/floor,/area/engineering/atmos_control) "bFc" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/engineering/atmos_control) "bFd" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "caution"; dir = 4},/area/engineering/atmos_control) @@ -4324,7 +4324,7 @@ "bFh" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor,/area/engineering/atmos) "bFi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall,/area/engineering/atmos) "bFj" = (/obj/machinery/atmospherics/binary/volume_pump{icon_state = "intact_on"; name = "Waste In Total"; on = 1},/turf/simulated/floor,/area/engineering/atmos) -"bFk" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/supply/qm) +"bFk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/engineering/atmos) "bFl" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "Mix to Distro"; on = 0},/turf/simulated/floor,/area/engineering/atmos) "bFm" = (/turf/simulated/floor,/area/engineering/atmos) "bFn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor,/area/engineering/atmos) @@ -4367,7 +4367,7 @@ "bFY" = (/obj/structure/stool/bed/chair/comfy/black,/turf/simulated/floor/wood,/area/library) "bFZ" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/library) "bGa" = (/obj/machinery/vending/coffee,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor/wood,/area/library) -"bGb" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"bGb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/library) "bGc" = (/obj/structure/flora/pottedplant/random{tag = "icon-plant-22"; icon_state = "plant-22"},/turf/simulated/floor/wood,/area/library) "bGd" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGe" = (/obj/machinery/door/poddoor/shutters/preopen{id_tag = "hopqueue"; name = "HoP Queue Shutters"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-loading_area (NORTH)"; icon_state = "loading_area"; dir = 1},/turf/simulated/floor,/area/bridge/meeting_room{name = "\improper Command Hallway"}) @@ -4390,7 +4390,7 @@ "bGv" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bGw" = (/turf/simulated/floor{dir = 4; icon_state = "whiteyellow"; tag = "icon-whitehall (WEST)"},/area/medical/medbay{name = "Medbay Central"}) "bGx" = (/obj/item/mounted/poster,/obj/item/weapon/reagent_containers/food/drinks/beer{pixel_x = -3; pixel_y = 2},/obj/item/weapon/reagent_containers/food/drinks/ale,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/maintenance/ghettobar) -"bGy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/bridge/meeting_room{name = "\improper Command Hallway"}) +"bGy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bGz" = (/obj/machinery/keycard_auth{pixel_x = 26; pixel_y = 0},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "bGA" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "bGB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/bridge/meeting_room{name = "\improper Command Hallway"}) @@ -4417,8 +4417,8 @@ "bGW" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/turf/simulated/floor/plating,/area/engineering/atmos) "bGX" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/space,/area) "bGY" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/obj/structure/grille,/turf/simulated/wall/r_wall,/area/engineering/atmos) -"bGZ" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) -"bHa" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{dir = 6; icon_state = "floor"},/area/medical/cryo) +"bGZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) +"bHa" = (/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) "bHb" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/light/small{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera{c_tag = "MiniSat - Exterior - Walkway Entrance - S"; dir = 8; network = list("MiniSat")},/turf/simulated/floor{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bHc" = (/obj/machinery/optable,/turf/simulated/floor{icon_state = "showroomfloor"},/area/medical/surgery) "bHd" = (/obj/structure/table,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/engineering/engine) @@ -4435,13 +4435,13 @@ "bHo" = (/obj/machinery/iv_drip,/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "bHp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "bHq" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"bHr" = (/obj/structure/table,/obj/item/weapon/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/weapon/bonesetter,/obj/machinery/door_control{id_tag = "medpriv4"; name = "Privacy Shutters"; pixel_x = 24; pixel_y = 0},/obj/machinery/camera{c_tag = "Medbay - Surgery"; dir = 8; network = list("SS13","Medbay")},/turf/simulated/floor{dir = 8; icon_state = "whitecorner"},/area/medical/surgery) +"bHr" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/security/vacantoffice) "bHs" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/security/vacantoffice) "bHt" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/simulated/floor/wood,/area/security/vacantoffice) "bHu" = (/obj/machinery/turret{dir = 4},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) "bHv" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "floorgrime"},/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) "bHw" = (/obj/machinery/turret{dir = 8},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai) -"bHx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/science/lab) +"bHx" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/crew_quarters/toilet{name = "\improper Auxiliary Restrooms"}) "bHy" = (/obj/item/weapon/cigbutt,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "bHz" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/machinery/newscaster{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/wood,/area/library) "bHA" = (/obj/structure/table/woodentable,/obj/item/weapon/folder,/obj/item/weapon/pen/blue{pixel_x = 5; pixel_y = 5},/turf/simulated/floor/wood,/area/library) @@ -4473,7 +4473,7 @@ "bIa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/camera{c_tag = "Command Hallway - E (E.V.A)"; dir = 2; network = list("SS13")},/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bIb" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bIc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/alarm{pixel_y = 28},/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) -"bId" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) +"bId" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{dir = 4; icon_state = "neutralcorner"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bIe" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/bridge/meeting_room{name = "\improper Command Hallway"}) "bIf" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/poddoor/preopen{id_tag = "Biohazard"; name = "biohazard containment door"},/obj/machinery/door/airlock/maintenance{name = "Research Maintenance"; req_access_txt = "0"; req_one_access_txt = "7;47;29"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/starboard) "bIg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/hallway/primary/central) @@ -4504,8 +4504,8 @@ "bIF" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "waste_in"; name = "Gas Mix Tank Control"; output_tag = "waste_out"; sensors = list("waste_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/filtering/visible{dir = 4},/turf/simulated/floor{icon_state = "green"; dir = 4},/area/engineering/atmos) "bIG" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/atmospherics/pipe/manifold/filtering/visible{dir = 4},/turf/simulated/floor/plating,/area/engineering/atmos) "bIH" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/obj/structure/disposalpipe/segment,/obj/structure/catwalk,/turf/space,/area) -"bII" = (/obj/effect/decal/warning_stripes{icon_state = "nitrogen"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"bIJ" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; id_tag = "n2_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) +"bII" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "waste_sensor"; output = 63},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) +"bIJ" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) "bIK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bIL" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; id_tag = "air_in"; on = 1},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "bIM" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window{name = "Chemistry Desk"; req_access_txt = "5; 33"},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/machinery/door/window{dir = 8; name = "Chemistry Desk"; req_access_txt = "5"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) @@ -4600,18 +4600,18 @@ "bKx" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/obj/machinery/light,/turf/simulated/floor,/area/engineering/atmos) "bKy" = (/obj/machinery/atmospherics/binary/valve/digital{_color = "yellow"; dir = 4; name = "Gas Mix Inlet Valve"},/turf/simulated/floor{icon_state = "green"; dir = 6},/area/engineering/atmos) "bKz" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/filtering/visible{dir = 4},/obj/structure/grille,/turf/simulated/wall/r_wall,/area/engineering/atmos) -"bKA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"bKB" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"bKC" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; id_tag = "o2_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"bKD" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"bKE" = (/obj/effect/decal/warning_stripes{icon_state = "air"},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"bKF" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; id_tag = "air_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"bKG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) -"bKH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) -"bKI" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) -"bKJ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) -"bKK" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) -"bKL" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) +"bKA" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; id_tag = "waste_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) +"bKB" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - Waste"; dir = 1; network = list("SS13")},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) +"bKC" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bKD" = (/obj/machinery/camera{c_tag = "MiniSat - Telecoms - Server Room - NW"; dir = 2; network = list("SS13","tcomm")},/obj/item/device/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Telecoms)"; pixel_x = 0; pixel_y = 29},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bKE" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bKF" = (/obj/machinery/atmospherics/pipe/manifold/insulated/visible/blue,/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bKG" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bKH" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bKI" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bKJ" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bKK" = (/obj/machinery/camera{c_tag = "MiniSat - Telecoms - Server Room - NE"; dir = 2; network = list("SS13","tcomm")},/obj/item/device/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Telecoms)"; pixel_x = 0; pixel_y = 29},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bKL" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bKM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/science/podbay) "bKN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/science/podbay) "bKO" = (/obj/machinery/light/small{dir = 1},/obj/structure/table,/obj/item/pod_parts/armor,/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/science/podbay) @@ -4683,15 +4683,15 @@ "bMc" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/filtering/visible,/turf/simulated/floor/plating,/area/engineering/atmos) "bMd" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/window{base_state = "right"; dir = 1; icon_state = "right"; name = "MiniSat Walkway Access"; req_access_txt = "0"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bMe" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/machinery/light/small{dir = 4},/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) -"bMf" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - N2"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"bMg" = (/obj/machinery/atmospherics/miner/nitrogen,/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/light/small,/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"bMh" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"bMi" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - O2"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"bMj" = (/obj/machinery/atmospherics/miner/oxygen,/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/light/small,/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"bMk" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"bMl" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - Air"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"bMm" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"bMn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor{dir = 8; icon_state = "whitepurplecorner"},/area/science/telescience) +"bMf" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/alarm/server{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bMg" = (/obj/machinery/telecomms/server/presets/science,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bMh" = (/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bMi" = (/obj/machinery/telecomms/receiver/preset_left,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bMj" = (/obj/structure/window/reinforced{dir = 1; layer = 2.9},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bMk" = (/obj/machinery/blackbox_recorder,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bMl" = (/obj/machinery/telecomms/receiver/preset_right,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bMm" = (/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bMn" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bMo" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass_medical{glass = 0; icon = 'icons/obj/doors/doorresearch.dmi'; id_tag = ""; name = "Research Break Room"; opacity = 1; req_access_txt = "0"; req_one_access_txt = "47"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/hallway{name = "Research Division"}) "bMp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/science/podbay) "bMq" = (/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/science/podbay) @@ -4756,7 +4756,7 @@ "bNx" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/light/small{dir = 8},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/camera{c_tag = "Atmospherics - Monitoring - S"; dir = 4; network = list("SS13")},/turf/simulated/floor,/area/engineering/atmos_control) "bNy" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/engineering/atmos_control) "bNz" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/engineering/atmos_control) -"bNA" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/light/small{dir = 4},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/engineering/atmos_control) +"bNA" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/light/small{dir = 4},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/engineering/atmos_control) "bNB" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 5},/obj/machinery/light{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "caution"},/area/engineering/atmos) "bNC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/turf/simulated/floor,/area/engineering/atmos) "bND" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/turf/simulated/floor,/area/engineering/atmos) @@ -4772,10 +4772,10 @@ "bNN" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/filtering/visible{dir = 9},/turf/simulated/floor/plating,/area/engineering/atmos) "bNO" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/command{name = "Chief Medical Officer's Office"; req_access_txt = "40"; req_one_access_txt = "0"},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "bNP" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/poddoor/preopen{id_tag = "Biohazard"; name = "biohazard containment door"},/obj/machinery/door/airlock/maintenance{name = "Research Maintenance"; req_access_txt = "0"; req_one_access_txt = "7;47;29"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"bNQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor/engine,/area/science/telescience) -"bNR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/hallway{name = "Research Division"}) -"bNS" = (/obj/item/device/radio/intercom{broadcasting = 1; freerange = 0; frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -30},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) -"bNT" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/turf/simulated/floor{dir = 4; icon_state = "whitehall"; tag = "icon-whitehall (WEST)"},/area/medical/surgery) +"bNQ" = (/obj/machinery/telecomms/server/presets/medical,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bNR" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bNS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bNT" = (/obj/machinery/telecomms/server/presets/engineering,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bNU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/medical/medbay{name = "Medbay Central"}) "bNV" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "bNW" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"; req_one_access_txt = "0"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -4812,7 +4812,7 @@ "bOB" = (/obj/structure/table/reinforced,/obj/machinery/door/window{dir = 4; name = "Research and Development Desk"; req_access_txt = "7"},/obj/machinery/door/poddoor/shutters/preopen{dir = 2; id_tag = "rndshutters"; name = "research and development lab shutters"},/obj/machinery/door/firedoor/border_only,/obj/item/device/deskbell/signaler/rnd{pixel_x = -3},/turf/simulated/floor/plating,/area/science/lab) "bOC" = (/turf/simulated/wall,/area/crew_quarters/kitchen) "bOD" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) -"bOE" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/machinery/camera{c_tag = "Medbay - Cryogenics"; dir = 1; network = list("SS13","Medbay")},/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor{dir = 6; icon_state = "floor"},/area/medical/cryo) +"bOE" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "tox_sensor"},/obj/machinery/camera{c_tag = "Atmospherics Tank - Plasma"; dir = 1; network = list("SS13")},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) "bOF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/structure/transit_tube/station{dir = 4},/obj/structure/transit_tube_pod{dir = 1; move_speed = 10},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/tcomwest{name = "\improper MiniSat West Wing"}) "bOG" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/starboard) "bOH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/machinery/power/apc{dir = 2; name = "Starboard Maintenance APC"; pixel_x = 0; pixel_y = -28},/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -4823,10 +4823,10 @@ "bOM" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window{dir = 8; name = "Chemistry Desk"; req_access_txt = "5; 33"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/chemistry) "bON" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating,/area/maintenance/starboard) "bOO" = (/turf/simulated/wall/r_wall,/area/engineering/engine_storage{name = "Telecoms Storage"}) -"bOP" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table,/obj/item/weapon/folder/blue,/obj/item/weapon/folder/blue,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) +"bOP" = (/obj/machinery/power/smes{capacity = 6e+006; charge = 2e+006; chargemode = 1; charging = 1; output = 1500},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/light/small,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bOQ" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bOR" = (/obj/machinery/portable_atmospherics/canister/air,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/engineering/atmos_control) -"bOS" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/engineering/atmos_control) +"bOS" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/engineering/atmos_control) "bOT" = (/obj/structure/dispenser{pixel_x = -1},/obj/structure/sign/nosmoking_2{pixel_y = 32},/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) "bOU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 6},/turf/simulated/floor{dir = 8; icon_state = "caution"},/area/engineering/atmos) "bOV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/turf/simulated/floor,/area/engineering/atmos) @@ -4841,13 +4841,13 @@ "bPe" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/n20,/area/engineering/atmos) "bPf" = (/turf/simulated/floor/engine/n20,/area/engineering/atmos) "bPg" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) -"bPh" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) -"bPi" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/science/telescience) -"bPj" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) -"bPk" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) -"bPl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "showroomfloor"},/area/medical/surgery) -"bPm" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/medical/paramedics) -"bPn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) +"bPh" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bPi" = (/obj/machinery/telecomms/bus/preset_two,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bPj" = (/obj/machinery/telecomms/processor/preset_two,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bPk" = (/obj/machinery/message_server,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bPl" = (/obj/machinery/telecomms/processor/preset_four,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bPm" = (/obj/machinery/telecomms/bus/preset_four,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bPn" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bPo" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_research{name = "Research and Development"; req_access_txt = "7"},/turf/simulated/floor{dir = 4; icon_state = "whitepurplefull"; tag = "icon-whitehall (WEST)"},/area/science/lab) "bPp" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/cryo) "bPq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -4881,7 +4881,7 @@ "bPS" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bPT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "bPU" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) -"bPV" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) +"bPV" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bPW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bPX" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bPY" = (/obj/item/weapon/cigbutt,/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -4916,11 +4916,11 @@ "bQB" = (/obj/machinery/atmospherics/miner/sleeping_agent,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine/n20,/area/engineering/atmos) "bQC" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light/small{dir = 4},/obj/machinery/camera{c_tag = "MiniSat - Exterior - SW"; dir = 8; network = list("MiniSat")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bQD" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) -"bQE" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor{dir = 6; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) -"bQF" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) -"bQG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) -"bQH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/hallway/primary/aft) -"bQI" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark/start{name = "Medical Doctor"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2{name = "Medbay Storage"}) +"bQE" = (/obj/machinery/telecomms/bus/preset_one,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bQF" = (/obj/machinery/telecomms/processor/preset_one,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bQG" = (/obj/machinery/telecomms/hub/preset,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bQH" = (/obj/machinery/telecomms/processor/preset_three,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bQI" = (/obj/machinery/telecomms/bus/preset_three,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bQJ" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light/small{dir = 8},/obj/machinery/camera{c_tag = "MiniSat - Exterior - SE"; dir = 4; network = list("MiniSat")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bQK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/medical/surgery) "bQL" = (/obj/machinery/chem_dispenser/mapping{energy = 50; max_energy = 50},/turf/simulated/floor{dir = 1; icon_state = "whiteyellow"; tag = "icon-whitehall (WEST)"},/area/medical/chemistry) @@ -4985,26 +4985,26 @@ "bRS" = (/obj/machinery/door/airlock{icon = 'icons/obj/doors/Doormaint.dmi'; name = "Theatre Backstage"; req_access_txt = "46"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/starboard) "bRT" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=1"; freq = 1400; location = "Theatre"},/obj/structure/plasticflaps{opacity = 1},/turf/simulated/floor/plating,/area/crew_quarters/theatre) "bRU" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) -"bRV" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) +"bRV" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "co2_sensor"},/obj/machinery/camera{c_tag = "Atmospherics Tank - CO2"; dir = 1; network = list("SS13")},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) "bRW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/mob/living/simple_animal/chick{name = "\improper Pomf"},/turf/simulated/floor{dir = 9; icon_state = "green"},/area/hydroponics) "bRX" = (/obj/machinery/atmospherics/unary/heat_reservoir/heater{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) "bRY" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 8},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor{dir = 9; icon_state = "caution"},/area/engineering/atmos) "bRZ" = (/turf/simulated/floor{dir = 1; icon_state = "caution"},/area/engineering/atmos) "bSa" = (/obj/structure/table,/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/machinery/light/small,/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine_storage{name = "Telecoms Storage"}) "bSb" = (/obj/machinery/camera{c_tag = "Atmospherics - NW"; dir = 2; network = list("SS13")},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/weapon/grenade/chem_grenade/metalfoam,/turf/simulated/floor{dir = 1; icon_state = "caution"},/area/engineering/atmos) -"bSc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"bSc" = (/obj/machinery/telecomms/server/presets/command,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bSd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/turf/simulated/floor{dir = 1; icon_state = "yellowcorner"},/area/engineering/atmos) "bSe" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 4; icon_state = "intact_on"; name = "Gas filter (N2O tank)"; on = 1},/obj/machinery/camera{c_tag = "Atmospherics - E"; dir = 8},/turf/simulated/floor{icon_state = "escape"; dir = 6},/area/engineering/atmos) "bSf" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/filtering/visible{dir = 4},/turf/simulated/floor/plating,/area/engineering/atmos) "bSg" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/filtering/visible{dir = 4},/turf/space,/area) "bSh" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "n2o_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/n20,/area/engineering/atmos) "bSi" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) -"bSj" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{dir = 4; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) -"bSk" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/junction{tag = "icon-pipe-j2"; icon_state = "pipe-j2"; dir = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) -"bSl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper{name = "Sleepers"}) +"bSj" = (/obj/machinery/camera{c_tag = "MiniSat - Telecoms - Server Room - W"; dir = 4; network = list("SS13","tcomm")},/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bSk" = (/obj/machinery/air_sensor{id_tag = "tcomms_sensor"; output = 63},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bSl" = (/obj/machinery/light/small{dir = 4},/obj/machinery/camera{c_tag = "MiniSat - Telecoms - Server Room - SE"; dir = 8; network = list("SS13","tcomm")},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bSm" = (/turf/simulated/floor/engine{icon_state = "enginewarn"},/area/science/podbay) -"bSn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) -"bSo" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"bSn" = (/obj/machinery/telecomms/server/presets/security,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bSo" = (/obj/structure/window/reinforced,/obj/machinery/telecomms/server/presets/supply,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bSp" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/security/vacantoffice) "bSq" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/white,/turf/simulated/floor/wood,/area/security/vacantoffice) "bSr" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law{pixel_x = -3; pixel_y = 5},/turf/simulated/floor/wood,/area/security/vacantoffice) @@ -5033,7 +5033,7 @@ "bSO" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/wood,/area/science/showroom{name = "\improper Corporate Showroom"}) "bSP" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood{tag = "icon-wood-broken6"; icon_state = "wood-broken6"},/area/science/showroom{name = "\improper Corporate Showroom"}) "bSQ" = (/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Nanotrasen Corporate Showroom APC"; pixel_x = 28; pixel_y = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/item/weapon/cigbutt,/turf/simulated/floor/wood,/area/science/showroom{name = "\improper Corporate Showroom"}) -"bSR" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"bSR" = (/obj/machinery/telecomms/server/presets/service,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bSS" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bST" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/crew_quarters/theatre) "bSU" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/hallway/primary/central) @@ -5044,7 +5044,7 @@ "bSZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/catwalk{icon_state = "catwalk3"},/turf/space,/area/solar/aport) "bTa" = (/obj/machinery/vending/dinnerware,/turf/simulated/floor{dir = 5; icon_state = "checker"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/kitchen) "bTb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/science/lab) -"bTc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{dir = 5; icon_state = "checker"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/kitchen) +"bTc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{dir = 5; icon_state = "checker"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/kitchen) "bTd" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/cable,/obj/structure/catwalk{icon_state = "catwalk3"},/turf/space,/area/solar/aport) "bTe" = (/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "bTf" = (/mob/living/simple_animal/hostile/retaliate/goat{name = "Pete"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) @@ -5085,18 +5085,18 @@ "bTO" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/fyellow,/obj/item/clothing/suit/storage/hazardvest,/obj/item/device/multitool,/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/storage/tools) "bTP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor,/area/storage/tools) "bTQ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/storage/tools) -"bTR" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 4},/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "whitegreenfull"},/area/medical/medbay{name = "Medbay Central"}) +"bTR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/storage/tools) "bTS" = (/obj/machinery/camera{c_tag = "Supplies - Auxiliary Tool Storage"; dir = 8; network = list("SS13")},/obj/machinery/light/small{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/storage/tools) "bTT" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor{dir = 10; icon_state = "floor"},/area/teleporter{name = "\improper Teleporter Room"}) "bTU" = (/obj/item/device/radio/beacon,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{dir = 10; icon_state = "floor"},/area/teleporter{name = "\improper Teleporter Room"}) -"bTV" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Medbay Storage"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "whitebluefull"},/area/medical/medbay2{name = "Medbay Storage"}) +"bTV" = (/obj/machinery/door_control{id_tag = "teleshutter"; name = "Teleporter Shutter Control"; pixel_x = 26; pixel_y = -26; req_access_txt = "19"},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_Toxins = 0},/turf/simulated/floor{dir = 10; icon_state = "floor"},/area/teleporter{name = "\improper Teleporter Room"}) "bTW" = (/obj/structure/table,/obj/item/weapon/hand_tele,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{dir = 9; icon_state = "floor"},/area/teleporter{name = "\improper Teleporter Room"}) "bTX" = (/obj/structure/table/woodentable,/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8},/obj/item/robot_parts/chest{name = "cyborg torso"; pixel_x = -2; pixel_y = 2},/obj/item/robot_parts/head{name = "cyborg head"; pixel_x = 3; pixel_y = 2},/turf/simulated/floor/carpet,/area/science/showroom{name = "\improper Corporate Showroom"}) "bTY" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/science/showroom{name = "\improper Corporate Showroom"}) "bTZ" = (/obj/structure/table/woodentable,/obj/machinery/cell_charger,/obj/item/weapon/cell/crap{name = "\improper NanoTrasen-brand rechargable AA battery"},/turf/simulated/floor/carpet,/area/science/showroom{name = "\improper Corporate Showroom"}) "bUa" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/hologram/holopad,/turf/simulated/floor/carpet,/area/science/showroom{name = "\improper Corporate Showroom"}) "bUb" = (/obj/structure/table/woodentable,/obj/machinery/bot/cleanbot{desc = "A little cleaning robot, one of NanoTrasen's more successful products. The label states that, on average, this model requires 40% less psychiatric care than its biological counterpart. This one is getting a bit dusty from disuse."; name = "\improper NanoTrasen showroom cleanbot"; on = 0; pixel_y = 4},/turf/simulated/floor/carpet,/area/science/showroom{name = "\improper Corporate Showroom"}) -"bUc" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1},/turf/simulated/floor/wood,/area/science/showroom{name = "\improper Corporate Showroom"}) +"bUc" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor/wood,/area/science/showroom{name = "\improper Corporate Showroom"}) "bUd" = (/obj/structure/dispenser/oxygen,/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) "bUe" = (/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/maintcentral) "bUf" = (/obj/machinery/camera{c_tag = "Command - E.V.A - S"; dir = 8},/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) @@ -5122,12 +5122,12 @@ "bUz" = (/turf/simulated/floor{dir = 8; icon_state = "caution"},/area/engineering/atmos) "bUA" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor,/area/engineering/atmos) "bUB" = (/obj/machinery/atmospherics/binary/valve/digital{_color = "yellow"; dir = 4; name = "Plasma Outlet Valve"},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor,/area/engineering/atmos) -"bUC" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Medbay Storage"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "whitebluefull"},/area/medical/medbay2{name = "Medbay Storage"}) -"bUD" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor{dir = 6; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) -"bUE" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 5; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) -"bUF" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) -"bUG" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) -"bUH" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "tox_sensor"},/obj/machinery/camera{c_tag = "Atmospherics Tank - Plasma"; dir = 1; network = list("SS13")},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) +"bUC" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"bUD" = (/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"bUE" = (/obj/machinery/telecomms/broadcaster/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bUF" = (/obj/structure/table,/obj/item/weapon/folder/blue,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bUG" = (/obj/structure/table,/obj/item/weapon/wirecutters{pixel_y = 6},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bUH" = (/obj/machinery/telecomms/broadcaster/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bUI" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/binary/pump{dir = 8; name = "plasma tank pump"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "bUJ" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "bUK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -5182,11 +5182,11 @@ "bVH" = (/obj/machinery/pipedispenser/disposal,/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) "bVI" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor,/area/engineering/atmos) "bVJ" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "tox_in"; name = "Toxin Supply Control"; output_tag = "tox_out"; sensors = list("tox_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/obj/machinery/light{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/engineering/atmos) -"bVK" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "tox_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) -"bVL" = (/obj/machinery/power/smes{capacity = 6e+006; charge = 2e+006; chargemode = 1; charging = 1; output = 1500},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/light/small,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"bVM" = (/obj/machinery/camera{c_tag = "MiniSat - Telecoms - Server Room - Power"; dir = 1; network = list("SS13","tcomm")},/obj/machinery/power/terminal{dir = 4},/obj/structure/cable,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"bVN" = (/obj/machinery/power/apc{cell_type = 5000; dir = 2; name = "Telecoms Server Room APC"; pixel_x = 1; pixel_y = -24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"bVO" = (/obj/machinery/atmospherics/miner/plasma,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) +"bVK" = (/obj/effect/decal/warning_stripes{icon_state = "plasma"},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"bVL" = (/obj/machinery/atmospherics/miner/toxins,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"bVM" = (/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bVN" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"bVO" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bVP" = (/obj/machinery/camera{c_tag = "Science - Hallway - E"; dir = 2; network = list("SS13","RD")},/turf/simulated/floor{dir = 4; icon_state = "whitepurplecorner"},/area/science/hallway{name = "Research Division"}) "bVQ" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 4; icon_state = "whitepurplecorner"},/area/science/hallway{name = "Research Division"}) "bVR" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/spawner/lootdrop{loot = list("/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/item/weapon/cigbutt","/obj/item/trash/cheesie","/obj/item/trash/candy","/obj/item/trash/chips","/obj/item/trash/deadmouse","/obj/item/trash/pistachios","/obj/item/trash/plate","/obj/item/trash/popcorn","/obj/item/trash/raisins","/obj/item/trash/sosjerky","/obj/item/trash/syndi_cakes"); name = "maint grille or trash spawner"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -5217,7 +5217,7 @@ "bWq" = (/obj/structure/table/reinforced,/obj/machinery/door/window{dir = 1; name = "Kitchen Window"; req_access_txt = "28"; req_one_access_txt = "0"},/obj/machinery/door/firedoor/border_only,/obj/item/weapon/paper,/obj/machinery/door/window{dir = 2; name = "Hydroponics Window"; req_access_txt = "0"; req_one_access_txt = "30;35"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/poddoor/shutters/preopen{id_tag = "kitchenhydro"; name = "Service Shutter"},/turf/simulated/floor,/area/hydroponics) "bWr" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/engine,/area/science/podbay) "bWs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/aft) -"bWt" = (/obj/effect/decal/warning_stripes{icon_state = "plasma"},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) +"bWt" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/engine,/area/science/podbay) "bWu" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/primary/aft) "bWv" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "bWw" = (/obj/structure/sign/nosmoking_2{pixel_x = 0; pixel_y = 28},/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) @@ -5241,12 +5241,12 @@ "bWO" = (/obj/machinery/pipedispenser,/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) "bWP" = (/obj/machinery/space_heater,/turf/simulated/floor,/area/engineering/atmos) "bWQ" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 0; icon_state = "intact_on"; name = "Gas filter (Plasma tank)"; on = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor,/area/engineering/atmos) -"bWR" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"bWR" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "tox_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) "bWS" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/paramedics) "bWT" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) -"bWU" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"bWU" = (/obj/machinery/camera{c_tag = "MiniSat - Telecoms - Server Room - Power"; dir = 1; network = list("SS13","tcomm")},/obj/machinery/power/terminal{dir = 4},/obj/structure/cable,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bWV" = (/obj/structure/table,/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/maintenance/starboard) -"bWW" = (/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"bWW" = (/obj/machinery/power/apc{cell_type = 5000; dir = 2; name = "Telecoms Server Room APC"; pixel_x = 1; pixel_y = -24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "bWX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/wall/r_wall,/area/construction/hallway{name = "\improper MiniSat Exterior"}) "bWY" = (/turf/simulated/wall/r_wall,/area/maintenance/aportsolar) "bWZ" = (/obj/machinery/door/airlock/engineering{name = "Aft Port (SW) Solar Access"; req_access_txt = "10"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/aportsolar) @@ -5256,7 +5256,7 @@ "bXd" = (/obj/item/weapon/storage/box,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "bXe" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "bXf" = (/obj/structure/rack,/obj/item/weapon/paper,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) -"bXg" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"bXg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/library) "bXh" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/wood,/area/library) "bXi" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/pill_bottle/dice,/turf/simulated/floor/wood,/area/library) "bXj" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/obj/machinery/light,/turf/simulated/floor/wood,/area/library) @@ -5336,7 +5336,7 @@ "bYF" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "bYG" = (/obj/item/weapon/rack_parts,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "bYH" = (/obj/machinery/newscaster{pixel_x = -30; pixel_y = 0},/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/central) -"bYI" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"bYI" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) "bYJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/hallway/primary/central) "bYK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/hallway/primary/central) "bYL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor,/area/hallway/primary/central) @@ -5350,7 +5350,7 @@ "bYT" = (/turf/simulated/floor{desc = ""; icon_state = "L13"; name = "floor"},/area/hallway/primary/central) "bYU" = (/turf/simulated/floor{icon_state = "L15"},/area/hallway/primary/central) "bYV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/hallway/primary/central) -"bYW" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"bYW" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) "bYX" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/hallway/primary/central) "bYY" = (/obj/structure/cable/yellow{icon_state = "2-8"},/turf/simulated/floor,/area/hallway/primary/central) "bYZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=8-Central-Aft"; location = "7.5-Starboard-Aft-Corner"},/turf/simulated/floor,/area/hallway/primary/central) @@ -5371,8 +5371,8 @@ "bZo" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 29},/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor{icon_state = "floor"},/area/hydroponics) "bZp" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "whitebluefull"},/area/medical/medbay{name = "Medbay Central"}) "bZq" = (/obj/machinery/atmospherics/binary/valve/digital{_color = "yellow"; dir = 4; name = "CO2 Outlet Valve"},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/turf/simulated/floor{dir = 5; icon_state = "yellow"},/area/engineering/atmos) -"bZr" = (/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) -"bZs" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) +"bZr" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) +"bZs" = (/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) "bZt" = (/turf/simulated/wall/r_wall,/area) "bZu" = (/turf/simulated/floor{dir = 1; icon_state = "whitepurplecorner"},/area/science/hallway{name = "Research Division"}) "bZv" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar/panel{id_tag = "aftport"; name = "Aft-Port Solar Array"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/aport) @@ -5437,15 +5437,15 @@ "caC" = (/obj/machinery/light{dir = 1},/obj/machinery/vending/hydroseeds{slogan_delay = 700},/turf/simulated/floor{icon_state = "floor"},/area/hydroponics) "caD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/shower{dir = 4; icon_state = "shower"; name = "emergency shower"; tag = "icon-shower (WEST)"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "caE" = (/obj/structure/table,/obj/item/weapon/surgicaldrill,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/scalpel,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/medical/surgery) -"caF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"caF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/cryo) "caG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/engineering/atmos) "caH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/engineering/atmos) -"caI" = (/obj/structure/table,/obj/item/weapon/folder/blue,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"caI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/engineering/atmos) "caJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor,/area/engineering/atmos) "caK" = (/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor,/area/engineering/atmos) "caL" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "co2_in"; name = "Carbon Dioxide Supply Control"; output_tag = "co2_out"; sensors = list("co2_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/engineering/atmos) -"caM" = (/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"caN" = (/obj/machinery/telecomms/broadcaster/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"caM" = (/obj/effect/decal/warning_stripes{icon_state = "carbon_dioxide"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) +"caN" = (/obj/machinery/atmospherics/miner/carbon_dioxide,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) "caO" = (/obj/structure/cable,/obj/machinery/power/solar/panel{id_tag = "aftport"; name = "Aft-Port Solar Array"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/aport) "caP" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor{dir = 1; icon_state = "whitepurple"},/area/science/hallway{name = "Research Division"}) "caQ" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/aportsolar) @@ -5478,7 +5478,7 @@ "cbr" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor{icon_state = "floor"},/area/hydroponics) "cbs" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor,/area/hydroponics) "cbt" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "caution"; dir = 4},/area/hallway/primary/starboard) -"cbu" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cbu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hydroponics) "cbv" = (/turf/simulated/floor,/area/hydroponics) "cbw" = (/obj/effect/landmark/start{name = "Botanist"},/turf/simulated/floor{icon_state = "green"; dir = 4},/area/hydroponics) "cbx" = (/obj/structure/table,/obj/item/seeds/wheatseed,/obj/item/seeds/sugarcaneseed,/obj/item/seeds/potatoseed,/obj/item/seeds/appleseed,/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,/obj/item/weapon/reagent_containers/food/snacks/grown/wheat,/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin{pixel_y = 5},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{dir = 8; icon_state = "floor"},/area/hydroponics) @@ -5497,7 +5497,7 @@ "cbK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor,/area/engineering/atmos) "cbL" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/obj/machinery/meter,/turf/simulated/floor,/area/engineering/atmos) "cbM" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 3; icon_state = "intact_on"; name = "Gas filter (CO2 tank)"; on = 1},/turf/simulated/floor{dir = 6; icon_state = "yellow"},/area/engineering/atmos) -"cbN" = (/obj/machinery/telecomms/broadcaster/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cbN" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "co2_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) "cbO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/crew_quarters/bar) "cbP" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 9},/turf/simulated/floor{icon_state = "white"},/area/medical/paramedics) "cbQ" = (/obj/structure/window/reinforced{dir = 1; pixel_y = 0},/obj/structure/window/reinforced,/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/camera{c_tag = "MiniSat - Exterior - S"; dir = 2; network = list("MiniSat")},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/construction/hallway{name = "\improper MiniSat Exterior"}) @@ -5577,7 +5577,7 @@ "cdm" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light_switch{pixel_y = -26},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "cdn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 2; icon_state = "whitebluecorner"},/area/medical/medbay2{name = "Medbay Storage"}) "cdo" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "white"},/area/medical/paramedics) -"cdp" = (/obj/machinery/door_control{id_tag = "teleshutter"; name = "Teleporter Shutter Control"; pixel_x = 26; pixel_y = -26; req_access_txt = "19"},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor{dir = 10; icon_state = "floor"},/area/teleporter{name = "\improper Teleporter Room"}) +"cdp" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/paramedics) "cdq" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/paramedics) "cdr" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/paramedics) "cds" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/paramedics) @@ -5615,19 +5615,19 @@ "cdY" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "green"},/area/hydroponics) "cdZ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/hydroponics) "cea" = (/obj/machinery/door/airlock/glass_medical{id_tag = ""; name = "Paramedic Station"; req_access_txt = "500"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "whitebluefull"},/area/medical/paramedics) -"ceb" = (/obj/machinery/telecomms/server/presets/command,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"ceb" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "cec" = (/obj/structure/stool/bed/chair/vehicle/clowncart,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "ced" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Hydroponics Maintenance"; req_access_txt = "35"; req_one_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) "cee" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/sortjunction{sortType = 21},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard) -"cef" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cef" = (/obj/effect/landmark/start{name = "Mime"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "ceg" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "ceh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 4; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) "cei" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "lawyer_blast"; name = "Privacy Shutters"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/lawoffice{name = "\improper Internal Affairs Office"}) "cej" = (/obj/machinery/disposal,/obj/structure/sign/deathsposal{pixel_x = 0; pixel_y = 32},/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plating,/area/maintenance/incinerator) "cek" = (/obj/structure/table,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/incinerator) "cel" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) -"cem" = (/obj/machinery/telecomms/server/presets/security,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cen" = (/obj/structure/window/reinforced,/obj/machinery/telecomms/server/presets/supply,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cem" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 6; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) +"cen" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark/start{name = "Medical Doctor"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2{name = "Medbay Storage"}) "ceo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/power/apc{dir = 8; name = "Kitchen APC"; pixel_x = -27; pixel_y = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "cep" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/aportsolar) "ceq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/aportsolar) @@ -5658,7 +5658,7 @@ "ceP" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "ceQ" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/machinery/light/small,/turf/simulated/floor{dir = 6; icon_state = "whiteblue"},/area/medical/medbay2{name = "Medbay Storage"}) "ceR" = (/obj/structure/table,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/circuitboard/airlock,/obj/item/device/assembly/timer{pixel_x = -4; pixel_y = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor{dir = 1; icon_state = "whitepurple"},/area/science/hallway{name = "Research Division"}) -"ceS" = (/obj/machinery/telecomms/server/presets/service,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"ceS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "ceT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "ceU" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "ceV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) @@ -5670,7 +5670,7 @@ "cfb" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) "cfc" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) "cfd" = (/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) -"cfe" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "E.V.A Storage"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) +"cfe" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) "cff" = (/obj/machinery/door/airlock/maintenance{name = "Incinerator Access"; req_access_txt = "12"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/starboard) "cfg" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/starboard) "cfh" = (/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -5708,7 +5708,7 @@ "cfN" = (/obj/machinery/door_control{id_tag = "turbinevent"; name = "Turbine Vent Control"; pixel_x = -6; pixel_y = -24; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 2},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cfO" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/engineering/atmos) "cfP" = (/obj/structure/disposalpipe/segment,/obj/structure/table/woodentable/poker,/obj/item/clothing/mask/cigarette/cigar,/turf/simulated/floor/wood,/area/crew_quarters/bar) -"cfQ" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) +"cfQ" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "cfR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/science/robotics) "cfS" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Roboticist"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/science/robotics) "cfT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/medical/surgery) @@ -5732,7 +5732,7 @@ "cgl" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cgm" = (/obj/structure/table/reinforced,/obj/machinery/door/window{dir = 2; name = "Chemistry Desk"; req_access_txt = "5; 33"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 4; icon_state = "whiteyellowfull"; tag = "icon-whitehall (WEST)"},/area/medical/chemistry) "cgn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/hallway/primary/aft) -"cgo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/hydroponics) +"cgo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/hallway/primary/aft) "cgp" = (/turf/simulated/floor{dir = 6; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) "cgq" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only,/obj/item/device/deskbell/signaler/medbay{pixel_x = -3},/turf/simulated/floor{icon_state = "whitegreenfull"},/area/medical/medbay{name = "Medbay Central"}) "cgr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) @@ -5833,7 +5833,7 @@ "cii" = (/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) "cij" = (/obj/machinery/door/airlock/glass{icon = 'icons/obj/doors/Doorengglass.dmi'; name = "Auxiliary Tool Storage"; req_access_txt = "12"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/storage/tools) "cik" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/yellow,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) -"cil" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) +"cil" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "showroomfloor"},/area/medical/surgery) "cim" = (/obj/machinery/vending/wallmed1{pixel_x = 0; pixel_y = 28},/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/sleeper{name = "Sleepers"}) "cin" = (/obj/machinery/door/airlock/maintenance{name = "Medbay Maintenance"; req_access_txt = "5"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cio" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper{name = "Sleepers"}) @@ -5846,7 +5846,7 @@ "civ" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor,/area/hallway/primary/central) "ciw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/camera{c_tag = "Medbay - Reception"; dir = 1; network = list("SS13")},/turf/simulated/floor{dir = 10; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) "cix" = (/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) -"ciy" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor,/area/hallway/primary/central) +"ciy" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor{dir = 6; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) "ciz" = (/obj/structure/plasticflaps/mining,/turf/simulated/floor/engine{icon_state = "enginedelivery"},/area/science/podbay) "ciA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor{icon_state = "whitebluefull"},/area/medical/medbay{name = "Medbay Central"}) "ciB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/device/radio/intercom{broadcasting = 1; freerange = 0; frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 30; pixel_y = 0},/turf/simulated/floor{icon_state = "whitebluefull"},/area/medical/medbay{name = "Medbay Central"}) @@ -5927,7 +5927,7 @@ "cjY" = (/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/turf/simulated/floor{dir = 9; icon_state = "whitepurple"},/area/science/lab) "cjZ" = (/turf/simulated/floor{dir = 1; icon_state = "whitepurple"},/area/science/lab) "cka" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/sleeper{name = "Sleepers"}) -"ckb" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/alarm/server{dir = 4; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"ckb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper{name = "Sleepers"}) "ckc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/central) "ckd" = (/obj/machinery/conveyor{dir = 2; id_tag = "garbage"; layer = 2.7},/obj/machinery/door/poddoor/preopen{id_tag = "Disposal Exit"; layer = 3.1; name = "disposal exit vent"},/obj/structure/plasticflaps/mining,/turf/simulated/floor/plating,/area/maintenance/disposal) "cke" = (/turf/simulated/wall/r_wall,/area/science/hallway{name = "Research Division"}) @@ -5949,7 +5949,7 @@ "cku" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/meter,/obj/structure/grille,/turf/simulated/wall/r_wall,/area/engineering/atmos) "ckv" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/meter{frequency = 1443; id_tag = "mair_in_meter"; name = "Mixed Air Tank In"},/obj/structure/grille,/turf/simulated/wall/r_wall,/area/engineering/atmos) "ckw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper{name = "Sleepers"}) -"ckx" = (/obj/machinery/blackbox_recorder,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"ckx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) "cky" = (/turf/simulated/wall,/area/maintenance/ghettobar) "ckz" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) "ckA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "whitebluecorner"},/area/medical/sleeper{name = "Sleepers"}) @@ -6005,23 +6005,23 @@ "cly" = (/obj/machinery/shieldwallgen{req_access = list(55)},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/structure/cable/yellow,/turf/simulated/floor{tag = "icon-warningcorner (EAST)"; icon_state = "floor"; dir = 4},/area/science/telescience) "clz" = (/obj/machinery/telepad,/turf/simulated/floor/engine,/area/science/telescience) "clA" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/computer/telescience,/turf/simulated/floor{tag = "icon-warningcorner (EAST)"; icon_state = "floor"; dir = 4},/area/science/telescience) -"clB" = (/obj/machinery/telecomms/receiver/preset_left,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"clB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/engine,/area/science/telescience) "clC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/starboard) "clD" = (/turf/simulated/wall,/area/maintenance/incinerator) "clE" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor/plating,/area/maintenance/incinerator) "clF" = (/obj/machinery/access_button{command = "cycle_exterior"; layer = 3.1; master_tag = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = 8; pixel_y = -24},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "clG" = (/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "clH" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -32},/obj/machinery/camera{c_tag = "Medbay - Surgery Recovery"; dir = 1; network = list("SS13","Medbay")},/obj/machinery/bioprinter,/turf/simulated/floor{dir = 2; icon_state = "whiteblue"},/area/medical/cryo) -"clI" = (/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"clJ" = (/obj/machinery/telecomms/receiver/preset_right,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"clK" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - Waste"; dir = 1; network = list("SS13")},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) -"clL" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; id_tag = "waste_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) -"clM" = (/obj/machinery/camera{c_tag = "MiniSat - Telecoms - Server Room - NW"; dir = 2; network = list("SS13","tcomm")},/obj/item/device/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Telecoms)"; pixel_x = 0; pixel_y = 29},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"clN" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"clO" = (/obj/machinery/atmospherics/pipe/manifold/insulated/visible/blue,/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"clP" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"clQ" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"clR" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"clI" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; id_tag = "n2_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"clJ" = (/obj/effect/decal/warning_stripes{icon_state = "nitrogen"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"clK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"clL" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; id_tag = "o2_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"clM" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"clN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"clO" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; id_tag = "air_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"clP" = (/obj/effect/decal/warning_stripes{icon_state = "air"},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"clQ" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"clR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor{dir = 8; icon_state = "whitepurplecorner"},/area/science/telescience) "clS" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor/wood,/area/maintenance/ghettobar) "clT" = (/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/turf/simulated/floor/wood{tag = "icon-wood-broken3"; icon_state = "wood-broken3"},/area/maintenance/ghettobar) "clU" = (/obj/structure/rack,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{pixel_x = 3; pixel_y = 2},/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth{pixel_x = -4; pixel_y = 3},/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,/turf/simulated/floor/wood,/area/maintenance/ghettobar) @@ -6057,7 +6057,7 @@ "cmy" = (/obj/machinery/smartfridge/chemistry,/turf/simulated/wall,/area/medical/chemistry) "cmz" = (/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/structure/table,/turf/simulated/floor{dir = 8; icon_state = "whiteyellow"},/area/medical/chemistry) "cmA" = (/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) -"cmB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor/wood,/area/security/vacantoffice) +"cmB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "cmC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central) "cmD" = (/obj/machinery/r_n_d/destructive_analyzer,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/science/lab) "cmE" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/science/lab) @@ -6085,15 +6085,15 @@ "cna" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "council blast"; layer = 2.7; name = "Council Blast Doors"; opacity = 0},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/bridge) "cnb" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_exterior"; locked = 1; name = "Incinerator Exterior Airlock"; req_access_txt = "12"},/turf/simulated/floor/engine,/area/maintenance/incinerator) "cnc" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/wall/r_wall,/area/maintenance/incinerator) -"cnd" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) -"cne" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "waste_sensor"; output = 63},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) -"cnf" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/airlock/hatch{icon = 'icons/obj/doors/hightechsecurity.dmi'; name = "Telecoms Access"; req_access_txt = "61"},/turf/simulated/floor/bluegrid{blocks_air = 1; icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cng" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor/wood,/area/library) -"cnh" = (/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) -"cni" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) -"cnj" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor/engine,/area/science/podbay) -"cnk" = (/obj/machinery/light/small{dir = 4},/obj/machinery/camera{c_tag = "MiniSat - Telecoms - Server Room - SE"; dir = 8; network = list("SS13","tcomm")},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cnl" = (/obj/machinery/camera{c_tag = "MiniSat - Telecoms - Server Room - W"; dir = 4; network = list("SS13","tcomm")},/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "gcircuit"; name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cnd" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"cne" = (/obj/machinery/atmospherics/miner/nitrogen,/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/light/small,/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"cnf" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - N2"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"cng" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"cnh" = (/obj/machinery/atmospherics/miner/oxygen,/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/light/small,/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"cni" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - O2"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"cnj" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"cnk" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"cnl" = (/obj/machinery/camera{c_tag = "Atmospherics Tank - Air"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) "cnm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/ghettobar) "cnn" = (/obj/structure/closet/secure_closet/bar{pixel_x = -3; pixel_y = -1; req_access_txt = "25"},/turf/simulated/floor/wood,/area/maintenance/ghettobar) "cno" = (/obj/structure/table/reinforced,/obj/machinery/door/window{dir = 4; name = "Hydroponics Desk"; req_access_txt = "0"; req_one_access_txt = "30;35"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hydroponics) @@ -6119,7 +6119,7 @@ "cnI" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/sleeper{name = "Sleepers"}) "cnJ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/command{name = "Teleport Access"; req_access_txt = "0"; req_one_access_txt = "17;19"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/teleporter{name = "\improper Teleporter Room"}) "cnK" = (/obj/structure/stool/bed/roller,/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/cryo) -"cnL" = (/obj/machinery/air_sensor{id_tag = "tcomms_sensor"; output = 63},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cnL" = (/obj/item/device/radio/intercom{broadcasting = 1; freerange = 0; frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -30},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cnM" = (/turf/simulated/floor{dir = 2; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) "cnN" = (/obj/machinery/light,/turf/simulated/floor{dir = 8; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) "cnO" = (/obj/structure/stool/bed/chair/comfy/beige{dir = 1},/obj/machinery/light,/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor{icon_state = "grimy"},/area/bridge/meeting_room{name = "\improper Command Hallway"}) @@ -6139,7 +6139,7 @@ "coc" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/closet/firecloset,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/hallway{name = "Research Division"}) "cod" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor{dir = 6; icon_state = "floor"},/area/medical/cryo) "coe" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/poddoor/preopen{id_tag = "Biohazard"; name = "biohazard containment door"},/turf/simulated/floor{dir = 9; icon_state = "whitehall"},/area/science/hallway{name = "Research Division"}) -"cof" = (/obj/effect/landmark/start{name = "Mime"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor/wood,/area/crew_quarters/theatre) +"cof" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/hallway{name = "Research Division"}) "cog" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/hallway{name = "Research Division"}) "coh" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/hallway{name = "Research Division"}) "coi" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/noticeboard{pixel_y = -32},/obj/machinery/camera{c_tag = "Science - Break Room"; dir = 1; network = list("SS13","RD")},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 101; on = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/hallway{name = "Research Division"}) @@ -6159,7 +6159,7 @@ "cow" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics Monitoring"; req_access_txt = "24"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "floor"},/area/engineering/atmos_control) "cox" = (/obj/machinery/igniter{icon_state = "igniter0"; id_tag = "Incinerator"; luminosity = 2; on = 0},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "coy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 0; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) -"coz" = (/obj/machinery/telecomms/processor/preset_three,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"coz" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 6; icon_state = "floor"},/area/medical/cryo) "coA" = (/obj/machinery/door/poddoor{id_tag = "air_vent"; name = "Air Tank Emergency Vent"},/turf/simulated/floor/plating/airless,/area/engineering/atmos) "coB" = (/turf/space,/area/shuttle/salvage/east) "coC" = (/turf/space,/area/syndicate_station/southwest) @@ -6219,7 +6219,7 @@ "cpE" = (/obj/structure/window/full/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/engineering/atmos_control) "cpF" = (/obj/machinery/light_construct/small,/turf/simulated/floor/wood,/area/maintenance/ghettobar) "cpG" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/lab) -"cpH" = (/obj/machinery/telecomms/processor/preset_one,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cpH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/maintenance/ghettobar) "cpI" = (/obj/structure/barricade/wooden,/turf/simulated/floor/wood,/area/maintenance/ghettobar) "cpJ" = (/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/ghettobar) "cpK" = (/turf/simulated/floor/plating{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area/maintenance/ghettobar) @@ -6230,7 +6230,7 @@ "cpP" = (/obj/effect/decal/warning_stripes{tag = "icon-loading_area"; icon_state = "loading_area"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/science/podbay) "cpQ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark/start{name = "Medical Doctor"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/cryo) "cpR" = (/turf/simulated/floor{dir = 4; icon_state = "whitepurple"},/area/science/lab) -"cpS" = (/obj/machinery/telecomms/bus/preset_one,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cpS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "cpT" = (/turf/simulated/wall,/area/medical/cryo) "cpU" = (/obj/machinery/optable,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "cpV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/machinery/door/airlock/glass_atmos{name = "Distribution Loop"; req_access_txt = "24"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/engineering/atmos) @@ -6249,7 +6249,7 @@ "cqi" = (/obj/item/clothing/glasses/science{pixel_x = 2; pixel_y = 4},/obj/item/clothing/glasses/science,/obj/structure/table,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/machinery/camera{c_tag = "Medbay - Chemistry"; dir = 4; network = list("SS13","Medbay")},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "cqj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "cqk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/science/robotics) -"cql" = (/obj/machinery/telecomms/hub/preset,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cql" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "cqm" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/hallway/primary/aft) "cqn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/aft) "cqo" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor{dir = 4; icon_state = "purple"},/area/hallway/primary/aft) @@ -6276,7 +6276,7 @@ "cqJ" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/telescience) "cqK" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "white"},/area/science/telescience) "cqL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) -"cqM" = (/obj/structure/table,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/machinery/light_switch{pixel_x = 0; pixel_y = 26},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine_storage{name = "Telecoms Storage"}) +"cqM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/telescience) "cqN" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/starboard) "cqO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/maintenance/starboard) "cqP" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) @@ -6300,7 +6300,7 @@ "crh" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "cri" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor{dir = 8; icon_state = "whitepurple"},/area/science/lab) "crj" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "white"},/area/science/lab) -"crk" = (/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/science/podbay) +"crk" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) "crl" = (/turf/simulated/floor/plating,/area/maintenance/ghettobar) "crm" = (/turf/simulated/floor/wood{tag = "icon-wood-broken6"; icon_state = "wood-broken6"},/area/maintenance/ghettobar) "crn" = (/obj/structure/barricade/wooden,/turf/simulated/floor/plating,/area/maintenance/ghettobar) @@ -6316,7 +6316,7 @@ "crx" = (/obj/machinery/power/apc{dir = 4; name = "CMO's Office APC"; pixel_x = 26; pixel_y = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/camera{c_tag = "Medbay - CMO's Office"; dir = 8; network = list("SS13","Medbay")},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "cry" = (/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/table,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "crz" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) -"crA" = (/obj/machinery/telecomms/bus/preset_four,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"crA" = (/obj/structure/table,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/machinery/light_switch{pixel_x = 0; pixel_y = 26},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine_storage{name = "Telecoms Storage"}) "crB" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/engineering/atmos) "crC" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/engineering/atmos) "crD" = (/obj/machinery/vending/cigarette,/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 0; pixel_y = -29},/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -6377,7 +6377,7 @@ "csG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) "csH" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "csI" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) -"csJ" = (/obj/machinery/telecomms/processor/preset_four,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"csJ" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/machinery/camera{c_tag = "Medbay - Cryogenics"; dir = 1; network = list("SS13","Medbay")},/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor{dir = 6; icon_state = "floor"},/area/medical/cryo) "csK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{dir = 6; icon_state = "floor"},/area/medical/cryo) "csL" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 1; on = 1},/obj/item/device/radio/intercom{broadcasting = 1; freerange = 0; frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -30},/obj/machinery/light,/turf/simulated/floor{dir = 6; icon_state = "floor"},/area/medical/cryo) "csM" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 2; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) @@ -6390,7 +6390,7 @@ "csT" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/disposal,/turf/simulated/floor{dir = 5; icon_state = "checker"; tag = "icon-cafeteria (NORTHEAST)"},/area/crew_quarters/kitchen) "csU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor{tag = "icon-warningcorner (WEST)"; icon_state = "floor"; dir = 8},/area/hallway/primary/central) "csV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/wall/r_wall,/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) -"csW" = (/obj/machinery/message_server,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"csW" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/airlock/hatch{icon = 'icons/obj/doors/hightechsecurity.dmi'; name = "Telecoms Access"; req_access_txt = "61"},/turf/simulated/floor/bluegrid{blocks_air = 1; icon_state = "gcircuit"; name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "csX" = (/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/screwdriver{pixel_x = -2; pixel_y = 6},/obj/machinery/power/apc{dir = 8; name = "Chemistry APC"; pixel_x = -24; pixel_y = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/item/device/radio/headset/headset_med,/obj/structure/table,/obj/item/weapon/storage/bag/chem,/obj/item/weapon/storage/bag/chem,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "csY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "csZ" = (/obj/machinery/door/airlock/maintenance{name = "Vacant Office Maintenance"; req_access_txt = "32"; req_one_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -6433,7 +6433,7 @@ "ctK" = (/turf/simulated/floor/wood{tag = "icon-wood-broken4"; icon_state = "wood-broken4"},/area/maintenance/ghettobar) "ctL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "ctM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/machinery/door/airlock/glass_command{name = "Bridge"; req_access_txt = "19"},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/bridge) -"ctN" = (/obj/machinery/telecomms/bus/preset_two,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"ctN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/turf/simulated/floor{dir = 4; icon_state = "whitehall"; tag = "icon-whitehall (WEST)"},/area/medical/surgery) "ctO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "ctP" = (/obj/machinery/computer/operating,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "ctQ" = (/obj/machinery/door/airlock/glass{name = "Primary Tool Storage"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/storage/primary) @@ -6460,11 +6460,11 @@ "cul" = (/obj/machinery/atmospherics/pipe/simple/insulated/visible/blue,/obj/machinery/computer/telecomms/traffic{network = "tcommsat"},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "cum" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) "cun" = (/obj/machinery/light/small{dir = 8},/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) -"cuo" = (/obj/machinery/telecomms/server/presets/engineering,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cuo" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 0; pixel_y = -29},/obj/machinery/newscaster{pixel_x = -30; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/crew_quarters/bar) "cup" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/table,/obj/machinery/computer/security/telescreen{dir = 8; name = "Telecoms Camera Monitor"; network = list("tcomm"); pixel_x = 0; pixel_y = 0},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "cuq" = (/obj/machinery/computer/message_monitor,/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"}) "cur" = (/turf/simulated/wall/r_wall,/area/science/rd) -"cus" = (/obj/machinery/telecomms/server/presets/medical,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cus" = (/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/science/podbay) "cut" = (/obj/machinery/atmospherics/unary/vent{dir = 1},/obj/structure/catwalk,/turf/space,/area) "cuu" = (/obj/structure/disposaloutlet,/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/catwalk,/turf/space,/area) "cuv" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/engine,/area/tcomms/chamber) @@ -6549,12 +6549,12 @@ "cvW" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/ghettobar) "cvX" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/wood,/area/maintenance/ghettobar) "cvY" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/stool,/turf/simulated/floor/wood{tag = "icon-wood-broken"; icon_state = "wood-broken"},/area/maintenance/ghettobar) -"cvZ" = (/obj/machinery/camera{c_tag = "Chapel - S"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/chapel/main) +"cvZ" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/patients_rooms{name = "Patient Room A"}) "cwa" = (/obj/machinery/vending/wallmed1{pixel_y = 28},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "white"},/area/medical/patients_rooms{name = "Patient Room A"}) "cwb" = (/obj/structure/table/reinforced,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/device/paicard{pixel_x = 0},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) "cwc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 1; icon_state = "neutralcorner"},/area/hallway/primary/central) "cwd" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark{name = "lightsout"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) -"cwe" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main) +"cwe" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "cwf" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 4; icon_state = "whitebluecorner"},/area/medical/medbay{name = "Medbay Central"}) "cwg" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "cwh" = (/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) @@ -6574,7 +6574,7 @@ "cwv" = (/obj/machinery/computer/mecha,/obj/machinery/keycard_auth{pixel_x = -24; pixel_y = 0},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) "cww" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/effect/landmark/start{name = "Research Director"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) "cwx" = (/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) -"cwy" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server{name = "\improper Research Division Server Room"}) +"cwy" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) "cwz" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/obj/item/weapon/storage/secure/safe{pixel_x = 32; pixel_y = 0},/obj/structure/closet/malf/suits,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) "cwA" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=9.5-Escape2"; location = "9-Escape"},/turf/simulated/floor,/area/hallway/secondary/exit) "cwB" = (/obj/structure/table/reinforced,/obj/machinery/door/poddoor/shutters/preopen{dir = 2; id_tag = "kitchen"; name = "Serving Hatch"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/kitchen) @@ -6717,7 +6717,7 @@ "czi" = (/obj/machinery/door/window{dir = 1; name = "Mass Driver Door"; req_access_txt = "7"},/obj/effect/decal/warning_stripes{tag = "icon-loading_area"; icon_state = "loading_area"},/turf/simulated/floor/plating,/area/science/mixing{name = "\improper Toxins Lab"}) "czj" = (/obj/machinery/power/apc{cell_type = 5000; dir = 2; name = "Toxins Storage APC"; pixel_x = 0; pixel_y = -25},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor{dir = 10; icon_state = "floor"},/area/science/storage) "czk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{dir = 6; icon_state = "floor"},/area/science/storage) -"czl" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/light_switch{pixel_y = -23},/turf/simulated/floor,/area/science/storage) +"czl" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/light_switch{pixel_y = -23},/turf/simulated/floor,/area/science/storage) "czm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/poddoor/preopen{id_tag = "Biohazard"; name = "biohazard containment door"},/obj/machinery/door/airlock/research{name = "Toxins Launch Room Access"; req_access_txt = "8"},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/science/mixing{name = "\improper Toxins Lab"}) "czn" = (/turf/simulated/wall,/area/science/mixing{name = "\improper Toxins Lab"}) "czo" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/aportsolar) @@ -6730,14 +6730,14 @@ "czv" = (/obj/item/latexballon,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "czw" = (/obj/item/clothing/suit/ianshirt,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "czx" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/machinery/light/small{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/exam_room{name = "Patient Room B"}) -"czy" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"czy" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/machinery/camera{c_tag = "Medbay - Patient's Room - B"; dir = 1; network = list("SS13","Medbay")},/turf/simulated/floor{icon_state = "white"},/area/medical/exam_room{name = "Patient Room B"}) "czz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{dir = 4; icon_state = "whiteblue"},/area/medical/exam_room{name = "Patient Room B"}) "czA" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "czB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/break_room) "czC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 101; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) "czD" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/pie,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/crew_quarters/bar) "czE" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Medbay Break Room"; req_access_txt = "5"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) -"czF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/chapel/office) +"czF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/genetics_cloning) "czG" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics_cloning) "czH" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor{dir = 4; icon_state = "whiteblue"},/area/medical/genetics_cloning) "czI" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_research{name = "Robotics Lab"; req_access_txt = "29"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/science/chargebay) @@ -6747,7 +6747,7 @@ "czM" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark/start{name = "Geneticist"},/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/genetics) "czN" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) "czO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/obj/structure/catwalk{icon_state = "catwalk12"},/turf/space,/area/solar/fstarboard) -"czP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office) +"czP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/aft) "czQ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/aft) "czR" = (/obj/machinery/door/poddoor/shutters{id_tag = "Skynet_launch"; name = "Mech Bay"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/science/chargebay) "czS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 8; icon_state = "floor"},/area/science/chargebay) @@ -6790,13 +6790,13 @@ "cAD" = (/obj/structure/table,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/machinery/camera{c_tag = "Science - Robotics - N"; dir = 2; network = list("SS13","RD")},/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/requests_console{department = "Robotics"; departmentType = 2; name = "Robotics RC"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor,/area/science/robotics) "cAE" = (/obj/machinery/door_control{dir = 2; id_tag = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 26; pixel_y = 6; req_one_access_txt = "29"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/aft) "cAF" = (/obj/machinery/door_control{dir = 2; id_tag = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = -26; pixel_y = 6},/obj/machinery/light_switch{pixel_x = -23; pixel_y = -2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{tag = "icon-warningcorner (EAST)"; icon_state = "floor"; dir = 4},/area/science/chargebay) -"cAG" = (/obj/structure/window/reinforced,/obj/structure/stool/bed/chair,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/mob/living/carbon/human{name = "Artificial Test Subject Alpha"; real_name = "Artificial Test Subject Alpha"},/turf/simulated/floor/plating/airless,/area/science/test_area) +"cAG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor,/area/science/chargebay) "cAH" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/science/chargebay) "cAI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/science/chargebay) -"cAJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/crew_quarters/bar) +"cAJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/crew_quarters/bar) "cAK" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/shieldwallgen,/turf/simulated/floor{dir = 8; icon_state = "floor"},/area/teleporter{name = "\improper Teleporter Room"}) "cAL" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "whitepurple"},/area/science/hallway{name = "Research Division"}) -"cAM" = (/obj/machinery/camera{active_power_usage = 0; c_tag = "Bomb Test Site"; desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top."; dir = 8; invuln = 1; light = null; luminosity = 3; name = "Hardened Bomb-Test Camera"; network = list("Toxins"); use_power = 0},/obj/item/target/alien{anchored = 1},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/shuttle/plating{dir = 4; icon_state = "floor"; luminosity = 2; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01); temperature = 2.7},/area/science/test_area) +"cAM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) "cAN" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) "cAO" = (/obj/structure/sign/biohazard,/turf/simulated/wall,/area/science/mixing{name = "\improper Toxins Lab"}) "cAP" = (/obj/structure/closet/secure_closet/scientist,/obj/item/weapon/storage/backpack/satchel_tox{pixel_x = -5; pixel_y = 2},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor{dir = 2; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) @@ -6829,13 +6829,13 @@ "cBq" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/shieldwallgen,/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/teleporter{name = "\improper Teleporter Room"}) "cBr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/genetics) "cBs" = (/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) -"cBt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light_switch{pixel_x = 26; pixel_y = 0},/obj/structure/table,/obj/item/weapon/storage/fancy/vials,/obj/machinery/embedded_controller/radio/access_controller{id_tag = "virology_airlock_control"; name = "Virology Access Console"; pixel_x = 38; pixel_y = 0; tag_exterior_door = "virology_airlock_exterior"; tag_interior_door = "virology_airlock_interior"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"cBt" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "cBu" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "cBv" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "whiteblue"},/area/medical/genetics) "cBw" = (/obj/structure/table,/obj/item/stack/sheet/glass/glass{amount = 50},/obj/item/stack/sheet/glass/glass{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor{icon_state = "dark"},/area/engineering/atmos) "cBx" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/hallway/primary/aft) "cBy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/hallway/primary/aft) -"cBz" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) +"cBz" = (/obj/effect/landmark/start{name = "Scientist"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/storage) "cBA" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor{dir = 1; icon_state = "whitepurplecorner"},/area/science/hallway{name = "Research Division"}) "cBB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "whitepurplecorner"},/area/science/hallway{name = "Research Division"}) "cBC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fstarboardsolar) @@ -6858,7 +6858,7 @@ "cBT" = (/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/storage) "cBU" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) "cBV" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) -"cBW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor,/area/science/robotics) +"cBW" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) "cBX" = (/obj/item/device/radio/intercom{dir = 2; name = "Station Intercom (General)"; pixel_x = 27; pixel_y = 0},/obj/structure/closet/crate,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/teleporter{name = "\improper Teleporter Room"}) "cBY" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor{dir = 4; icon_state = "purple"},/area/hallway/primary/aft) "cBZ" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/closet/crate,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/teleporter{name = "\improper Teleporter Room"}) @@ -6998,7 +6998,7 @@ "cED" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor/plating/airless{dir = 5; icon_state = "floor"},/area/science/test_area) "cEE" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor{dir = 2; icon_state = "whitepurple"},/area/science/xenobiology) "cEF" = (/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/virology) -"cEG" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server{name = "\improper Research Division Server Room"}) +"cEG" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/virology) "cEH" = (/obj/machinery/light/small{dir = 1},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/virology) "cEI" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/virology) "cEJ" = (/turf/simulated/wall,/area/medical/virology) @@ -7037,7 +7037,7 @@ "cFq" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark{name = "lightsout"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "cFr" = (/turf/simulated/floor/plating/airless{dir = 8; icon_state = "floor"},/area/science/test_area) "cFs" = (/obj/item/device/radio/beacon,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/plating/airless,/area/science/test_area) -"cFt" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"cFt" = (/obj/machinery/camera{active_power_usage = 0; c_tag = "Bomb Test Site"; desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top."; dir = 8; invuln = 1; light = null; luminosity = 3; name = "Hardened Bomb-Test Camera"; network = list("Toxins"); use_power = 0},/obj/item/target/alien{anchored = 1},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/shuttle/plating{dir = 4; icon_state = "floor"; luminosity = 2; nitrogen = 0.01; oxygen = 0.01; temperature = 2.7},/area/science/test_area) "cFu" = (/obj/machinery/embedded_controller/radio/access_controller{tag_exterior_door = "xeno_airlock_exterior"; id_tag = "xeno_airlock_control"; tag_interior_door = "xeno_airlock_interior"; name = "Xenobiology Access Console"; pixel_x = 8; pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/camera{c_tag = "Xenobiology - Lab Entrance"; dir = 2; network = list("SS13","RD")},/turf/simulated/floor{dir = 8; icon_state = "whitepurple"},/area/science/xenobiology) "cFv" = (/obj/structure/stool/bed/roller,/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/virology) "cFw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/virology) @@ -7068,7 +7068,7 @@ "cFV" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "cFW" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "cFX" = (/obj/structure/table,/obj/item/weapon/autopsy_scanner,/obj/item/device/camera{name = "Autopsy Camera"},/obj/item/weapon/scalpel{pixel_y = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) -"cFY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "virology_airlock_interior"; locked = 1; name = "Virology Interior Airlock"; req_access_txt = "39"},/obj/machinery/access_button{command = "cycle_interior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; req_access_txt = "39"},/turf/simulated/floor{icon_state = "whitegreenfull"},/area/medical/virology) +"cFY" = (/obj/structure/table,/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "cFZ" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/clothing/gloves/latex,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "cGa" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/medical/morgue) "cGb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/aft) @@ -7105,7 +7105,7 @@ "cGG" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/virology) "cGH" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"; req_one_access_txt = "0"},/turf/simulated/floor/plating,/area/science/xenobiology) "cGI" = (/obj/machinery/camera{c_tag = "Xenobiology - Pen 3 (W)"; dir = 4; network = list("SS13")},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/engine,/area/science/xenobiology) -"cGJ" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "virology_airlock_exterior"; locked = 1; name = "Virology Exterior Airlock"; req_access_txt = "39"},/obj/machinery/access_button{command = "cycle_exterior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 0; pixel_y = 24; req_access_txt = "39"},/turf/simulated/floor{icon_state = "whitegreenfull"},/area/medical/virology) +"cGJ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"}) "cGK" = (/obj/structure/table,/obj/item/pizzabox{pixel_y = 10},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) "cGL" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/sign/nosmoking_2{pixel_x = 0; pixel_y = -28},/turf/simulated/floor{dir = 4; icon_state = "whitecorner"},/area/medical/medbay3{name = "Medbay Aft"}) "cGM" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 1; icon_state = "whitehall"},/area/medical/medbay3{name = "Medbay Aft"}) @@ -7119,7 +7119,7 @@ "cGU" = (/turf/simulated/floor{dir = 8; icon_state = "floor"},/area/science/robotics) "cGV" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor,/area/science/robotics) "cGW" = (/obj/machinery/mineral/output,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/science/robotics) -"cGX" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "oncpriv"; name = "Privacy Shutters"; opacity = 0},/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/medical/cmo) +"cGX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/science/robotics) "cGY" = (/obj/structure/rack,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = 6},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/machinery/light{dir = 4},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/science/robotics) "cGZ" = (/obj/structure/table,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cHa" = (/turf/simulated/floor{dir = 1; icon_state = "whitepurplecorner"},/area/science/mixing{name = "\improper Toxins Lab"}) @@ -7213,8 +7213,8 @@ "cIK" = (/turf/simulated/floor{dir = 4; icon_state = "whitebluecorner"},/area/medical/medbay3{name = "Medbay Aft"}) "cIL" = (/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/medbay3{name = "Medbay Aft"}) "cIM" = (/obj/machinery/media/receiver/boombox/wallmount/muzak{pixel_y = 28; tag = "North"},/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/medbay3{name = "Medbay Aft"}) -"cIN" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small,/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor,/area/science/storage) -"cIO" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"cIN" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small,/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor,/area/science/storage) +"cIO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/access_button{command = "cycle_interior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -26; pixel_y = 28; req_access_txt = "39"},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "cIP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "cIQ" = (/obj/structure/table/reinforced,/obj/machinery/computer/library/checkout,/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/shuttle/administration/centcom) "cIR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/aisat_interior{name = "\improper MiniSat Central Foyer"}) @@ -7284,8 +7284,8 @@ "cKd" = (/obj/machinery/camera{c_tag = "Science - Server Room"; dir = 2; network = list("SS13","RD"); pixel_x = 22},/obj/machinery/power/apc{dir = 1; name = "Research Division Server Room APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "dark"},/area/science/server{name = "\improper Research Division Server Room"}) "cKe" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{current_temperature = 80; dir = 2; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/science/server{name = "\improper Research Division Server Room"}) "cKf" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32},/turf/simulated/floor/plating,/area/science/server{name = "\improper Research Division Server Room"}) -"cKg" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) -"cKh" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/item/weapon/stamp/rd{pixel_x = 3; pixel_y = -2},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) +"cKg" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server{name = "\improper Research Division Server Room"}) +"cKh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server{name = "\improper Research Division Server Room"}) "cKi" = (/turf/simulated/wall/r_wall,/area/science/server{name = "\improper Research Division Server Room"}) "cKj" = (/obj/structure/closet,/obj/item/weapon/storage/box/lights/mixed,/obj/item/device/flashlight,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cKk" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/sign/biohazard{pixel_y = 32},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7306,27 +7306,27 @@ "cKz" = (/obj/structure/stool/bed/chair{dir = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/obj/machinery/light/small,/turf/simulated/floor/plating/airless{dir = 6; icon_state = "floor"},/area/science/test_area) "cKA" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"; req_one_access_txt = "0"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cKB" = (/obj/structure/table/reinforced,/obj/machinery/door/window{dir = 4; name = "Cloner Desk"; req_access_txt = "5"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/genetics_cloning) -"cKC" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/storage) +"cKC" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/storage) "cKD" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/science/storage) "cKE" = (/obj/structure/table,/obj/item/weapon/storage/box/labels,/obj/item/weapon/hand_labeler,/turf/simulated/floor/plating,/area/maintenance/virology_maint) "cKF" = (/obj/effect/landmark/start{name = "Roboticist"},/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/science/robotics) "cKG" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "white"},/area/science/robotics) "cKH" = (/obj/machinery/light{dir = 2},/turf/simulated/floor/engine,/area/science/xenobiology) -"cKI" = (/obj/item/weapon/circuitboard/aicore{pixel_x = -2; pixel_y = 4},/obj/item/weapon/circuitboard/teleporter,/obj/structure/table/reinforced,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) +"cKI" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) "cKJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor{dir = 4; icon_state = "whitebluecorner"},/area/science/hallway{name = "Research Division"}) "cKK" = (/turf/simulated/wall,/area/science/server{name = "\improper Research Division Server Room"}) "cKL" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/science/server{name = "\improper Research Division Server Room"}) "cKM" = (/obj/structure/stool/bed/chair/office/light,/turf/simulated/floor{icon_state = "dark"},/area/science/server{name = "\improper Research Division Server Room"}) "cKN" = (/obj/machinery/atmospherics/pipe/simple{dir = 5},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/science/server{name = "\improper Research Division Server Room"}) "cKO" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/storage) -"cKP" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) -"cKQ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) +"cKP" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server{name = "\improper Research Division Server Room"}) +"cKQ" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/pipe/manifold{dir = 4},/obj/machinery/light/small{dir = 4},/obj/machinery/alarm/server{dir = 8; pixel_x = 22; pixel_y = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server{name = "\improper Research Division Server Room"}) "cKR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/virology_maint) "cKS" = (/obj/structure/table,/obj/item/weapon/storage/box/labels,/obj/item/weapon/hand_labeler,/turf/simulated/shuttle/floor,/area/centcom/evac) "cKT" = (/obj/structure/table,/obj/item/device/radio/headset/headset_med,/turf/simulated/floor/plating,/area/maintenance/virology_maint) "cKU" = (/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/virology_maint) "cKV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/bedsheet/medical,/obj/structure/stool/bed,/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/virology) -"cKW" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/science/rd) +"cKW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/virology) "cKX" = (/obj/structure/stool/bed,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/virology) "cKY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/medical/virology) "cKZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/catwalk{icon_state = "catwalk3"},/turf/space,/area/solar/fstarboard) @@ -7354,8 +7354,8 @@ "cLv" = (/obj/machinery/computer/rdservercontrol,/turf/simulated/floor{icon_state = "dark"},/area/science/server{name = "\improper Research Division Server Room"}) "cLw" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = -28},/turf/simulated/floor{icon_state = "dark"},/area/science/server{name = "\improper Research Division Server Room"}) "cLx" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor/plating,/area/science/server{name = "\improper Research Division Server Room"}) -"cLy" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29},/turf/simulated/floor{dir = 2; icon_state = "arrival"},/area/science/shuttlebay) -"cLz" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/science/hallway{name = "Research Division"}) +"cLy" = (/obj/machinery/r_n_d/server/core,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server{name = "\improper Research Division Server Room"}) +"cLz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 120; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server{name = "\improper Research Division Server Room"}) "cLA" = (/obj/structure/rack,/obj/map/spawner/set_spawner/theater,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cLB" = (/obj/effect/decal/cleanable/dirt,/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cLC" = (/obj/structure/closet,/obj/item/clothing/glasses/science,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7395,7 +7395,7 @@ "cMk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{dir = 5; icon_state = "floor"},/area/hallway/secondary/exit) "cMl" = (/obj/structure/closet/crate,/obj/item/weapon/wrapping_paper,/obj/item/weapon/wrapping_paper,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cMm" = (/obj/structure/sign/biohazard,/turf/simulated/wall/r_wall,/area/science/hallway{name = "Research Division"}) -"cMn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor,/area/science/chargebay) +"cMn" = (/obj/machinery/portable_atmospherics/canister/plasma,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/storage) "cMo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{icon_state = "door_closed"; locked = 0; name = "Storage Room"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cMp" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "cMq" = (/obj/item/weapon/storage/box/lights/mixed,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7408,7 +7408,7 @@ "cMx" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/pen/red,/turf/simulated/floor{icon_state = "freezerfloor"},/area/medical/virology) "cMy" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/wall,/area/medical/virology) "cMz" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "whitegreen"},/area/medical/virology) -"cMA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) +"cMA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "cMB" = (/turf/simulated/floor{icon_state = "white"},/area/science/robotics) "cMC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "cMD" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{dir = 4; icon_state = "whitegreen"},/area/medical/virology) @@ -7451,7 +7451,7 @@ "cNo" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/chapel/office) "cNp" = (/obj/machinery/requests_console{department = "Chapel"; departmentType = 2; pixel_y = 30},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/chapel/office) "cNq" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/chapel/office) -"cNr" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/obj/machinery/camera{c_tag = "Medbay - Patient's Room - B"; dir = 1; network = list("SS13","Medbay")},/turf/simulated/floor{icon_state = "white"},/area/medical/exam_room{name = "Patient Room B"}) +"cNr" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/chapel/office) "cNs" = (/obj/machinery/door/morgue{name = "Relic Closet"; req_access_txt = "22"},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/chapel/office) "cNt" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/catwalk,/turf/space,/area) "cNu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/science/mixing{name = "\improper Toxins Lab"}) @@ -7486,7 +7486,7 @@ "cNX" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/medical/virology) "cNY" = (/obj/structure/table,/obj/item/trash/cheesie{pixel_y = 4},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/medical/virology) "cNZ" = (/obj/machinery/crema_switch{pixel_x = -25},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office) -"cOa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/genetics_cloning) +"cOa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office) "cOb" = (/obj/effect/landmark/start{name = "Chaplain"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/machinery/camera{c_tag = "Chapel - Crematorium"; dir = 8; network = list("SS13")},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office) "cOc" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/obj/machinery/newscaster{pixel_x = -30},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/chapel/office) "cOd" = (/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Chaplain"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/chapel/office) @@ -7714,7 +7714,7 @@ "cSr" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/chapel/main) "cSs" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint3) "cSt" = (/obj/machinery/light/small{dir = 4},/obj/machinery/camera{c_tag = "Chapel - Mortuary"; dir = 8; network = list("SS13")},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) -"cSu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("nitrous_oxide","carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/science/hallway{name = "Research Division"}) +"cSu" = (/obj/machinery/camera{c_tag = "Chapel - S"; dir = 4; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/chapel/main) "cSv" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lantern{pixel_y = 7},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "cSw" = (/obj/effect/landmark/start{name = "Chaplain"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "cSx" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/chapel/main) @@ -7723,8 +7723,8 @@ "cSA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; pixel_y = 2},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/secondary/exit) "cSB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; pixel_y = 2},/turf/simulated/floor/plating,/area/hallway/secondary/exit) "cSC" = (/obj/structure/rack,/obj/item/weapon/storage/belt/utility,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor{dir = 8; icon_state = "floor"},/area/science/robotics) -"cSD" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) -"cSE" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/science/mixing{name = "\improper Toxins Lab"}) +"cSD" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark{name = "lightsout"},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"cSE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "virology_airlock_interior"; locked = 1; name = "Virology Interior Airlock"; req_access_txt = "39"},/turf/simulated/floor{icon_state = "whitegreenfull"},/area/medical/virology) "cSF" = (/obj/machinery/atmospherics/unary/tank/air{dir = 2},/turf/simulated/floor{dir = 1; icon_state = "whitepurple"},/area/science/xenobiology) "cSG" = (/obj/machinery/media/receiver/boombox/wallmount/muzak{pixel_y = 28; tag = "North"},/turf/simulated/floor{dir = 1; icon_state = "whitepurple"},/area/science/xenobiology) "cSH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 1; icon_state = "whitepurplecorner"},/area/science/xenobiology) @@ -7760,7 +7760,7 @@ "cTl" = (/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -27},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main) "cTm" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main) "cTn" = (/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Chaplain"},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main) -"cTo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) +"cTo" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main) "cTp" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/grown/harebell,/obj/item/weapon/reagent_containers/food/snacks/grown/harebell,/obj/item/weapon/reagent_containers/food/snacks/grown/harebell,/obj/item/weapon/reagent_containers/food/snacks/grown/harebell,/obj/item/weapon/reagent_containers/food/snacks/grown/harebell,/obj/machinery/light/small,/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main) "cTq" = (/turf/simulated/floor/plating,/area/chapel/main) "cTr" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/chapel/main) @@ -7775,7 +7775,7 @@ "cTA" = (/obj/machinery/hologram/holopad,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) "cTB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) "cTC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/stool/bed/chair/office/light,/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) -"cTD" = (/obj/structure/table,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/alarm{pixel_y = 24},/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) +"cTD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) "cTE" = (/obj/machinery/power/solar/panel{id_tag = "djstationsolar"; name = "DJ Station Solar Array"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{icon_state = "solarpanel"},/area/djstation/solars) "cTF" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/catwalk,/turf/space,/area/djstation/solars) "cTG" = (/obj/machinery/door/poddoor{id_tag = "chapelgun"; name = "Chapel Launcher Door"},/turf/simulated/floor/plating,/area/chapel/main) @@ -7824,7 +7824,7 @@ "cUx" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id_tag = "xenobio3"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access_txt = "55"},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor{dir = 5; icon_state = "floor"},/area/science/xenobiology) "cUy" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) "cUz" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) -"cUA" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/structure/noticeboard{pixel_y = 32},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) +"cUA" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) "cUB" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor{dir = 9; icon_state = "floor"},/area/science/xenobiology) "cUC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/door/poddoor/preopen{id_tag = "xenobio8"; name = "containment blast door"},/turf/simulated/floor/engine,/area/science/xenobiology) "cUD" = (/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/disposaloutlet{dir = 1},/turf/simulated/floor/engine,/area/science/xenobiology) @@ -7954,7 +7954,7 @@ "cWX" = (/obj/structure/rack,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/head/hairflower,/turf/simulated/floor/holofloor{icon_state = "cult"},/area/holodeck/source_theatre) "cWY" = (/obj/structure/rack,/obj/map/spawner/set_spawner/theater,/turf/simulated/floor/holofloor{icon_state = "cult"},/area/holodeck/source_theatre) "cWZ" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Holodeck Projector Floor"},/area/holodeck/source_plating) -"cXa" = (/obj/machinery/vending/cigarette,/obj/structure/sign/map/meta/right{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-right-MS"; pixel_y = 32},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) +"cXa" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; nitrogen = 0; oxygen = 2500; temperature = 370; toxins = 5},/area/holodeck/source_burntest) "cXb" = (/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_emptycourt) "cXc" = (/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_emptycourt) "cXd" = (/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_emptycourt) @@ -7966,7 +7966,7 @@ "cXj" = (/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/holofloor/grass,/area/holodeck/source_picnicarea) "cXk" = (/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/holofloor/grass,/area/holodeck/source_picnicarea) "cXl" = (/turf/simulated/floor/holofloor{icon_state = "cult"},/area/holodeck/source_theatre) -"cXm" = (/obj/machinery/vending/coffee,/obj/machinery/light{dir = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) +"cXm" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; nitrogen = 0; oxygen = 2500; temperature = 370; toxins = 5},/area/holodeck/source_burntest) "cXn" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "red"},/area/holodeck/source_emptycourt) "cXo" = (/turf/simulated/floor/holofloor,/area/holodeck/source_emptycourt) "cXp" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "red"},/area/holodeck/source_emptycourt) @@ -9152,7 +9152,7 @@ "dtZ" = (/obj/structure/stool/bed/chair{dir = 1},/obj/structure/disposalpipe/segment,/obj/effect/landmark{name = "tdomeadmin"},/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "dua" = (/turf/unsimulated/beach/sand{density = 1},/area/beach) "dub" = (/obj/machinery/computer/security/telescreen,/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) -"duc" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/nitrous_oxide{pixel_x = 1},/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) +"duc" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/sleeping_agent{pixel_x = 1},/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "dud" = (/obj/item/weapon/wrench,/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "due" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "duf" = (/turf/unsimulated/beach/sand,/area/beach) @@ -9716,9 +9716,9 @@ "dER" = (/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/derelict/research) "dES" = (/turf/simulated/floor/plating/airless,/area/derelict/research) "dET" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/research) -"dEU" = (/obj/machinery/vending/cola,/obj/structure/sign/map/meta/left{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-left-MS"; pixel_y = 32},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/medical/break_room) -"dEV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrubbing_gases = list("carbon_dioxide")},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) -"dEW" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; starting_gases = list("oxygen" = 2500, "plasma" = 5); temperature = 370},/area/holodeck/source_burntest) +"dEU" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"dEV" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"dEW" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dEX" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "dEY" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 10},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "dEZ" = (/obj/structure/table,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) @@ -9726,19 +9726,19 @@ "dFb" = (/turf/simulated/wall/r_wall,/area/derelict/atmos) "dFc" = (/obj/structure/sign/nosmoking_1,/turf/simulated/wall/r_wall,/area/derelict/atmos) "dFd" = (/obj/machinery/door/airlock/external{name = "Toxins Tank Access"},/turf/simulated/floor/plating/airless,/area/derelict/atmos) -"dFe" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; starting_gases = list("oxygen" = 2500, "plasma" = 5); temperature = 370},/area/holodeck/source_burntest) -"dFf" = (/obj/item/weapon/grenade/empgrenade,/turf/simulated/floor/plating/airless,/area/tcommsat/chamber) +"dFe" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"dFf" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dFg" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "dFh" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "dFi" = (/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dFj" = (/obj/machinery/air_sensor{frequency = 1438; id_tag = "tox_sensor"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dFk" = (/turf/simulated/wall/r_wall,/area/derelict/research) -"dFl" = (/obj/machinery/door/window{dir = 2},/turf/simulated/floor/airless,/area/derelict/bridge/access) +"dFl" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dFm" = (/obj/machinery/r_n_d/fabricator/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHWEST)"; icon_state = "warning"; dir = 9},/turf/simulated/floor/airless,/area/derelict/research) "dFn" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/airless,/area/derelict/research) "dFo" = (/obj/machinery/computer/rdconsole/core,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor/airless,/area/derelict/research) "dFp" = (/obj/machinery/floodlight,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) -"dFq" = (/obj/machinery/atmospherics/miner/plasma,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) +"dFq" = (/obj/machinery/atmospherics/miner/toxins,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dFr" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dFs" = (/obj/machinery/r_n_d/destructive_analyzer,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHWEST)"; icon_state = "warning"; dir = 10},/turf/simulated/floor/airless,/area/derelict/research) "dFt" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/airless,/area/derelict/research) @@ -9747,7 +9747,7 @@ "dFw" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; external_pressure_bound = 120; frequency = 1438; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dFx" = (/obj/effect/decal/warning_stripes{icon_state = "plasma"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dFy" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1438; icon_state = "on"; id_tag = "tox_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) -"dFz" = (/obj/machinery/door/window{base_state = "right"; icon_state = "right"},/turf/simulated/floor/airless,/area/derelict/bridge/access) +"dFz" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dFA" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "dFB" = (/obj/machinery/atmospherics/pipe/manifold/insulated/hidden/blue{dir = 4},/obj/item/weapon/paper/derelict_invoice,/obj/machinery/meter,/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "dFC" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) @@ -10489,9 +10489,9 @@ "dTK" = (/obj/machinery/door_control{id_tag = "rdorm1"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/carpet,/area/research_outpost/hallway) "dTL" = (/obj/machinery/camera{c_tag = "Research Outpost Hallway Fore"; dir = 4; network = list("RD","SS13")},/turf/simulated/floor,/area/research_outpost/hallway) "dTM" = (/obj/machinery/door_control{id_tag = "rdorm2"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/carpet,/area/research_outpost/hallway) -"dTN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/obj/effect/landmark{name = "bluespacerift"},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso2) -"dTO" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso3) -"dTP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor,/area/research_outpost/entry) +"dTN" = (/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) +"dTO" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/miner/oxygen,/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) +"dTP" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/miner/nitrogen,/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) "dTQ" = (/obj/effect/decal/remains/human,/turf/simulated/floor/airless{icon_state = "damaged5"},/area/mine/abandoned) "dTR" = (/obj/effect/decal/cleanable/blood/xeno,/turf/simulated/floor/plating/airless,/area/mine/abandoned) "dTS" = (/obj/effect/alien/weeds,/turf/simulated/floor/airless{icon_state = "damaged4"},/area/mine/abandoned) @@ -10514,15 +10514,15 @@ "dUj" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/research_outpost/maintstore1) "dUk" = (/obj/machinery/door/airlock/maintenance{name = "Auxiliary Storage"; req_access_txt = "0"; req_one_access_txt = "11;47"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/maintstore1) "dUl" = (/turf/simulated/floor,/area/research_outpost/maintstore1) -"dUm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor,/area/research_outpost/entry) +"dUm" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/research_outpost/maintstore1) "dUn" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/camera{c_tag = "Research Outpost Auxiliary Storage"; dir = 8; network = list("RD","SS13")},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor,/area/research_outpost/maintstore1) "dUo" = (/obj/structure/table,/turf/simulated/floor/carpet,/area/research_outpost/hallway) "dUp" = (/turf/simulated/floor/carpet,/area/research_outpost/hallway) "dUq" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{id_tag = "rminingdorm1"; name = "Dorm 1"},/turf/simulated/floor{icon_state = "carpet"},/area/research_outpost/hallway) "dUr" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{id_tag = "rdorm2"; name = "Dorm 2"},/turf/simulated/floor{icon_state = "carpet"},/area/research_outpost/hallway) -"dUs" = (/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) -"dUt" = (/obj/machinery/power/emitter{anchored = 1; state = 2},/obj/structure/cable,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/plating{dir = 5; icon_state = "floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/anomaly) -"dUu" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{dir = 4; icon_state = "whitegreen"},/area/research_outpost/spectro) +"dUs" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) +"dUt" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "mining_air_out"; internal_pressure_bound = 300; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) +"dUu" = (/obj/effect/decal/warning_stripes{icon_state = "nitrogen"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) "dUv" = (/obj/item/weapon/shard,/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned) "dUw" = (/obj/item/weapon/shard{icon_state = "small"},/obj/effect/alien/weeds,/turf/simulated/floor/airless,/area/mine/abandoned) "dUx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/airlock/maintenance{name = "Mining Station Maintenance"; req_access_txt = "54"},/turf/simulated/floor/plating,/area/mine/north_outpost) @@ -10567,7 +10567,7 @@ "dVk" = (/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/spectro) "dVl" = (/obj/structure/window/full/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/spectro) "dVm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/spectro) -"dVn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor/plating,/area/research_outpost/atmos) +"dVn" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_CO2 = 0},/turf/simulated/floor{dir = 4; icon_state = "whitegreen"},/area/research_outpost/spectro) "dVo" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/research{name = "Spectrometry Lab"; req_access_txt = "47"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/sample) "dVp" = (/obj/machinery/light_switch{pixel_x = 0; pixel_y = 27},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/sample) "dVq" = (/obj/structure/sign/nosmoking_2{pixel_y = 32},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/sample) @@ -10623,7 +10623,7 @@ "dWo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "cafeteria"},/area/research_outpost/hallway) "dWp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "cafeteria"},/area/research_outpost/hallway) "dWq" = (/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light_switch{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plating,/area/research_outpost/atmos) -"dWr" = (/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos) +"dWr" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor/plating,/area/research_outpost/atmos) "dWs" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/research_outpost/atmos) "dWt" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plating,/area/research_outpost/atmos) "dWu" = (/obj/machinery/atmospherics/trinary/mixer{dir = 8; icon_state = "intact_on"; name = "Gas mixer (N2/O2)"; node1_concentration = 0.2; node2_concentration = 0.8; on = 1; target_pressure = 4500},/turf/simulated/floor/plating,/area/research_outpost/atmos) @@ -10697,7 +10697,7 @@ "dXK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor/border_only{dir = 1; layer = 2.6; name = "Firelock North"},/turf/simulated/floor{icon_state = "cafeteria"},/area/research_outpost/hallway) "dXL" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 4},/turf/simulated/floor/plating,/area/research_outpost/atmos) "dXM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/research_outpost/atmos) -"dXN" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor/plating,/area/research_outpost/atmos) +"dXN" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/plating,/area/research_outpost/atmos) "dXO" = (/obj/effect/alien/weeds/node,/turf/simulated/floor/airless{icon_state = "floorgrime"},/area/mine/abandoned) "dXP" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/mine/abandoned) "dXQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/shard,/turf/simulated/floor/plating/airless,/area/mine/abandoned) @@ -10851,7 +10851,7 @@ "eaI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) "eaJ" = (/obj/machinery/light{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "whitebluecorner"},/area/research_outpost/hallway) "eaK" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/research_outpost/anomaly) -"eaL" = (/obj/effect/alien/weeds,/obj/structure/closet/vox_raiders,/turf/simulated/floor/plating/airless,/area/mine/abandoned) +"eaL" = (/obj/machinery/power/emitter{anchored = 1; state = 2},/obj/structure/cable,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/plating{dir = 5; icon_state = "floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/anomaly) "eaM" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/obj/structure/window/reinforced/plasma{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 4; icon_state = "whitered"},/area/research_outpost/anomaly) "eaN" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor{dir = 8; icon_state = "whitered"},/area/research_outpost/anomaly) "eaO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/camera{c_tag = "Research Outpost Hallway Engineering"; dir = 4; network = list("RD","SS13")},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) @@ -10907,7 +10907,7 @@ "ebM" = (/obj/structure/window/reinforced{dir = 8},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) "ebN" = (/obj/machinery/door/window{base_state = "left"; dir = 4; name = "Testing Chamber"; req_access_txt = "47"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/research_outpost/anomaly) "ebO" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) -"ebP" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/miner/nitrogen,/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos) +"ebP" = (/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) "ebQ" = (/obj/machinery/anomaly/fourier_transform,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) "ebR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) "ebS" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) @@ -10954,7 +10954,7 @@ "ecH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/research_outpost/entry) "ecI" = (/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/research_outpost/entry) "ecJ" = (/turf/simulated/floor,/area/research_outpost/entry) -"ecK" = (/obj/machinery/atmospherics/miner/oxygen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/mine/living_quarters) +"ecK" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/research_outpost/entry) "ecL" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/research_outpost/entry) "ecM" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/research_outpost/entry) "ecN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_research{name = "Research Shuttle Dock"; req_access_txt = "47"},/turf/simulated/floor,/area/research_outpost/entry) @@ -11086,13 +11086,13 @@ "efj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/maint) "efk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light/small{dir = 1},/obj/structure/table,/obj/machinery/light_switch{pixel_x = -27; pixel_y = 0},/turf/simulated/floor,/area/research_outpost/iso1) "efl" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/research_outpost/iso1) -"efm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso1) +"efm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso1) "efn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light/small{dir = 1},/obj/structure/table,/obj/machinery/light_switch{pixel_x = -27; pixel_y = 0},/turf/simulated/floor,/area/research_outpost/iso2) "efo" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/research_outpost/iso2) -"efp" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso2) +"efp" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso2) "efq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light/small{dir = 1},/obj/structure/table,/obj/machinery/light_switch{pixel_x = -27; pixel_y = 0},/turf/simulated/floor,/area/research_outpost/iso3) "efr" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/research_outpost/iso3) -"efs" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso3) +"efs" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso3) "eft" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/maintstore2) "efu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/research_outpost/maintstore2) "efv" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/research_outpost/longtermstorage) @@ -11194,11 +11194,13 @@ "ehn" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 6},/turf/simulated/floor/plating,/area/research_outpost/maint) "eho" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible{dir = 4},/turf/simulated/floor/plating,/area/research_outpost/maint) "ehp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso1) -"ehq" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "mining_air_out"; internal_pressure_bound = 300; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/mine/living_quarters) +"ehq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso1) "ehr" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso1) "ehs" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso2) +"eht" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrub_CO2 = 0},/obj/effect/landmark{name = "bluespacerift"},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso2) "ehu" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso2) "ehv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso3) +"ehw" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso3) "ehx" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso3) "ehy" = (/obj/structure/closet/hydrant{pixel_x = -32},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/research_outpost/maintstore2) "ehz" = (/obj/structure/rack,/obj/item/weapon/storage/box/gloves,/obj/item/weapon/storage/box/samplebags{pixel_x = 3; pixel_y = -3},/obj/machinery/power/apc{dir = 4; pixel_x = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/research_outpost/maintstore2) @@ -11525,6 +11527,7 @@ "enM" = (/obj/machinery/light/small{dir = 4},/obj/structure/closet/emcloset,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1},/turf/simulated/floor,/area/mine/living_quarters) "enN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/recharger{pixel_x = -29},/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/living_quarters) "enO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/mine/living_quarters) +"enP" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/mine/living_quarters) "enQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/mine/living_quarters) "enR" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/mine/living_quarters) "enS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light/small{dir = 1},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/mine/living_quarters) @@ -11541,6 +11544,7 @@ "eod" = (/turf/simulated/floor/plating,/area/mine/living_quarters) "eoe" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/mine/living_quarters) "eof" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/mine/living_quarters) +"eog" = (/obj/machinery/atmospherics/miner/oxygen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/mine/living_quarters) "eoh" = (/obj/machinery/sleep_console,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters) "eoi" = (/obj/machinery/sleeper,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters) "eoj" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 32},/obj/structure/ore_box,/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/mine/living_quarters) @@ -11559,6 +11563,7 @@ "eow" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/mine/living_quarters) "eox" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/mine/production) "eoy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/mine/living_quarters) +"eoz" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "mining_air_out"; internal_pressure_bound = 300; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/mine/living_quarters) "eoA" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor/plating,/area/mine/production) "eoB" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/mine/production) "eoC" = (/obj/machinery/conveyor{id_tag = "mining_internal"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/production) @@ -11720,6 +11725,7 @@ "erD" = (/obj/structure/table,/obj/machinery/light{dir = 1},/obj/item/device/radio/headset/headset_medsci,/obj/item/device/flashlight/pen{pixel_x = 4; pixel_y = 3},/obj/item/device/flashlight/pen{pixel_x = 4; pixel_y = 3},/obj/structure/noticeboard{desc = "A board for pinning important notices upon."; name = "notice board"; pixel_x = -32; pixel_y = 32},/obj/item/weapon/extinguisher{pixel_x = 3; pixel_y = 5},/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/medical/genetics) "erE" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor,/area/hallway/secondary/exit) "erF" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8; initialize_directions = 11},/turf/simulated/floor,/area/hallway/secondary/exit) +"erG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/secondary/exit) "erH" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor,/area/hallway/secondary/exit) "erI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/hallway/secondary/exit) "erJ" = (/obj/machinery/computer/bhangmeter{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) @@ -11731,10 +11737,12 @@ "erP" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"}) "erQ" = (/obj/machinery/computer/research_shuttle,/turf/simulated/floor{dir = 2; icon_state = "arrival"},/area/science/shuttlebay) "erR" = (/turf/simulated/floor{dir = 2; icon_state = "arrival"},/area/science/shuttlebay) +"erS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29},/turf/simulated/floor{dir = 2; icon_state = "arrival"},/area/science/shuttlebay) "erT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/science/shuttlebay) "erU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/light/small,/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (WEST)"; icon_state = "warning_corner"; dir = 8},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/science/hallway{name = "Research Division"}) "erV" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor,/area/science/shuttlebay) -"erW" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/storage) +"erW" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor{dir = 4; icon_state = "floor"},/area/science/storage) +"erX" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/science/hallway{name = "Research Division"}) "erY" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/science/hallway{name = "Research Division"}) "erZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/ghettobar) "esa" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila{pixel_y = 6},/turf/simulated/floor/wood,/area/maintenance/ghettobar) @@ -11757,6 +11765,7 @@ "esr" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=1"; freq = 1400; location = "Medbay"},/obj/structure/plasticflaps{opacity = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/plating,/area/medical/cryo) "ess" = (/turf/simulated/wall,/area/medical/exam_room{name = "Patient Room B"}) "est" = (/obj/machinery/light{dir = 8},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) +"esu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_Toxins = 0},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) "esv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) "esw" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor{dir = 9; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) "esx" = (/obj/machinery/camera{c_tag = "Science - Toxins Lab - Launcher"; dir = 2; network = list("SS13","RD")},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) @@ -11765,6 +11774,7 @@ "esA" = (/obj/machinery/light/small{dir = 8},/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 9; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) "esB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) "esC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) +"esD" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/mixing{name = "\improper Toxins Lab"}) "esE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "white"},/area/science/mixing{name = "\improper Toxins Lab"}) "esF" = (/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor{dir = 10; icon_state = "floor"},/area/science/mixing{name = "\improper Toxins Lab"}) "esG" = (/obj/effect/landmark/start{name = "Scientist"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/mixing{name = "\improper Toxins Lab"}) @@ -11790,6 +11800,7 @@ "eta" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor,/area/research_outpost/entry) "etb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/research_outpost/entry) "etc" = (/obj/machinery/computer/research_shuttle,/turf/simulated/floor{icon_state = "blue"; dir = 10},/area/research_outpost/entry) +"etd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/research_outpost/entry) "ete" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor,/area/research_outpost/entry) "etf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor,/area/research_outpost/entry) "etg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor,/area/research_outpost/entry) diff --git a/maps/ministation.dmm b/maps/ministation.dmm index 698a00ea438..fceb49f5c1a 100644 --- a/maps/ministation.dmm +++ b/maps/ministation.dmm @@ -35,7 +35,7 @@ "aaI" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/simulated/floor,/area/bridge) "aaJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/table/reinforced,/turf/simulated/floor,/area/bridge) "aaK" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/yellow,/obj/item/weapon/disk/nuclear,/turf/simulated/floor,/area/bridge) -"aaL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/bridge) +"aaL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/bridge) "aaM" = (/obj/structure/closet/fireaxecabinet{pixel_x = 32},/turf/simulated/floor,/area/bridge) "aaN" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/bridge) "aaO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/bridge) @@ -92,7 +92,7 @@ "abN" = (/turf/simulated/floor/plating,/area/hallway/primary/central) "abO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/hallway/primary/central) "abP" = (/obj/machinery/door/firedoor/border_only,/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/bridge) -"abQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrubbing_gases = list()},/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/bridge) +"abQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/bridge) "abR" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/bridge) "abS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/hallway/primary/central) "abT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/hallway/primary/central) @@ -217,7 +217,7 @@ "aei" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/security/brig) "aej" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_x = -27; pixel_y = 3},/turf/simulated/floor,/area/security/brig) "aek" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/security/brig) -"ael" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/rack,/obj/item/clothing/suit/armor/laserproof,/obj/item/clothing/suit/armor/reactive,/turf/simulated/floor{icon_state = "dark"},/area/security/brig) +"ael" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/structure/rack,/obj/item/clothing/suit/armor/laserproof,/obj/item/clothing/suit/armor/reactive,/turf/simulated/floor{icon_state = "dark"},/area/security/brig) "aem" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/poddoor/preopen{id_tag = "xenobio1"; name = "containment blast door"},/turf/simulated/floor,/area/science/lab) "aen" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/science/lab) "aeo" = (/obj/machinery/monkey_recycler,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor{icon_state = "white"},/area/science/lab) @@ -261,7 +261,7 @@ "afa" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor,/area/supply/storage) "afb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/supply/storage) "afc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/supply/storage) -"afd" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/supply/storage) +"afd" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/supply/storage) "afe" = (/obj/structure/closet/secure_closet/miner,/turf/simulated/floor{dir = 4; icon_state = "brown"},/area/supply/storage) "aff" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/filingcabinet,/turf/simulated/floor,/area/supply/storage) "afg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/computer/supplycomp,/turf/simulated/floor{dir = 2; icon_state = "yellowcorner"},/area/supply/storage) @@ -294,19 +294,19 @@ "afH" = (/turf/simulated/floor{icon_state = "delivery"},/area/hallway/primary/central) "afI" = (/obj/machinery/computer/ordercomp,/turf/simulated/floor,/area/hallway/primary/central) "afJ" = (/obj/structure/closet/crate/bin,/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/hallway/primary/central) -"afK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/hallway/primary/central) +"afK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) "afL" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/hallway/primary/central) "afM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/security/brig) "afN" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/security/brig) "afO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/security/brig) "afP" = (/obj/machinery/door/window/brigdoor{dir = 4; id_tag = "Cell 2"; name = "Cell 2"; req_access_txt = "2"},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/brig) "afQ" = (/obj/machinery/flasher{id_tag = "Cell 2"; pixel_x = 28},/turf/simulated/floor,/area/security/brig) -"afR" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list()},/turf/simulated/floor{icon_state = "white"},/area/science/lab) -"afS" = (/obj/structure/table,/obj/item/weapon/extinguisher{pixel_x = 4; pixel_y = 3},/obj/item/weapon/extinguisher,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list()},/turf/simulated/floor{icon_state = "white"},/area/science/lab) +"afR" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/lab) +"afS" = (/obj/structure/table,/obj/item/weapon/extinguisher{pixel_x = 4; pixel_y = 3},/obj/item/weapon/extinguisher,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "afT" = (/obj/structure/table,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/machinery/light,/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "afU" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/machinery/atmospherics/unary/vent_pump{dir = 2; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "afV" = (/obj/machinery/door/airlock/glass_mining{name = "Cargo Bay"; req_access_txt = "31"},/turf/simulated/floor,/area/supply/storage) -"afW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/obj/machinery/photocopier,/turf/simulated/floor{icon_state = "cautioncorner"; dir = 4},/area/supply/storage) +"afW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/photocopier,/turf/simulated/floor{icon_state = "cautioncorner"; dir = 4},/area/supply/storage) "afX" = (/turf/simulated/floor,/area/hallway/primary/central) "afY" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor,/area/hallway/primary/central) "afZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor,/area/hallway/primary/central) @@ -320,7 +320,7 @@ "agh" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor,/area/security/brig) "agi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/brig) "agj" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/security/brig) -"agk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/stool/bed,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor,/area/security/brig) +"agk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/structure/stool/bed,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor,/area/security/brig) "agl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/primary/central) "agm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/primary/central) "agn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/central) @@ -424,17 +424,17 @@ "aih" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/computer/security,/turf/simulated/floor,/area/security/brig) "aii" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/computer/secure_data,/obj/machinery/camera/autoname{dir = 1},/turf/simulated/floor,/area/security/brig) "aij" = (/obj/machinery/light,/obj/machinery/computer/prisoner,/turf/simulated/floor,/area/security/brig) -"aik" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/obj/machinery/vending/security,/turf/simulated/floor,/area/security/brig) +"aik" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/vending/security,/turf/simulated/floor,/area/security/brig) "ail" = (/obj/structure/filingcabinet,/turf/simulated/floor,/area/security/brig) "aim" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/brig) "ain" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "grimy"},/area/security/brig) "aio" = (/turf/simulated/floor{icon_state = "grimy"},/area/security/brig) -"aip" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list()},/turf/simulated/floor{icon_state = "grimy"},/area/security/brig) +"aip" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "grimy"},/area/security/brig) "aiq" = (/obj/machinery/newscaster{pixel_x = -32; pixel_y = 0},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/hallway/primary/central) "air" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "whitepurple"; dir = 8},/area/science/lab) "ais" = (/obj/machinery/computer/rdconsole/core,/turf/simulated/floor,/area/science/lab) "ait" = (/obj/machinery/light,/turf/simulated/floor,/area/science/lab) -"aiu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrubbing_gases = list()},/obj/machinery/r_n_d/fabricator/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/turf/simulated/floor,/area/science/lab) +"aiu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/r_n_d/fabricator/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/turf/simulated/floor,/area/science/lab) "aiv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "warnwhite"},/area/science/lab) "aiw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only{dir = 2; name = "hazard door south"},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "aix" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/beaker/large{pixel_x = -3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 8; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 8; pixel_y = 2},/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor{icon_state = "white"},/area/science/lab) @@ -473,7 +473,7 @@ "aje" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/light/small,/turf/simulated/floor{icon_state = "bot"},/area/supply/storage) "ajf" = (/obj/structure/closet/crate,/turf/simulated/floor{icon_state = "bot"},/area/supply/storage) "ajg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall,/area/hallway/primary/central) -"ajh" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrubbing_gases = list()},/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) +"ajh" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) "aji" = (/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/hallway/primary/central) "ajj" = (/obj/machinery/door/airlock{id_tag = "Dorm1"; name = "Dorm 1"},/turf/simulated/floor,/area/hallway/primary/central) "ajk" = (/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/hallway/primary/central) @@ -509,10 +509,10 @@ "ajO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/hallway/primary/central) "ajP" = (/obj/machinery/door/window{dir = 4},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/hallway/primary/central) "ajQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor,/area/hallway/primary/central) -"ajR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/hallway/primary/central) -"ajS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/hallway/primary/central) +"ajR" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) +"ajS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) "ajT" = (/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"},/turf/simulated/floor{icon_state = "white"},/area/science/lab) -"ajU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list()},/obj/machinery/door/firedoor/border_only{dir = 8; name = "hazard door west"},/turf/simulated/floor{icon_state = "white"},/area/science/lab) +"ajU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/door/firedoor/border_only{dir = 8; name = "hazard door west"},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "ajV" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "ajW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "ajX" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/obj/machinery/door/firedoor/border_only{dir = 8; name = "hazard door west"},/turf/simulated/floor{icon_state = "bot"},/area/science/lab) @@ -549,7 +549,7 @@ "akC" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor{dir = 8; icon_state = "warnwhite"},/area/science/lab) "akD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/science/lab) "akE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 9; icon_state = "whitehall"},/area/science/lab) -"akF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{dir = 9; icon_state = "whitehall"},/area/science/lab) +"akF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor{dir = 9; icon_state = "whitehall"},/area/science/lab) "akG" = (/obj/machinery/light,/turf/simulated/floor{dir = 9; icon_state = "whitehall"},/area/science/lab) "akH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/science/lab) "akI" = (/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/science/lab) @@ -572,7 +572,7 @@ "akZ" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/device/paicard,/obj/item/weapon/coin/silver,/obj/item/weapon/pen,/obj/machinery/light,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor{icon_state = "neutral"},/area/hallway/primary/central) "ala" = (/obj/machinery/bookbinder,/turf/simulated/floor{icon_state = "neutral"},/area/hallway/primary/central) "alb" = (/obj/machinery/libraryscanner,/turf/simulated/floor{icon_state = "neutral"},/area/hallway/primary/central) -"alc" = (/obj/structure/table/woodentable,/obj/machinery/computer/library{pixel_y = 0},/turf/simulated/floor{icon_state = "neutral"; dir = 6},/area/hallway/primary/central) +"alc" = (/obj/structure/table/woodentable,/obj/machinery/librarycomp{pixel_y = 0},/turf/simulated/floor{icon_state = "neutral"; dir = 6},/area/hallway/primary/central) "ald" = (/obj/machinery/door/airlock/research{name = "Toxins Lab"; req_access_txt = "7"},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "ale" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/vending/coffee,/turf/simulated/floor{icon_state = "white"},/area/science/lab) "alf" = (/obj/machinery/vending/cigarette,/turf/simulated/floor{icon_state = "white"},/area/science/lab) @@ -623,9 +623,9 @@ "alY" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/hallway/primary/central) "alZ" = (/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) "ama" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/science/lab) -"amb" = (/obj/machinery/conveyor{dir = 4; id_tag = "ToxinLoad"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/plasma,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "bot"},/area/science/lab) -"amc" = (/obj/machinery/conveyor{dir = 4; id_tag = "ToxinLoad"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/plasma,/turf/simulated/floor{icon_state = "bot"},/area/science/lab) -"amd" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/plasma,/obj/machinery/door/window{dir = 4; base_state = "right"},/turf/simulated/floor{dir = 2; icon_state = "redfull"},/area/science/lab) +"amb" = (/obj/machinery/conveyor{dir = 4; id_tag = "ToxinLoad"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/toxins,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "bot"},/area/science/lab) +"amc" = (/obj/machinery/conveyor{dir = 4; id_tag = "ToxinLoad"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor{icon_state = "bot"},/area/science/lab) +"amd" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/toxins,/obj/machinery/door/window{dir = 4; base_state = "right"},/turf/simulated/floor{dir = 2; icon_state = "redfull"},/area/science/lab) "ame" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/science/lab) "amf" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "amg" = (/obj/machinery/atmospherics/binary/volume_pump{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/science/lab) @@ -674,7 +674,7 @@ "amX" = (/obj/structure/table,/obj/item/stack/sheet/glass/rglass{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) "amY" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor,/area/ai_monitored/storage/eva) "amZ" = (/turf/simulated/floor,/area/ai_monitored/storage/eva) -"ana" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/ai_monitored/storage/eva) +"ana" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/ai_monitored/storage/eva) "anb" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "anc" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central) "and" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/hallway/primary/central) @@ -683,7 +683,7 @@ "ang" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/light,/turf/simulated/floor{dir = 2; icon_state = "warnwhite"},/area/science/lab) "anh" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor{dir = 2; icon_state = "warnwhite"},/area/science/lab) "ani" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor{dir = 2; icon_state = "warnwhite"},/area/science/lab) -"anj" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrubbing_gases = list()},/obj/machinery/portable_atmospherics/pump,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"},/area/science/lab) +"anj" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/portable_atmospherics/pump,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"},/area/science/lab) "ank" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 1},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"},/area/science/lab) "anl" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 1},/obj/machinery/camera/autoname{dir = 1},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"},/area/science/lab) "anm" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"},/area/science/lab) @@ -770,7 +770,7 @@ "aoP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) "aoQ" = (/obj/machinery/door/airlock/maintenance{name = "Medbay Maintenance"; req_access_txt = "45"},/turf/simulated/floor/plating,/area/medical/medbay) "aoR" = (/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "warnwhite"},/area/medical/medbay) -"aoS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrubbing_gases = list()},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"aoS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "aoT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "aoU" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "aoV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -788,7 +788,7 @@ "aph" = (/obj/structure/stool/bed/chair/comfy/beige,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor{icon_state = "grimy"},/area/hallway/secondary/exit) "api" = (/turf/simulated/floor{icon_state = "grimy"},/area/hallway/secondary/exit) "apj" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor{icon_state = "grimy"},/area/hallway/secondary/exit) -"apk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrubbing_gases = list()},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/janitor) +"apk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/janitor) "apl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor,/area/janitor) "apm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/janitor) "apn" = (/obj/machinery/door/firedoor/border_only{dir = 4; name = "Firelock East"},/turf/simulated/floor{dir = 4; icon_state = "loadingarea"},/area/janitor) @@ -799,7 +799,7 @@ "aps" = (/obj/machinery/power/apc{dir = 1; name = "_North APC"; pixel_y = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/ai_monitored/storage/eva) "apt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) "apu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/ai_monitored/storage/eva) -"apv" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list()},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) +"apv" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "apw" = (/obj/structure/toilet{pixel_y = 8},/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "freezerfloor"},/area/hallway/primary/central) "apx" = (/obj/structure/mirror{pixel_x = 0; pixel_y = 32},/obj/structure/sink{pixel_y = 24},/turf/simulated/floor{icon_state = "freezerfloor"},/area/hallway/primary/central) "apy" = (/obj/structure/closet,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 8},/area/hallway/primary/central) @@ -813,7 +813,7 @@ "apG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "apH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "apI" = (/obj/machinery/optable,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/medical/medbay) -"apJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/hallway/secondary/exit) +"apJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/secondary/exit) "apK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/hallway/secondary/exit) "apL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/hallway/secondary/exit) "apM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/hallway/secondary/exit) @@ -869,7 +869,7 @@ "aqK" = (/obj/machinery/door/airlock/medical{name = "Operating Theatre"; req_access_txt = "45"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "aqL" = (/turf/simulated/floor{dir = 8; icon_state = "whitegreen"},/area/medical/medbay) "aqM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"aqN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"aqN" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "aqO" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor,/area/hallway/secondary/exit) "aqP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/camera/autoname,/turf/simulated/floor,/area/hallway/secondary/exit) "aqQ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/secondary/exit) @@ -936,7 +936,7 @@ "arZ" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{dir = 8; icon_state = "whitegreen"},/area/medical/medbay) "asa" = (/obj/machinery/vending/medical{pixel_x = -2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "asb" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"asc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/newscaster{pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"asc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/newscaster{pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "asd" = (/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/obj/item/weapon/wrench{pixel_x = 5; pixel_y = -5},/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "ase" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/medical/medbay) "asf" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/medical/medbay) @@ -957,7 +957,7 @@ "asu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/glass{name = "Diner"},/turf/simulated/floor,/area/crew_quarters/bar) "asv" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/plating,/area/crew_quarters/bar) "asw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/glass{name = "Diner"},/turf/simulated/floor,/area/crew_quarters/bar) -"asx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/hallway/primary/central) +"asx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) "asy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor,/area/hallway/primary/central) "asz" = (/obj/structure/sign/chemistry,/turf/simulated/wall,/area/medical/medbay) "asA" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 2; icon_state = "whiteyellow"},/area/medical/medbay) @@ -970,7 +970,7 @@ "asH" = (/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "asI" = (/obj/machinery/atmospherics/pipe/simple{dir = 9; icon_state = "intact"; level = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "asJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor,/area/hallway/secondary/exit) -"asK" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/hallway/secondary/exit) +"asK" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/secondary/exit) "asL" = (/obj/machinery/light,/turf/simulated/floor,/area/hallway/secondary/exit) "asM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "asN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/heads{name = "\improper Job Assignment"}) @@ -998,12 +998,12 @@ "atj" = (/obj/structure/table,/obj/machinery/door/window{dir = 2; base_state = "right"; layer = 3.1},/turf/simulated/floor,/area/hallway/primary/central) "atk" = (/obj/structure/table/reinforced,/obj/machinery/door/window{base_state = "right"; dir = 2; name = "Chemistry Desk"; req_access_txt = "33"},/obj/item/clothing/glasses/science,/turf/simulated/floor/plating,/area/medical/medbay) "atl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"atm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list()},/obj/structure/table,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/item/device/radio/headset/headset_med,/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/machinery/camera/autoname,/turf/simulated/floor{tag = "icon-whiteyellowcorner"; icon_state = "whiteyellowcorner"; dir = 2},/area/medical/medbay) +"atm" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/item/device/radio/headset/headset_med,/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/machinery/camera/autoname,/turf/simulated/floor{tag = "icon-whiteyellowcorner"; icon_state = "whiteyellowcorner"; dir = 2},/area/medical/medbay) "atn" = (/obj/machinery/smartfridge/chemistry,/turf/simulated/wall,/area/medical/medbay) "ato" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{tag = "icon-whiteyellowcorner (WEST)"; icon_state = "whiteyellowcorner"; dir = 8},/area/medical/medbay) "atp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/machinery/door/firedoor/border_only{dir = 4; name = "hazard door east"},/turf/simulated/floor{dir = 4; icon_state = "whiteblue"},/area/medical/medbay) "atq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Cryo"; req_access_txt = "45"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"atr" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) +"atr" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) "ats" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "att" = (/obj/machinery/vending/wallmed2{pixel_y = -28},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "atu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/exit) @@ -1032,7 +1032,7 @@ "atR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "atS" = (/obj/structure/stool,/turf/simulated/floor/carpet,/area/crew_quarters/bar) "atT" = (/obj/structure/table/reinforced,/obj/item/weapon/lighter/zippo,/obj/structure/sign/securearea{desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; icon_state = "monkey_painting"; name = "Mr. Deempisi portrait"; pixel_x = 4; pixel_y = 28},/turf/simulated/floor/carpet,/area/crew_quarters/bar) -"atU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrubbing_gases = list()},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) +"atU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) "atV" = (/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) "atW" = (/obj/machinery/requests_console{department = "Garden"; departmentType = 2; pixel_x = 30; pixel_y = 0},/turf/simulated/floor,/area/hallway/primary/central) "atX" = (/obj/machinery/chem_dispenser,/obj/item/weapon/reagent_containers/glass/beaker/large,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -1070,7 +1070,7 @@ "auD" = (/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor{tag = "icon-whiteyellow (WEST)"; icon_state = "whiteyellow"; dir = 8},/area/medical/medbay) "auE" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 4; name = "hazard door east"},/turf/simulated/floor{dir = 4; icon_state = "whiteblue"},/area/medical/medbay) "auF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/glass_medical{id_tag = "GeneticsDoor"; name = "Genetics"; req_access_txt = "45"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"auG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/door_control{desc = "A remote control switch for the genetics doors."; id_tag = "GeneticsDoor"; name = "Genetics Exit Button"; normaldoorcontrol = 1; pixel_x = 8; pixel_y = 24},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) +"auG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/door_control{desc = "A remote control switch for the genetics doors."; id_tag = "GeneticsDoor"; name = "Genetics Exit Button"; normaldoorcontrol = 1; pixel_x = 8; pixel_y = 24},/turf/simulated/floor{dir = 8; icon_state = "whiteblue"},/area/medical/medbay) "auH" = (/obj/machinery/vending/wallmed1{pixel_y = 28},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "auI" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "auJ" = (/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -1082,7 +1082,7 @@ "auP" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/closet/secure_closet/hop,/turf/simulated/floor,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "auQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "auR" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/light,/turf/simulated/floor,/area/crew_quarters/heads{name = "\improper Job Assignment"}) -"auS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/obj/machinery/photocopier,/turf/simulated/floor,/area/crew_quarters/heads{name = "\improper Job Assignment"}) +"auS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/photocopier,/turf/simulated/floor,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "auT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "auU" = (/obj/structure/closet/emcloset,/turf/simulated/floor{icon_state = "blue"; dir = 10},/area/hallway/primary/central) "auV" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) @@ -1205,7 +1205,7 @@ "axi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/medbay) "axj" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/fire{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/fire{pixel_x = -2; pixel_y = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "axk" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"axl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"axl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "axm" = (/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "axn" = (/turf/simulated/shuttle/floor,/turf/simulated/shuttle/wall{icon_state = "swall_f10"; dir = 2},/area/shuttle/arrival/station) "axo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/hallway/primary/central) @@ -1232,7 +1232,7 @@ "axJ" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/meter{use_power = 0},/turf/space,/area) "axK" = (/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/hallway/primary/central) "axL" = (/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/hallway/primary/central) -"axM" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list()},/obj/structure/kitchenspike,/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) +"axM" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/kitchenspike,/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "axN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/light/small,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "axO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/gibber,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "axP" = (/obj/structure/closet/secure_closet/bar{req_access_txt = "25"},/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -1240,7 +1240,7 @@ "axR" = (/obj/structure/table/woodentable,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/simulated/floor/wood,/area/crew_quarters/bar) "axS" = (/obj/machinery/camera/autoname{dir = 1},/obj/structure/table/woodentable,/obj/item/weapon/book/manual/chef_recipes{pixel_y = 5},/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/simulated/floor/wood,/area/crew_quarters/bar) "axT" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor/wood,/area/crew_quarters/bar) -"axU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/obj/machinery/light/small,/obj/machinery/processor,/turf/simulated/floor/wood,/area/crew_quarters/bar) +"axU" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small,/obj/machinery/processor,/turf/simulated/floor/wood,/area/crew_quarters/bar) "axV" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/wood,/area/crew_quarters/bar) "axW" = (/obj/structure/table,/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "axX" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -1276,7 +1276,7 @@ "ayB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/hallway/primary/central) "ayC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/hallway/primary/central) "ayD" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/hallway/primary/central) -"ayE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/conveyor{id_tag = "CanisterStore"},/obj/machinery/portable_atmospherics/canister/plasma,/turf/simulated/floor,/area/engineering/engine) +"ayE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/conveyor{id_tag = "CanisterStore"},/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor,/area/engineering/engine) "ayF" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/conveyor{id_tag = "CanisterStore"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor,/area/engineering/engine) "ayG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/conveyor{id_tag = "CanisterStore"},/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/floor,/area/engineering/engine) "ayH" = (/obj/structure/closet/firecloset,/turf/simulated/floor,/area/engineering/engine) @@ -1302,15 +1302,15 @@ "azb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/engineering/engine) "azc" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor,/area/engineering/engine) "azd" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/engineering/engine) -"aze" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/engineering/engine) +"aze" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/engineering/engine) "azf" = (/obj/machinery/power/monitor,/obj/structure/cable,/turf/simulated/floor,/area/engineering/engine) "azg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/vending/coffee,/turf/simulated/floor,/area/hallway/primary/central) "azh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/vending/cigarette{pixel_x = 0; pixel_y = 0},/turf/simulated/floor,/area/hallway/primary/central) "azi" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/gas{pixel_x = 3; pixel_y = 3},/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas{pixel_x = -3; pixel_y = -3},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/turf/simulated/floor,/area/engineering/engine) "azj" = (/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/engineering/engine) "azk" = (/turf/simulated/floor/plating,/area/engineering/engine) -"azl" = (/turf/simulated/floor{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/engine) -"azm" = (/obj/machinery/atmospherics/miner/oxygen,/turf/simulated/floor{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/engine) +"azl" = (/turf/simulated/floor{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/engine) +"azm" = (/obj/machinery/atmospherics/miner/oxygen,/turf/simulated/floor{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/engine) "azn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/engineering/engine) "azo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/engineering/engine) "azp" = (/obj/effect/landmark/start{name = "Station Engineer"},/turf/simulated/floor,/area/engineering/engine) @@ -1325,7 +1325,7 @@ "azy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/sign/securearea{name = "ENGINEERING ACCESS"; pixel_x = 32},/turf/simulated/floor{dir = 6; icon_state = "yellow"},/area/hallway/primary/central) "azz" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/engineering/engine) "azA" = (/obj/machinery/conveyor_switch{id_tag = "CanisterStore"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/engineering/engine) -"azB" = (/obj/machinery/portable_atmospherics/canister/plasma,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window{dir = 2; base_state = "right"},/turf/simulated/floor{dir = 2; icon_state = "redfull"},/area/engineering/engine) +"azB" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window{dir = 2; base_state = "right"},/turf/simulated/floor{dir = 2; icon_state = "redfull"},/area/engineering/engine) "azC" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window{dir = 2; base_state = "right"},/turf/simulated/floor{dir = 1; icon_state = "bluefull"},/area/engineering/engine) "azD" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window{dir = 2; base_state = "right"},/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine) "azE" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/engineering/engine) @@ -1335,8 +1335,8 @@ "azI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/engineering/engine) "azJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating/airless,/area) "azK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/turf/simulated/floor/plating/airless,/area/engineering/engine) -"azL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/engine) -"azM" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/engine) +"azL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/engine) +"azM" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/engine) "azN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/engineering/engine) "azO" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/engineering/engine) "azP" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engineering/engine) @@ -1352,14 +1352,14 @@ "azZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/engineering/engine) "aAa" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor,/area/engineering/engine) "aAb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor,/area/engineering/engine) -"aAc" = (/obj/machinery/atmospherics/miner/nitrogen,/turf/simulated/floor{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/engine) +"aAc" = (/obj/machinery/atmospherics/miner/nitrogen,/turf/simulated/floor{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/engine) "aAd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor,/area/engineering/engine) "aAe" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor,/area/engineering/engine) "aAf" = (/obj/machinery/vending/engivend,/turf/simulated/floor,/area/engineering/engine) "aAg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/engineering/engine) "aAh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/light/small{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor{dir = 9; icon_state = "yellow"},/area/engineering/engine) "aAi" = (/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/turf/simulated/floor{icon_state = "yellow"; dir = 1},/area/engineering/engine) -"aAj" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list()},/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/turf/simulated/floor{icon_state = "yellow"; dir = 5},/area/engineering/engine) +"aAj" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/turf/simulated/floor{icon_state = "yellow"; dir = 5},/area/engineering/engine) "aAk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/engineering/engine) "aAl" = (/obj/machinery/pipedispenser,/turf/simulated/floor,/area/engineering/engine) "aAm" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/engineering/engine) @@ -1486,7 +1486,7 @@ "aCD" = (/obj/machinery/atmospherics/pipe/simple{_color = "yellow"; icon_state = "intact-y"; level = 2},/obj/machinery/meter,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engineering/engine) "aCE" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/turf/simulated/floor/plating,/area/engineering/engine) "aCF" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engineering/engine) -"aCG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/engineering/engine) +"aCG" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/engineering/engine) "aCH" = (/obj/structure/sign/fire,/turf/simulated/wall,/area/engineering/engine) "aCI" = (/obj/structure/transit_tube{tag = "icon-N-S-Pass"; icon_state = "N-S-Pass"},/turf/space,/area) "aCJ" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/obj/structure/lattice,/turf/space,/area/engineering/engine) @@ -1594,7 +1594,7 @@ "aEH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tcommsat/computer) "aEI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall/r_wall,/area/tcommsat/computer) "aEJ" = (/obj/machinery/computer/telecomms/traffic{network = "tcommsat"},/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/tcommsat/computer) -"aEK" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/tcommsat/computer) +"aEK" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/tcommsat/computer) "aEL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor,/area/tcommsat/computer) "aEM" = (/obj/structure/table,/obj/item/weapon/paper_bin,/obj/item/weapon/paper/monitorkey,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/tcommsat/computer) "aEN" = (/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine) @@ -1602,10 +1602,10 @@ "aEP" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/engineering/engine) "aEQ" = (/turf/simulated/floor{icon_state = "vault"; dir = 4},/area/engineering/engine) "aER" = (/obj/structure/transit_tube{icon_state = "N-S"},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/tcommsat/computer) -"aES" = (/obj/machinery/telecomms/processor/preset_complete,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) -"aET" = (/obj/machinery/telecomms/bus/preset_complete,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) -"aEU" = (/obj/machinery/telecomms/server/presets/complete,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) -"aEV" = (/obj/machinery/message_server,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) +"aES" = (/obj/machinery/telecomms/processor/preset_complete,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) +"aET" = (/obj/machinery/telecomms/bus/preset_complete,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) +"aEU" = (/obj/machinery/telecomms/server/presets/complete,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) +"aEV" = (/obj/machinery/message_server,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) "aEW" = (/obj/machinery/computer/telecomms/server{network = "tcommsat"},/turf/simulated/floor{icon_state = "yellow"; dir = 10},/area/tcommsat/computer) "aEX" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor,/area/tcommsat/computer) "aEY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/tcommsat/computer) @@ -1617,9 +1617,9 @@ "aFe" = (/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine) "aFf" = (/obj/structure/transit_tube{icon_state = "N-S"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/tcommsat/computer) "aFg" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/tcommsat/computer) -"aFh" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrubbing_gases = list()},/turf/simulated/floor/plating,/area/tcommsat/computer) -"aFi" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) -"aFj" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) +"aFh" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plating,/area/tcommsat/computer) +"aFi" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) +"aFj" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) "aFk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/tcommsat/computer) "aFl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/tcommsat/computer) "aFm" = (/obj/machinery/door/airlock/glass_command{name = "Control Room"; req_access_txt = "19; 61"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/tcommsat/computer) @@ -1632,9 +1632,9 @@ "aFt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/computer) "aFu" = (/obj/structure/transit_tube/station{tag = "icon-closed (EAST)"; icon_state = "closed"; dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/tcommsat/computer) "aFv" = (/turf/simulated/wall/r_wall,/area/tcommsat/computer) -"aFw" = (/obj/machinery/power/apc{cell_type = 5000; dir = 8; name = "Telecoms Server APC"; pixel_x = -25; pixel_y = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) -"aFx" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) -"aFy" = (/obj/machinery/power/terminal{dir = 8},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) +"aFw" = (/obj/machinery/power/apc{cell_type = 5000; dir = 8; name = "Telecoms Server APC"; pixel_x = -25; pixel_y = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) +"aFx" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) +"aFy" = (/obj/machinery/power/terminal{dir = 8},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) "aFz" = (/obj/machinery/door/airlock/glass_engineering{name = "Server Room"; req_access_txt = "61"},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/tcommsat/computer) "aFA" = (/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/tcommsat/computer) "aFB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/tcommsat/computer) @@ -1643,11 +1643,11 @@ "aFE" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine) "aFF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine) "aFG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine) -"aFH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/obj/machinery/camera/autoname{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine) +"aFH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/camera/autoname{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/engineering/engine) "aFI" = (/obj/structure/transit_tube{tag = "icon-Block (NORTH)"; icon_state = "Block"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/tcommsat/computer) "aFJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/tcommsat/computer) "aFK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/tcommsat/computer) -"aFL" = (/obj/machinery/camera/autoname{dir = 4; network = list("SS13")},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) +"aFL" = (/obj/machinery/camera/autoname{dir = 4; network = list("SS13")},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) "aFM" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 0},/turf/simulated/wall,/area/tcommsat/computer) "aFN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/landmark/start{name = "Cyborg"},/turf/simulated/floor,/area/tcommsat/computer) "aFO" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/landmark/start{name = "Cyborg"},/turf/simulated/floor,/area/tcommsat/computer) @@ -1660,10 +1660,10 @@ "aFV" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/engineering/engine) "aFW" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/engineering/engine) "aFX" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/tcommsat/computer) -"aFY" = (/obj/machinery/telecomms/receiver/preset_complete,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) -"aFZ" = (/obj/machinery/telecomms/hub/preset,/obj/structure/sign/nosmoking_2{pixel_y = -32},/obj/machinery/light/small,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) -"aGa" = (/obj/machinery/telecomms/broadcaster/preset_complete,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) -"aGb" = (/obj/machinery/blackbox_recorder,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcommsat/computer) +"aFY" = (/obj/machinery/telecomms/receiver/preset_complete,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) +"aFZ" = (/obj/machinery/telecomms/hub/preset,/obj/structure/sign/nosmoking_2{pixel_y = -32},/obj/machinery/light/small,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) +"aGa" = (/obj/machinery/telecomms/broadcaster/preset_complete,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) +"aGb" = (/obj/machinery/blackbox_recorder,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer) "aGc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/wall,/area/tcommsat/computer) "aGd" = (/obj/structure/table,/obj/item/device/multitool,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/tcommsat/computer) "aGe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/tcommsat/computer) @@ -1680,13 +1680,13 @@ "aGp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/tcommsat/computer) "aGq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/wall/r_wall,/area/tcommsat/computer) "aGr" = (/obj/structure/table,/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/tcommsat/computer) -"aGs" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/tcommsat/computer) +"aGs" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/tcommsat/computer) "aGt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor,/area/tcommsat/computer) "aGu" = (/obj/machinery/door/airlock/engineering{name = "Telecommunications"; req_access_txt = "61"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/tcommsat/computer) "aGv" = (/obj/machinery/power/apc{dir = 8; name = "Gravity Generator APC"; pixel_x = -25; pixel_y = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/engineering/engine) "aGw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/engineering/engine) "aGx" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engineering/engine) -"aGy" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list()},/turf/simulated/floor,/area/engineering/engine) +"aGy" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/engineering/engine) "aGz" = (/turf/space,/area/syndicate_station/southeast) "aGA" = (/obj/structure/table,/obj/item/device/radio,/turf/simulated/floor{icon_state = "yellow"; dir = 10},/area/tcommsat/computer) "aGB" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -35},/obj/effect/landmark/start{name = "AI"},/turf/simulated/floor,/area/tcommsat/computer) @@ -2237,7 +2237,7 @@ "bkn" = (/obj/structure/bookcase{name = "Forbidden Knowledge"},/obj/effect/decal/cleanable/cobweb,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "bko" = (/obj/structure/bookcase{name = "Forbidden Knowledge"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "bkp" = (/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"bkq" = (/obj/machinery/computer/library,/obj/structure/table/woodentable,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"bkq" = (/obj/machinery/librarycomp,/obj/structure/table/woodentable,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "bkr" = (/obj/machinery/vending/magivend,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "bks" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "bkt" = (/obj/structure/closet{icon_closed = "cabinet_closed"; icon_opened = "cabinet_open"; icon_state = "cabinet_closed"},/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{dir = 9; icon_state = "carpetside"},/area/wizard_station) diff --git a/maps/taxistation.dmm b/maps/taxistation.dmm index c155a0516f8..09e6f61c14e 100644 --- a/maps/taxistation.dmm +++ b/maps/taxistation.dmm @@ -351,16 +351,16 @@ "agM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk{icon_state = "catwalk12"},/turf/space,/area/solar/fore{name = "\improper Engineering Solar Array"}) "agN" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk{icon_state = "catwalk12"},/turf/space,/area/solar/fore{name = "\improper Engineering Solar Array"}) "agO" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/catwalk{icon_state = "catwalk8"},/turf/space,/area/solar/fore{name = "\improper Engineering Solar Array"}) -"agP" = (/obj/machinery/telecomms/processor/preset_two,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"agQ" = (/obj/machinery/telecomms/processor/preset_four,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"agR" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"agS" = (/obj/machinery/telecomms/server/presets/medical,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"agT" = (/obj/machinery/telecomms/server/presets/science,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"agU" = (/obj/machinery/telecomms/server/presets/common,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"agV" = (/obj/machinery/telecomms/server/presets/supply,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"agW" = (/obj/machinery/telecomms/server/presets/security,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"agX" = (/obj/machinery/telecomms/server/presets/engineering,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"agY" = (/obj/machinery/telecomms/server/presets/command,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) +"agP" = (/obj/machinery/telecomms/processor/preset_two,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"agQ" = (/obj/machinery/telecomms/processor/preset_four,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"agR" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"agS" = (/obj/machinery/telecomms/server/presets/medical,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"agT" = (/obj/machinery/telecomms/server/presets/science,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"agU" = (/obj/machinery/telecomms/server/presets/common,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"agV" = (/obj/machinery/telecomms/server/presets/supply,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"agW" = (/obj/machinery/telecomms/server/presets/security,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"agX" = (/obj/machinery/telecomms/server/presets/engineering,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"agY" = (/obj/machinery/telecomms/server/presets/command,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) "agZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "aha" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "ahb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -396,9 +396,9 @@ "ahF" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/catwalk{icon_state = "catwalk12"},/turf/space,/area/solar/fstarboard{name = "\improper Medbay Solar Array"}) "ahG" = (/obj/machinery/power/solar/panel/tracker,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/catwalk{icon_state = "catwalk8"},/turf/space,/area/solar/fstarboard{name = "\improper Medbay Solar Array"}) "ahH" = (/obj/structure/cable,/obj/machinery/power/solar/panel{id_tag = "engisolar"; name = "Engineering Solar Array"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/fore{name = "\improper Engineering Solar Array"}) -"ahI" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"ahJ" = (/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"ahK" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/light{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) +"ahI" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"ahJ" = (/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"ahK" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/light{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) "ahL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "ahM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/science/robotics) "ahN" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/science/robotics) @@ -425,11 +425,11 @@ "aii" = (/obj/structure/sign/electricshock,/turf/simulated/wall,/area/engine/aux_control{name = "Engineering Medical"}) "aij" = (/obj/machinery/door/airlock/external{req_access_txt = "13"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"}) "aik" = (/obj/structure/sign/vacuum,/turf/simulated/wall,/area/engine/aux_control{name = "Engineering Medical"}) -"ail" = (/obj/machinery/telecomms/processor/preset_three,/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"aim" = (/obj/machinery/telecomms/processor/preset_one,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) +"ail" = (/obj/machinery/telecomms/processor/preset_three,/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"aim" = (/obj/machinery/telecomms/processor/preset_one,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) "ain" = (/obj/machinery/blackbox_recorder,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber) "aio" = (/obj/machinery/message_server,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber) -"aip" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) +"aip" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) "aiq" = (/obj/machinery/computer/rdconsole/robotics,/turf/simulated/floor,/area/science/robotics) "air" = (/obj/machinery/computer/aifixer,/turf/simulated/floor,/area/science/robotics) "ais" = (/turf/simulated/wall,/area/science/robotics) @@ -456,10 +456,10 @@ "aiN" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"}) "aiO" = (/obj/machinery/power/terminal,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"}) "aiP" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/catwalk{icon_state = "catwalk3"},/turf/space,/area/solar/fstarboard{name = "\improper Medbay Solar Array"}) -"aiQ" = (/obj/machinery/power/smes{charge = 5e+006},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"aiR" = (/obj/machinery/telecomms/broadcaster/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"aiS" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"aiT" = (/obj/machinery/telecomms/broadcaster/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) +"aiQ" = (/obj/machinery/power/smes{charge = 5e+006},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"aiR" = (/obj/machinery/telecomms/broadcaster/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"aiS" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"aiT" = (/obj/machinery/telecomms/broadcaster/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) "aiU" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "aiV" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12;29"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating/airless,/area/science/robotics) "aiW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/science/robotics) @@ -491,13 +491,13 @@ "ajw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"}) "ajx" = (/obj/machinery/power/smes{charge = 1e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"}) "ajy" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"}) -"ajz" = (/obj/machinery/telecomms/bus/preset_two,/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"ajA" = (/obj/machinery/telecomms/bus/preset_four,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"ajB" = (/obj/machinery/telecomms/hub/preset,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"ajC" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"ajD" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 2; pixel_x = 0; pixel_y = -24},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/camera{c_tag = "Telecomms Chamber"; dir = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"ajE" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"ajF" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) +"ajz" = (/obj/machinery/telecomms/bus/preset_two,/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"ajA" = (/obj/machinery/telecomms/bus/preset_four,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"ajB" = (/obj/machinery/telecomms/hub/preset,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"ajC" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"ajD" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 2; pixel_x = 0; pixel_y = -24},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/camera{c_tag = "Telecomms Chamber"; dir = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"ajE" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"ajF" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) "ajG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/junction{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "ajH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/science/robotics) "ajI" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor,/area/science/robotics) @@ -532,9 +532,9 @@ "akl" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"}) "akm" = (/obj/machinery/suit_storage_unit/engie,/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"}) "akn" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/catwalk{icon_state = "catwalk1"},/turf/space,/area/solar/fstarboard{name = "\improper Medbay Solar Array"}) -"ako" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/light{dir = 8},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"akp" = (/obj/machinery/telecomms/receiver/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"akq" = (/obj/machinery/telecomms/receiver/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) +"ako" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/light{dir = 8},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"akp" = (/obj/machinery/telecomms/receiver/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"akq" = (/obj/machinery/telecomms/receiver/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) "akr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/highsecurity{aiControlDisabled = 1; name = "Telecomms Access Door"; req_access_txt = "61"; req_one_access_txt = ""},/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber) "aks" = (/obj/machinery/r_n_d/fabricator/mech,/obj/machinery/camera{c_tag = "Robotics"; dir = 4},/obj/machinery/newscaster{pixel_x = -26; pixel_y = 1},/turf/simulated/floor,/area/science/robotics) "akt" = (/obj/machinery/mineral/output,/turf/simulated/floor{icon_state = "bot"},/area/science/robotics) @@ -562,12 +562,12 @@ "akP" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/engine/aux_control{name = "Engineering Medical"}) "akQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "damaged2"},/area/engine/aux_control{name = "Engineering Medical"}) "akR" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/plating/airless,/area/engine/aux_control{name = "Engineering Medical"}) -"akS" = (/obj/machinery/telecomms/bus/preset_one,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"akT" = (/obj/machinery/telecomms/bus/preset_three,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"akU" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"akV" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"akW" = (/obj/machinery/atmospherics/pipe/manifold/insulated/visible/blue{dir = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) -"akX" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/tcomms/chamber) +"akS" = (/obj/machinery/telecomms/bus/preset_one,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"akT" = (/obj/machinery/telecomms/bus/preset_three,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"akU" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"akV" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"akW" = (/obj/machinery/atmospherics/pipe/manifold/insulated/visible/blue{dir = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"akX" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber) "akY" = (/turf/simulated/wall/r_wall,/area/tcommsat/computer) "akZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer) "ala" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -663,7 +663,7 @@ "amM" = (/turf/simulated/floor{icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "\improper Central Medical Hallway"}) "amN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101; on = 1},/turf/simulated/floor{icon_state = "neutral"},/area/hallway/primary/starboard{name = "\improper Central Medical Hallway"}) "amO" = (/turf/simulated/floor{icon_state = "neutral"},/area/hallway/primary/starboard{name = "\improper Central Medical Hallway"}) -"amP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("plasma","nitrous_oxide")},/turf/simulated/floor{icon_state = "neutral"},/area/hallway/primary/starboard{name = "\improper Central Medical Hallway"}) +"amP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "neutral"},/area/hallway/primary/starboard{name = "\improper Central Medical Hallway"}) "amQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/starboard{name = "\improper Central Medical Hallway"}) "amR" = (/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor{dir = 4; icon_state = "brown"},/area/hallway/primary/starboard{name = "\improper Central Medical Hallway"}) "amS" = (/turf/simulated/wall/r_wall,/area/wreck/bridge{name = "\improper Bridge Medical"}) @@ -915,7 +915,7 @@ "arE" = (/obj/machinery/portable_atmospherics/canister/plasma,/obj/machinery/light{dir = 8},/turf/simulated/floor,/area/wreck/bridge{name = "\improper Bridge Medical"}) "arF" = (/obj/structure/stool/bed/chair/comfy/brown,/turf/simulated/floor,/area/wreck/bridge{name = "\improper Bridge Medical"}) "arG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101; on = 1},/turf/simulated/floor,/area/wreck/bridge{name = "\improper Bridge Medical"}) -"arH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("plasma","nitrous_oxide")},/turf/simulated/floor,/area/wreck/bridge{name = "\improper Bridge Medical"}) +"arH" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/wreck/bridge{name = "\improper Bridge Medical"}) "arI" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/wreck/bridge{name = "\improper Bridge Medical"}) "arJ" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/floor,/area/engine/starboard_gyro_bay{icon_state = "atmos"; name = "\improper Atmospherics Medical"}) "arK" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor,/area/engine/starboard_gyro_bay{icon_state = "atmos"; name = "\improper Atmospherics Medical"}) @@ -1006,8 +1006,8 @@ "atr" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/wreck/bridge{name = "\improper Bridge Medical"}) "ats" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/wreck/bridge{name = "\improper Bridge Medical"}) "att" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/wreck/bridge{name = "\improper Bridge Medical"}) -"atu" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/floor,/area/engine/starboard_gyro_bay{icon_state = "atmos"; name = "\improper Atmospherics Medical"}) -"atv" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor,/area/engine/starboard_gyro_bay{icon_state = "atmos"; name = "\improper Atmospherics Medical"}) +"atu" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/floor,/area/engine/starboard_gyro_bay{icon_state = "atmos"; name = "\improper Atmospherics Medical"}) +"atv" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor,/area/engine/starboard_gyro_bay{icon_state = "atmos"; name = "\improper Atmospherics Medical"}) "atw" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 5},/turf/simulated/floor,/area/engine/starboard_gyro_bay{icon_state = "atmos"; name = "\improper Atmospherics Medical"}) "atx" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1212; input_tag = "n2o_in"; name = "Nitrous Oxide Supply Control"; output_tag = "n2o_out"; sensors = list("n2o_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/engine/starboard_gyro_bay{icon_state = "atmos"; name = "\improper Atmospherics Medical"}) "aty" = (/obj/machinery/atmospherics/pipe/manifold/yellow/visible,/turf/simulated/floor,/area/engineering/atmos) @@ -1094,9 +1094,9 @@ "avb" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/maintenance/fpmaint2) "avc" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "avd" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/maintenance/fpmaint2) -"ave" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"avf" = (/obj/machinery/door/airlock/glass_command{icon_state = "door_locked"; locked = 1; name = "Server Room"; req_access_txt = "30"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"avg" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) +"ave" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"avf" = (/obj/machinery/door/airlock/glass_command{icon_state = "door_locked"; locked = 1; name = "Server Room"; req_access_txt = "30"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"avg" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) "avh" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/science/lab) "avi" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/science/lab) "avj" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/science/lab) @@ -1140,9 +1140,9 @@ "avV" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/structure/lattice,/turf/space,/area) "avW" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/simulated/floor,/area/engineering/atmos) "avX" = (/obj/machinery/atmospherics/pipe/simple/filtering/visible,/obj/machinery/meter,/turf/simulated/floor,/area/engineering/atmos) -"avY" = (/obj/machinery/r_n_d/server/robotics,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"avZ" = (/obj/machinery/camera{c_tag = "Server Room"; dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"awa" = (/obj/machinery/r_n_d/server/core,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) +"avY" = (/obj/machinery/r_n_d/server/robotics,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"avZ" = (/obj/machinery/camera{c_tag = "Server Room"; dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"awa" = (/obj/machinery/r_n_d/server/core,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) "awb" = (/turf/simulated/wall,/area/maintenance/fpmaint2) "awc" = (/obj/structure/stool/bed/chair{dir = 1},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor,/area/hallway/secondary/entry{name = "\improper Taxi Medical Dock"}) "awd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/fore) @@ -1197,7 +1197,7 @@ "axa" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fore) "axb" = (/obj/machinery/light{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "dark vault stripe"},/area/engineering/engineering_auxiliary) "axc" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "dark vault stripe"; dir = 4},/area/engineering/engineering_auxiliary) -"axd" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor,/area/engineering/atmos) +"axd" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor,/area/engineering/atmos) "axe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 2; pixel_x = 0; pixel_y = -24},/obj/structure/closet/secure_closet/engineering_atmos,/turf/simulated/floor,/area/engineering/atmos) "axf" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 9},/turf/simulated/floor,/area/engineering/atmos) "axg" = (/obj/machinery/atmospherics/trinary/mixer{dir = 1; icon_state = "intact_on"; name = "Gas mixer (N2/O2)"; node1_concentration = 0.8; node2_concentration = 0.2; on = 1; target_pressure = 4500},/turf/simulated/floor,/area/engineering/atmos) @@ -1378,7 +1378,7 @@ "aAz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/atmos{name = "Atmospherics"; req_access_txt = "24"},/turf/simulated/floor,/area/engineering/atmos) "aAA" = (/obj/machinery/atmospherics/binary/pump{dir = 2; name = "Air to Port"},/obj/structure/sign/atmosplaque{pixel_x = -32},/turf/simulated/floor,/area/engineering/atmos) "aAB" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1313; icon_state = "on"; id_tag = "tox_in"; on = 1},/turf/simulated/floor/engine/n20,/area/engineering/atmos) -"aAC" = (/obj/machinery/atmospherics/miner/plasma,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/engine/n20,/area/engineering/atmos) +"aAC" = (/obj/machinery/atmospherics/miner/toxins,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/engine/n20,/area/engineering/atmos) "aAD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/wreck/engineering{icon_state = "bridge"; name = "\improper Bridge Engineering"}) "aAE" = (/obj/machinery/door/airlock/command{name = "Bridge"; req_access = null; req_access_txt = "19"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor,/turf/simulated/floor,/area/wreck/engineering{icon_state = "bridge"; name = "\improper Bridge Engineering"}) "aAF" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/crew_quarters/fitness) @@ -1477,7 +1477,7 @@ "aCu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/crew_quarters/hop) "aCv" = (/obj/machinery/door/airlock/command{name = "Head of Personnel"; req_access = null; req_access_txt = "57"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor,/turf/simulated/floor,/area/crew_quarters/hop) "aCw" = (/turf/simulated/floor,/area/crew_quarters/fitness) -"aCx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("plasma","nitrous_oxide")},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/fitness) +"aCx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/fitness) "aCy" = (/turf/simulated/wall,/area/crew_quarters/fitness) "aCz" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/plating,/area/crew_quarters/fitness) "aCA" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/plating,/area/crew_quarters/fitness) @@ -1760,7 +1760,7 @@ "aHR" = (/obj/structure/toilet{desc = "The HT-451, a torque rotation-based, waste disposal unit for small matter. This one is a gruesome sight indeed."; dir = 1},/turf/simulated/floor{icon_state = "damaged2"},/area/crew_quarters/heads) "aHS" = (/obj/structure/toilet{desc = "The HT-451, a torque rotation-based, waste disposal unit for small matter. This one is a gruesome sight indeed."; dir = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/heads) "aHT" = (/obj/structure/closet/jcloset,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{icon_state = "floorgrime"},/area/janitor) -"aHU" = (/obj/effect/landmark/start{name = "Janitor"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("plasma","nitrous_oxide")},/obj/structure/stool/bed/chair/vehicle/janicart,/turf/simulated/floor{icon_state = "floorgrime"},/area/janitor) +"aHU" = (/obj/effect/landmark/start{name = "Janitor"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/obj/structure/stool/bed/chair/vehicle/janicart,/turf/simulated/floor{icon_state = "floorgrime"},/area/janitor) "aHV" = (/obj/machinery/power/apc{dir = 4; pixel_x = 24; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/closet/l3closet/janitor,/turf/simulated/floor{icon_state = "floorgrime"},/area/janitor) "aHW" = (/obj/machinery/door/airlock/engineering{name = "Aft Port Solars"; req_access_txt = "32"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/solar/aport{name = "\improper Cargo Solar Array"}) "aHX" = (/turf/simulated/wall,/area/solar/aport{name = "\improper Cargo Solar Array"}) @@ -1771,7 +1771,7 @@ "aIc" = (/obj/machinery/power/apc{dir = 2; pixel_x = 0; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor,/area/crew_quarters/fitness) "aId" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor,/area/crew_quarters/fitness) "aIe" = (/obj/structure/closet/boxinggloves,/turf/simulated/floor,/area/crew_quarters/fitness) -"aIf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("plasma","nitrous_oxide")},/turf/simulated/floor,/area/crew_quarters/fitness) +"aIf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/crew_quarters/fitness) "aIg" = (/obj/structure/closet/crate,/obj/machinery/camera{c_tag = "Fitness South"; dir = 1},/turf/simulated/floor,/area/crew_quarters/fitness) "aIh" = (/obj/structure/closet/athletic_mixed,/turf/simulated/floor,/area/crew_quarters/fitness) "aIi" = (/obj/structure/table,/obj/item/stack/medical/ointment{pixel_y = 4},/obj/item/stack/medical/bruise_pack{pixel_x = 10; pixel_y = 2},/obj/item/stack/medical/bruise_pack,/turf/simulated/floor,/area/crew_quarters/fitness) @@ -1780,7 +1780,7 @@ "aIl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) "aIm" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/light,/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) "aIn" = (/obj/structure/closet/crate,/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) -"aIo" = (/obj/structure/stool/bed/chair/comfy/black{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("plasma","nitrous_oxide")},/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) +"aIo" = (/obj/structure/stool/bed/chair/comfy/black{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) "aIp" = (/obj/structure/table,/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) "aIq" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) "aIr" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) @@ -1788,7 +1788,7 @@ "aIt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) "aIu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) "aIv" = (/obj/structure/stool/bed/chair/comfy/black{dir = 4},/obj/machinery/camera{c_tag = "Central Civillan Hallway"; dir = 1},/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) -"aIw" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("plasma","nitrous_oxide")},/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) +"aIw" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) "aIx" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) "aIy" = (/turf/simulated/floor{icon_state = "dark"},/area/engineering/mechanics) "aIz" = (/obj/structure/closet/crate,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/hallway/primary/aft{name = "\improper Central Civillian Hallway"}) @@ -3068,7 +3068,7 @@ "bgZ" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/science/mixing) "bha" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/science/mixing) "bhb" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/science/mixing) -"bhc" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor{icon_state = "white"},/area/science/mixing) +"bhc" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor{icon_state = "white"},/area/science/mixing) "bhd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light{dir = 8},/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = -32; pixel_y = 0; req_access_txt = "0"},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) "bhe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology) "bhf" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon_state = "right"; name = "Containment Pen"; req_access_txt = "55"},/obj/effect/decal/warning_stripes{icon_state = "2"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/science/xenobiology) @@ -3504,7 +3504,7 @@ "bpt" = (/obj/structure/rack,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/head/hairflower,/turf/simulated/floor/holofloor{icon_state = "cult"},/area/holodeck/source_theatre) "bpu" = (/obj/structure/rack,/obj/map/spawner/set_spawner/theater,/turf/simulated/floor/holofloor{icon_state = "cult"},/area/holodeck/source_theatre) "bpv" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Holodeck Projector Floor"},/area/holodeck/source_plating) -"bpw" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; starting_gases = list("oxygen" = 2500, "plamsa" = 5000); temperature = 370},/area/holodeck/source_burntest) +"bpw" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; nitrogen = 0; oxygen = 2500; temperature = 370; toxins = 5000},/area/holodeck/source_burntest) "bpx" = (/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_emptycourt) "bpy" = (/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_emptycourt) "bpz" = (/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_emptycourt) @@ -3517,7 +3517,7 @@ "bpG" = (/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/holofloor/grass,/area/holodeck/source_picnicarea) "bpH" = (/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/holofloor/grass,/area/holodeck/source_picnicarea) "bpI" = (/turf/simulated/floor/holofloor{icon_state = "cult"},/area/holodeck/source_theatre) -"bpJ" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; starting_gases = list("oxygen" = 2500, "plamsa" = 5000); temperature = 370},/area/holodeck/source_burntest) +"bpJ" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; nitrogen = 0; oxygen = 2500; temperature = 370; toxins = 5000},/area/holodeck/source_burntest) "bpK" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "red"},/area/holodeck/source_emptycourt) "bpL" = (/turf/simulated/floor/holofloor,/area/holodeck/source_emptycourt) "bpM" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "red"},/area/holodeck/source_emptycourt) @@ -5497,9 +5497,9 @@ "cbK" = (/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/derelict/crew_quarters) "cbL" = (/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/derelict/storage/engine_storage{icon_state = "smaint"; name = "Derelict Starboard Maintenance"}) "cbM" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/derelict/storage/engine_storage{icon_state = "smaint"; name = "Derelict Starboard Maintenance"}) -"cbN" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) -"cbO" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) -"cbP" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"cbN" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"cbO" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"cbP" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "cbQ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "cbR" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 10},/obj/effect/decal/warning_stripes{icon_state = "old"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "cbS" = (/obj/structure/table,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) @@ -5528,8 +5528,8 @@ "ccp" = (/turf/simulated/wall/r_wall,/area/derelict/atmos) "ccq" = (/obj/structure/sign/nosmoking_1,/turf/simulated/wall/r_wall,/area/derelict/atmos) "ccr" = (/obj/machinery/door/airlock/external{name = "Toxins Tank Access"},/turf/simulated/floor/plating/airless,/area/derelict/atmos) -"ccs" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) -"cct" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"ccs" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"cct" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "ccu" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "ccv" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{icon_state = "old"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "ccw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) @@ -5561,7 +5561,7 @@ "ccW" = (/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "ccX" = (/obj/machinery/air_sensor{frequency = 1438; id_tag = "tox_sensor"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "ccY" = (/turf/simulated/wall/r_wall,/area/derelict/research) -"ccZ" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"ccZ" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "cda" = (/obj/machinery/r_n_d/fabricator/circuit_imprinter,/obj/effect/decal/warning_stripes{icon_state = "old"; dir = 9},/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/turf/simulated/floor/airless,/area/derelict/research) "cdb" = (/obj/effect/decal/warning_stripes{icon_state = "old"; dir = 1},/turf/simulated/floor/airless,/area/derelict/research) "cdc" = (/obj/machinery/computer/rdconsole/core,/obj/effect/decal/warning_stripes{icon_state = "old"; dir = 5},/turf/simulated/floor/airless,/area/derelict/research) @@ -5579,7 +5579,7 @@ "cdo" = (/turf/simulated/floor/plating{icon_state = "platingdmg2"},/area/derelict/storage/engine_storage{icon_state = "smaint"; name = "Derelict Starboard Maintenance"}) "cdp" = (/obj/item/weapon/shard,/turf/simulated/floor/plating,/area/derelict/storage/engine_storage{icon_state = "smaint"; name = "Derelict Starboard Maintenance"}) "cdq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/derelict/storage/engine_storage{icon_state = "smaint"; name = "Derelict Starboard Maintenance"}) -"cdr" = (/obj/machinery/atmospherics/miner/plasma,/turf/simulated/floor/engine/vacuum{icon_state = "enginedelivery"},/area/derelict/atmos) +"cdr" = (/obj/machinery/atmospherics/miner/toxins,/turf/simulated/floor/engine/vacuum{icon_state = "enginedelivery"},/area/derelict/atmos) "cds" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "cdt" = (/obj/machinery/r_n_d/destructive_analyzer,/obj/effect/decal/warning_stripes{icon_state = "old"; dir = 10},/turf/simulated/floor/airless,/area/derelict/research) "cdu" = (/obj/effect/decal/warning_stripes{icon_state = "old"},/turf/simulated/floor/airless,/area/derelict/research) @@ -5601,7 +5601,7 @@ "cdK" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; external_pressure_bound = 120; frequency = 1438; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum{icon_state = "enginebot"},/area/derelict/atmos) "cdL" = (/obj/effect/decal/warning_stripes{icon_state = "plasma"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "cdM" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1438; icon_state = "on"; id_tag = "tox_in"; on = 1},/turf/simulated/floor/engine/vacuum{icon_state = "enginebot"},/area/derelict/atmos) -"cdN" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"cdN" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "cdO" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "cdP" = (/obj/machinery/atmospherics/pipe/manifold/insulated/hidden/blue{dir = 4},/obj/item/weapon/paper/derelict_invoice,/obj/machinery/meter,/obj/effect/decal/warning_stripes{icon_state = "old"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "cdQ" = (/obj/structure/girder/reinforced,/turf/simulated/floor/plating/airless,/area/derelict/research) @@ -6403,8 +6403,8 @@ "ctg" = (/obj/machinery/atmospherics/binary/pump{dir = 8; icon_state = "intact_on"; on = 1},/obj/machinery/alarm/vox{pixel_y = 24},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "cth" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating/vox,/area/vox_trading_post/atmos) "cti" = (/obj/structure/window/full/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating/vox,/area/vox_trading_post/atmos) -"ctj" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "vox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/machinery/air_sensor{frequency = 1441; id_tag = "vox_sensor"; output = 63},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/vox_trading_post/atmos) -"ctk" = (/obj/machinery/atmospherics/miner/nitrogen,/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/vox_trading_post/atmos) +"ctj" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "vox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/machinery/air_sensor{frequency = 1441; id_tag = "vox_sensor"; output = 63},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/vox_trading_post/atmos) +"ctk" = (/obj/machinery/atmospherics/miner/nitrogen,/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/vox_trading_post/atmos) "ctl" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/stool/bed/roller,/turf/simulated/floor/plating/vox,/area/vox_trading_post/storage_1) "ctm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating/vox,/area/vox_trading_post/storage_1) "ctn" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/vox,/area/vox_trading_post/storage_1) @@ -6412,8 +6412,8 @@ "ctp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "ctq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "ctr" = (/obj/structure/window/full/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating/vox,/area/vox_trading_post/atmos) -"cts" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "vox_in"; on = 1},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/vox_trading_post/atmos) -"ctt" = (/obj/effect/decal/warning_stripes{icon_state = "nitrogen"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/vox_trading_post/atmos) +"cts" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "vox_in"; on = 1},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/vox_trading_post/atmos) +"ctt" = (/obj/effect/decal/warning_stripes{icon_state = "nitrogen"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/vox_trading_post/atmos) "ctu" = (/obj/structure/lattice,/turf/space,/area/mine/unexplored) "ctv" = (/obj/machinery/light/small{dir = 8},/obj/structure/stool/bed/roller,/turf/simulated/floor/plating/vox,/area/vox_trading_post/storage_1) "ctw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101; on = 1},/turf/simulated/floor/plating/vox,/area/vox_trading_post/storage_1) @@ -6708,7 +6708,7 @@ "cyZ" = (/obj/machinery/power/terminal{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) "cza" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/port_gen/pacman{anchored = 1},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) "czb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) -"czc" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) +"czc" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) "czd" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/research_outpost/iso1) "cze" = (/obj/machinery/artifact_scanpad,/turf/simulated/floor/bluegrid,/area/research_outpost/iso1) "czf" = (/obj/machinery/artifact_analyser,/turf/simulated/floor/bluegrid,/area/research_outpost/iso1) @@ -6731,7 +6731,7 @@ "czw" = (/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) "czx" = (/obj/structure/cable,/obj/machinery/power/port_gen/pacman{anchored = 1},/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) "czy" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) -"czz" = (/obj/machinery/atmospherics/miner/oxygen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) +"czz" = (/obj/machinery/atmospherics/miner/oxygen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) "czA" = (/obj/structure/sign/examroom{desc = "A guidance sign which reads 'ISOLATION ROOM TWO'"; name = "\improper ISOLATION ROOM TWO"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway{icon_state = "hallA"; name = "Xenoarchaeology Hallway"}) "czB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway{icon_state = "hallA"; name = "Xenoarchaeology Hallway"}) "czC" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/research_outpost/hallway{icon_state = "hallA"; name = "Xenoarchaeology Hallway"}) @@ -6746,7 +6746,7 @@ "czL" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/meter,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) "czM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) "czN" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) -"czO" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "mining_air_out"; internal_pressure_bound = 300; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) +"czO" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "mining_air_out"; internal_pressure_bound = 300; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"}) "czP" = (/turf/simulated/wall/r_wall,/area/research_outpost/iso2) "czQ" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso2) "czR" = (/obj/structure/stool/bed,/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso2) diff --git a/maps/tgstation.dmm b/maps/tgstation.dmm index 0928c20d87c..73553573490 100644 --- a/maps/tgstation.dmm +++ b/maps/tgstation.dmm @@ -231,8 +231,8 @@ "aew" = (/obj/machinery/alarm{pixel_y = 22},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/security/toilet) "aex" = (/obj/structure/mirror{pixel_y = 32},/obj/structure/sink{pixel_y = 22},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/security/toilet) "aey" = (/obj/structure/mirror{pixel_y = 32},/obj/structure/sink{pixel_y = 22},/obj/machinery/power/apc{dir = 4; pixel_x = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "cafeteria"; dir = 5},/area/security/toilet) -"aez" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor{dir = 1; base_state = "left"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/security/prison) -"aeA" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/brigdoor{dir = 1; base_state = "right"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/security/prison) +"aez" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor{dir = 1; base_state = "left"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/security/prison) +"aeA" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/brigdoor{dir = 1; base_state = "right"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/security/prison) "aeB" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/security/prison) "aeC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/security/prison) "aeD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/security{name = "Security"; req_access = null; req_access_txt = "1"},/turf/simulated/floor/plating,/area/security/prison) @@ -269,7 +269,7 @@ "afi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor{dir = 2; name = "Secure Armory"; req_access_txt = "3"},/turf/simulated/floor{icon_state = "dark"},/area/security/armory) "afj" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/mask/breath,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/security,/obj/item/clothing/head/helmet/space/rig/security,/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/security/armory) "afk" = (/obj/item/clothing/ears/earmuffs{pixel_x = -3; pixel_y = -2},/obj/item/clothing/ears/earmuffs,/obj/structure/table/reinforced,/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/range) -"afl" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{icon_state = "red"; dir = 5},/area/security/range) +"afl" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "red"; dir = 5},/area/security/range) "afm" = (/turf/simulated/floor{icon_state = "red"},/area/security/range) "afn" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "red"; dir = 9},/area/security/range) "afo" = (/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/range) @@ -303,7 +303,7 @@ "afQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/prison) "afR" = (/obj/machinery/door/firedoor,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Prison Gate"; name = "Security Blast Door"; opacity = 0},/obj/machinery/door/airlock/glass_security{name = "Solitary Confinement"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison) "afS" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/security/prison) -"afT" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/deployable/barrier,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/security/armory) +"afT" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/deployable/barrier,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/security/armory) "afU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/deployable/barrier,/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/security/armory) "afV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "dark"},/area/security/armory) "afW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/deployable/barrier,/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/security/armory) @@ -372,7 +372,7 @@ "ahh" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/security/hos) "ahi" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/red,/obj/item/weapon/folder/red,/obj/item/weapon/cartridge/detective,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "dark"},/area/security/hos) "ahj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/security/hos) -"ahk" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide{filled = 0.2},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHWEST)"; icon_state = "warning"; dir = 10},/turf/simulated/floor/plating,/area/security/prison) +"ahk" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent{filled = 0.2},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHWEST)"; icon_state = "warning"; dir = 10},/turf/simulated/floor/plating,/area/security/prison) "ahl" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor/plating,/area/security/prison) "ahm" = (/obj/machinery/computer/area_atmos/area,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/prison) "ahn" = (/obj/structure/filingcabinet/filingcabinet,/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/security/interrogation) @@ -581,7 +581,7 @@ "ali" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor,/area/security/interrogation) "alj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 100; on = 1},/obj/machinery/light,/turf/simulated/floor,/area/security/interrogation) "alk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor,/area/security/interrogation) -"all" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor,/area/security/interrogation) +"all" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor,/area/security/interrogation) "alm" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/light{dir = 8},/obj/machinery/computer/security/advanced,/turf/simulated/floor{icon_state = "dark"},/area/security/warden) "aln" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "dark"},/area/security/warden) "alo" = (/obj/machinery/computer/prisoner,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "dark"},/area/security/warden) @@ -708,7 +708,7 @@ "anF" = (/obj/machinery/sleeper,/turf/simulated/floor{icon_state = "white"},/area/security/medical) "anG" = (/obj/machinery/sleep_console,/turf/simulated/floor{icon_state = "white"},/area/security/medical) "anH" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/disposal,/turf/simulated/floor{icon_state = "whitehall"; dir = 8},/area/security/medical) -"anI" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) +"anI" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) "anJ" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) "anK" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor,/area/security/brig) "anL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/brig) @@ -758,7 +758,7 @@ "aoD" = (/turf/simulated/wall,/area/security/brig) "aoE" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{id_tag = "BrigFoyer"; name = "Brig"; req_access_txt = "63"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/security/lobby) "aoF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/obj/structure/cable,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/lobby) -"aoG" = (/obj/machinery/door/window/brigdoor{dir = 1; req_access_txt = "63"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{icon_state = "red"; dir = 9},/area/security/lobby) +"aoG" = (/obj/machinery/door/window/brigdoor{dir = 1; req_access_txt = "63"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "red"; dir = 9},/area/security/lobby) "aoH" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/lobby) "aoI" = (/obj/machinery/door/window/brigdoor{dir = 1; base_state = "right"; req_access_txt = "63"},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "red"; dir = 5},/area/security/lobby) "aoJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/cable,/obj/structure/window/full/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/security/lobby) @@ -892,7 +892,7 @@ "arh" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/security/lobby) "ari" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/security/lobby) "arj" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/security/lobby) -"ark" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor,/area/security/lobby) +"ark" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/security/lobby) "arl" = (/obj/item/device/radio/intercom{frequency = 1475; name = "Station Intercom (Security)"; pixel_x = 30; pixel_y = 4},/obj/machinery/power/apc{dir = 4; pixel_x = 27; pixel_z = -7},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/camera{c_tag = "Security Lobby"; dir = 8; pixel_y = -22},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/security/lobby) "arm" = (/obj/machinery/door_timer/cell_3{dir = 8; pixel_x = -32; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 8},/turf/simulated/floor,/area/security/brig) "arn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/security/brig) @@ -1568,7 +1568,7 @@ "aEh" = (/obj/structure/table,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aEi" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aEj" = (/obj/item/device/radio/intercom{desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_x = -28; wires = 2},/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/auxcharge) -"aEk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/maintenance/auxcharge) +"aEk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{nitrogen = 0.01; oxygen = 0.01},/area/maintenance/auxcharge) "aEl" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/light_switch{pixel_x = 27},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/auxcharge) "aEm" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "aEn" = (/obj/structure/flora/pottedplant/random,/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/hallway/secondary/entry) @@ -2434,7 +2434,7 @@ "aUP" = (/turf/simulated/floor/carpet,/area/hallway/secondary/entry) "aUQ" = (/obj/structure/stool/bed/chair/comfy/beige{dir = 8},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 32},/turf/simulated/floor{icon_state = "grimy"},/area/hallway/secondary/entry) "aUR" = (/obj/machinery/vending/coffee,/turf/simulated/floor{icon_state = "dark"},/area/hallway/secondary/entry) -"aUS" = (/turf/simulated/floor{desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; dir = 4; icon_state = "plaque"; name = "Comemmorative Plaque"},/area/hallway/secondary/entry) +"aUS" = (/turf/simulated/floor{desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; dir = 4; icon_state = "plaque"; name = "Comemmorative Plaque"; nitrogen = 30; oxygen = 70; temperature = 80},/area/hallway/secondary/entry) "aUT" = (/obj/machinery/door/firedoor/border_only{name = "Firelock East"},/turf/simulated/floor,/area/hallway/secondary/entry) "aUU" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=CHW"; location = "Lockers"},/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/turf/simulated/floor,/area/hallway/primary/port) "aUV" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/hallway/primary/port) @@ -2495,7 +2495,7 @@ "aVY" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/hallway/secondary/exit) "aVZ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/hallway/secondary/exit) "aWa" = (/turf/simulated/floor,/area/hallway/secondary/exit) -"aWb" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor,/area/hallway/secondary/exit) +"aWb" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/hallway/secondary/exit) "aWc" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/hallway/secondary/exit) "aWd" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/secondary/exit) "aWe" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/secondary/exit) @@ -3716,7 +3716,7 @@ "btx" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 5},/turf/simulated/floor{icon_state = "white"},/area/medical/paramedics) "bty" = (/obj/machinery/camera{c_tag = "Paramedic's Office"; dir = 8; pixel_y = -22},/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 4},/obj/machinery/vending/wallmed1{pixel_x = 30; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/paramedics) "btz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/optable,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) -"btA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) +"btA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "btB" = (/obj/structure/morgue{dir = 8},/obj/machinery/camera{c_tag = "Morgue East"; dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "btC" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/box/lights/mixed,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/plating,/area/storage/emergency) "btD" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/storage/emergency) @@ -3833,9 +3833,9 @@ "bvK" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/science/lab) "bvL" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/hallway/secondary/entry) "bvM" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/entry) -"bvN" = (/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/maintenance/disposal) -"bvO" = (/obj/machinery/conveyor{dir = 4; id_tag = "garbage"},/obj/structure/plasticflaps/mining,/obj/machinery/door/poddoor{id_tag = "Disposal Exit"; name = "Disposal Exit Vent"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/maintenance/disposal) -"bvP" = (/obj/machinery/conveyor{dir = 5; id_tag = "garbage"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/maintenance/disposal) +"bvN" = (/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/maintenance/disposal) +"bvO" = (/obj/machinery/conveyor{dir = 5; id_tag = "garbage"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/maintenance/disposal) +"bvP" = (/obj/machinery/conveyor{dir = 4; id_tag = "garbage"},/obj/structure/plasticflaps/mining,/obj/machinery/door/poddoor{id_tag = "Disposal Exit"; name = "Disposal Exit Vent"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/maintenance/disposal) "bvQ" = (/obj/machinery/conveyor{dir = 10; id_tag = "garbage"; in_reverse = 1; movedir = 8},/turf/simulated/floor/plating,/area/maintenance/disposal) "bvR" = (/obj/machinery/driver_button{id_tag = "trash"; pixel_x = -26; pixel_y = -6},/obj/machinery/door_control{id_tag = "Disposal Exit"; name = "Disposal Vent Control"; pixel_x = -25; pixel_y = 4; req_access_txt = "12"},/obj/structure/closet/emcloset,/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/turf/simulated/floor,/area/maintenance/disposal) "bvS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/maintenance/disposal) @@ -3921,8 +3921,8 @@ "bxu" = (/obj/structure/table,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 29},/obj/item/weapon/storage/bag/gadgets,/obj/item/weapon/storage/bag/gadgets,/obj/item/weapon/storage/bag/gadgets,/obj/item/weapon/storage/box/labels,/obj/item/weapon/hand_labeler,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "white"},/area/science/lab) "bxv" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bxw" = (/obj/machinery/light,/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/hallway/secondary/entry) -"bxx" = (/obj/structure/plasticflaps/mining,/obj/machinery/conveyor{dir = 8; id_tag = "garbage"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Disposal Exit"; name = "Disposal Exit Vent"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/maintenance/disposal) -"bxy" = (/obj/machinery/conveyor{dir = 6; id_tag = "garbage"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/maintenance/disposal) +"bxx" = (/obj/machinery/conveyor{dir = 6; id_tag = "garbage"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/maintenance/disposal) +"bxy" = (/obj/structure/plasticflaps/mining,/obj/machinery/conveyor{dir = 8; id_tag = "garbage"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Disposal Exit"; name = "Disposal Exit Vent"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/maintenance/disposal) "bxz" = (/obj/machinery/disposal/deliveryChute{dir = 8; name = "disposal inlet"},/obj/structure/disposalpipe/trunk{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/disposal) "bxA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/disposal) "bxB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/disposal) @@ -4013,7 +4013,7 @@ "bzi" = (/turf/space,/area/shuttle/salvage/arrivals) "bzj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "bzk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/entry) -"bzl" = (/obj/machinery/door/airlock/multi_tile/glass{autoclose = 0; frequency = 1441; id_tag = "Incinerator Vent"; locked = 1},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/maintenance/disposal) +"bzl" = (/obj/machinery/door/airlock/multi_tile/glass{autoclose = 0; frequency = 1441; id_tag = "Incinerator Vent"; locked = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/maintenance/disposal) "bzm" = (/obj/machinery/mass_driver{id_tag = "trash"},/turf/simulated/floor/plating/airless,/area/maintenance/disposal) "bzn" = (/obj/structure/disposaloutlet{dir = 8},/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plating/airless,/area/maintenance/disposal) "bzo" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/disposal) @@ -4794,9 +4794,9 @@ "bOj" = (/obj/structure/table,/obj/item/weapon/storage/box/disks{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/rxglasses,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bOk" = (/turf/simulated/wall/r_wall,/area/maintenance/asmaint) "bOl" = (/turf/simulated/wall,/area/maintenance/asmaint) -"bOm" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"bOn" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"bOo" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) +"bOm" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"bOn" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"bOo" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) "bOp" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = 32},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/plating,/area/science/server) "bOq" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 10},/turf/simulated/floor{icon_state = "dark"},/area/science/server) "bOr" = (/obj/machinery/camera{c_tag = "Server Room"; network = list("RD"); pixel_x = 22},/obj/machinery/camera{c_tag = "Research Division Server Room"},/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "dark"},/area/science/server) @@ -4863,9 +4863,9 @@ "bPA" = (/obj/structure/stool,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bPB" = (/obj/structure/table,/obj/item/device/t_scanner{pixel_y = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bPC" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bPD" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"bPE" = (/obj/machinery/alarm/server{dir = 4; pixel_x = -22},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"bPF" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) +"bPD" = (/obj/machinery/alarm/server{dir = 4; pixel_x = -22},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"bPE" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"bPF" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) "bPG" = (/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/glass_command{icon_state = "door_locked"; locked = 1; name = "Server Room"; req_access_txt = "30"},/turf/simulated/floor{blocks_air = 1; icon_state = "dark"},/area/science/server) "bPH" = (/obj/machinery/atmospherics/pipe/manifold/insulated/hidden/blue{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/science/server) "bPI" = (/obj/structure/stool/bed/chair/office/light,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/science/server) @@ -4943,8 +4943,8 @@ "bRc" = (/obj/machinery/light{dir = 1},/obj/structure/closet/secure_closet/CMO,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "bRd" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Chief Medical Officer's Desk"; departmentType = 5; name = "Chief Medical Officer RC"; pixel_y = 32},/obj/machinery/power/apc{dir = 4; pixel_x = 24},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/closet/emcloset,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "bRe" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bRf" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) -"bRg" = (/obj/machinery/r_n_d/server/core,/turf/simulated/floor/bluegrid{name = "Server Base"; starting_gases = list("nitrogen" = 500); temperature = 80},/area/science/server) +"bRf" = (/obj/machinery/r_n_d/server/core,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) +"bRg" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/science/server) "bRh" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/sign/securearea{desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; pixel_y = -32},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/plating,/area/science/server) "bRi" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 9},/turf/simulated/floor{icon_state = "dark"},/area/science/server) "bRj" = (/obj/machinery/computer/rdservercontrol,/turf/simulated/floor{icon_state = "dark"},/area/science/server) @@ -5103,8 +5103,8 @@ "bUg" = (/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/engine,/area/science/telescience) "bUh" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/light/small{dir = 8},/obj/structure/table,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/voice,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/science/storage) "bUi" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/science/storage) -"bUj" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{icon_state = "dark"},/area/science/storage) -"bUk" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{icon_state = "dark"},/area/science/storage) +"bUj" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{icon_state = "dark"},/area/science/storage) +"bUk" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{icon_state = "dark"},/area/science/storage) "bUl" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/science/hallway) "bUm" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "white"},/area/science/hallway) "bUn" = (/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor/plating,/area/science/mixing) @@ -5184,7 +5184,7 @@ "bVJ" = (/obj/machinery/sparker{id_tag = "Xenobio"; pixel_x = -25},/turf/simulated/floor/engine,/area/science/telescience) "bVK" = (/obj/machinery/atmospherics/unary/outlet_injector{icon_state = "on"; id_tag = "misc_injector"; name = "Acid-Proof Air Injector"; on = 1; unacidable = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine,/area/science/telescience) "bVL" = (/obj/machinery/telepad,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine,/area/science/telescience) -"bVM" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 0; scrubbing_gases = list("nitrous_oxide")},/turf/simulated/floor/engine,/area/science/telescience) +"bVM" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 0; scrub_CO2 = 0; scrub_Toxins = 0},/turf/simulated/floor/engine,/area/science/telescience) "bVN" = (/obj/item/weapon/cigbutt,/obj/structure/table,/obj/item/device/radio/electropack,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "floorgrime"},/area/science/storage) "bVO" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{icon_state = "dark"},/area/science/storage) "bVP" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{icon_state = "dark"},/area/science/storage) @@ -5465,7 +5465,7 @@ "cbe" = (/obj/machinery/power/apc{dir = 4; pixel_x = 24},/obj/structure/cable,/turf/simulated/floor{icon_state = "white"},/area/science/mixing) "cbf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/science/mixing) "cbg" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/science/mixing) -"cbh" = (/obj/structure/disposaloutlet,/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating{starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/science/mixing) +"cbh" = (/obj/structure/disposaloutlet,/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating{nitrogen = 0.01; oxygen = 0.01},/area/science/mixing) "cbi" = (/obj/machinery/door/window{dir = 2; base_state = "right"; name = "Toxins Launcher"; req_access_txt = "8"; req_one_access_txt = "0"},/obj/machinery/door/window{dir = 2; base_state = "right"; dir = 1; name = "Toxins Launcher"; req_access_txt = "8"},/turf/simulated/floor/plating,/area/science/mixing) "cbj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/science/mixing) "cbk" = (/obj/machinery/light{dir = 8},/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHWEST)"; icon_state = "warning"; dir = 10},/turf/simulated/floor/engine/vacuum,/area/science/test_area) @@ -5851,8 +5851,8 @@ "ciA" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/turf/simulated/floor/plating,/area/engineering/atmos) "ciB" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/space,/area) "ciC" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/structure/grille,/obj/machinery/meter,/turf/simulated/wall/r_wall,/area/engineering/atmos) -"ciD" = (/obj/machinery/camera{c_tag = "Atmospherics Waste Tank"},/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) -"ciE" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) +"ciD" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) +"ciE" = (/obj/machinery/camera{c_tag = "Atmospherics Waste Tank"},/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) "ciF" = (/obj/machinery/door/poddoor{id_tag = "mixing_vent"; name = "Mixing Tank Emergency Vent"},/turf/simulated/floor/plating/airless,/area/engineering/atmos) "ciG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "ciH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology_break) @@ -5916,8 +5916,8 @@ "cjN" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "waste_in"; name = "Gas Mix Tank Control"; output_tag = "waste_out"; sensors = list("waste_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/filtering/visible{dir = 4},/turf/simulated/floor{icon_state = "green"; dir = 4},/area/engineering/atmos) "cjO" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/atmospherics/pipe/manifold/filtering/visible{dir = 4},/turf/simulated/floor/plating,/area/engineering/atmos) "cjP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating/airless,/area/engineering/atmos) -"cjQ" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) -"cjR" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "waste_sensor"; output = 63},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) +"cjQ" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "waste_sensor"; output = 63},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) +"cjR" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) "cjS" = (/obj/structure/sign/vacuum{pixel_y = -32},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/asmaint) "cjT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor{dir = 8; icon_state = "whitegreen"},/area/medical/virology_break) "cjU" = (/obj/structure/table,/obj/item/weapon/wirecutters,/obj/item/weapon/kitchen/utensil/fork,/obj/item/weapon/wrench,/obj/item/stack/rods,/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor{blocks_air = 1; icon_state = "floorgrime"},/area/medical/surgery_ghetto) @@ -5980,7 +5980,7 @@ "ckZ" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/turf/simulated/floor,/area/engineering/atmos) "cla" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/obj/machinery/light,/turf/simulated/floor,/area/engineering/atmos) "clb" = (/obj/machinery/atmospherics/binary/valve/digital{_color = "yellow"; dir = 4; name = "Gas Mix Inlet Valve"},/turf/simulated/floor{icon_state = "green"; dir = 6},/area/engineering/atmos) -"clc" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "waste_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/atmos) +"clc" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "waste_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/atmos) "cld" = (/obj/machinery/door/airlock/external{req_access_txt = "13"; req_one_access_txt = "13"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "cle" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "whitegreen"},/area/medical/virology_break) "clf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology_break) @@ -6021,7 +6021,7 @@ "clO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "atmos"; name = "Atmos Blast Door"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/engineering/atmos_control) "clP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "atmos"; name = "Atmos Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/atmos_control) "clQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "atmos"; name = "Atmos Blast Door"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/engineering/atmos_control) -"clR" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/engineering/atmos) +"clR" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/engineering/atmos) "clS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/floor,/area/engineering/atmos) "clT" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/sign/nosmoking_2,/turf/simulated/floor/plating,/area/engineering/atmos) "clU" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/floor/plating,/area/engineering/atmos) @@ -6192,16 +6192,16 @@ "cpd" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cpe" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/maintenance/aft) "cpf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/aft) -"cpg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cph" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cpi" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cpj" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cpk" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cpl" = (/obj/machinery/atmospherics/pipe/manifold/insulated/visible/blue,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cpm" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cpn" = (/obj/structure/cable/yellow{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/camera{c_tag = "Telecomms Coldroom North"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cpo" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cpp" = (/obj/structure/cable/yellow{icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cpg" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cph" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cpi" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cpj" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cpk" = (/obj/machinery/atmospherics/pipe/manifold/insulated/visible/blue,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cpl" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cpm" = (/obj/structure/cable/yellow{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/camera{c_tag = "Telecomms Coldroom North"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cpn" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cpo" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cpp" = (/obj/structure/cable/yellow{icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "cpq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/engine,/area/tcomms/chamber) "cpr" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{dir = 8; icon_state = "escape"},/area/hallway/primary/aft) "cps" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{dir = 1},/obj/machinery/meter,/turf/simulated/wall/r_wall,/area/engineering/atmos_control) @@ -6237,14 +6237,14 @@ "cpW" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cpX" = (/obj/machinery/power/apc{dir = 4; pixel_x = 24},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cpY" = (/obj/structure/rack,/obj/item/weapon/circuitboard/airlock,/turf/simulated/floor/plating,/area/maintenance/aft) -"cpZ" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqa" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqb" = (/obj/machinery/telecomms/server/presets/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqd" = (/obj/machinery/telecomms/relay/preset/station,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqe" = (/obj/machinery/telecomms/server/presets/service,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqf" = (/obj/machinery/door/airlock/maintenance_hatch{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "tcomm_airlock_exterior"; locked = 1; name = "Telecoms Coldroom Exterior Airlock"; req_access_txt = ""; req_one_access_txt = "56,61"},/obj/machinery/access_button{command = "cycle_exterior"; master_tag = "tcomm_airlock_control"; name = "Telecomms Access Button"; pixel_y = -24; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqg" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cpZ" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqa" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqb" = (/obj/machinery/telecomms/server/presets/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqd" = (/obj/machinery/telecomms/relay/preset/station,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqe" = (/obj/machinery/telecomms/server/presets/service,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqf" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqg" = (/obj/machinery/door/airlock/maintenance_hatch{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "tcomm_airlock_exterior"; locked = 1; name = "Telecoms Coldroom Exterior Airlock"; req_access_txt = ""; req_one_access_txt = "56,61"},/obj/machinery/access_button{command = "cycle_exterior"; master_tag = "tcomm_airlock_control"; name = "Telecomms Access Button"; pixel_y = -24; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "cqh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/engine,/area/tcomms/chamber) "cqi" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/sortjunction{dir = 2; icon_state = "pipe-j2s"; sortType = 5},/turf/simulated/floor{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/aft) "cqj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/hallway/primary/aft) @@ -6273,11 +6273,11 @@ "cqG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/astarboardsolar) "cqH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera{c_tag = "Incinerator"; dir = 8},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cqI" = (/obj/structure/rack,/obj/item/clothing/suit/storage/hazardvest,/turf/simulated/floor/plating,/area/maintenance/aft) -"cqJ" = (/obj/machinery/telecomms/server/presets/command,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqK" = (/obj/machinery/telecomms/broadcaster/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqL" = (/obj/machinery/telecomms/broadcaster/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqM" = (/obj/machinery/telecomms/server/presets/medical,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cqN" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/airlock_sensor{id_tag = "tcomm_ext_airlock_sensor"; master_tag = "tcomm_airlock_control"; pixel_x = 32; pixel_y = -5},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cqJ" = (/obj/machinery/telecomms/server/presets/command,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqK" = (/obj/machinery/telecomms/broadcaster/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqL" = (/obj/machinery/telecomms/broadcaster/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqM" = (/obj/machinery/telecomms/server/presets/medical,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cqN" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/airlock_sensor{id_tag = "tcomm_ext_airlock_sensor"; master_tag = "tcomm_airlock_control"; pixel_x = 32; pixel_y = -5},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "cqO" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/aft) "cqP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor,/area/hallway/primary/aft) "cqQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor,/area/hallway/primary/aft) @@ -6289,8 +6289,8 @@ "cqW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "atmos"; name = "Atmos Blast Door"; opacity = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/engineering/atmos) "cqX" = (/obj/machinery/camera{c_tag = "Atmospherics West"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/floor,/area/engineering/atmos) "cqY" = (/obj/machinery/atmospherics/binary/valve/digital{_color = "yellow"; dir = 4; name = "Plasma Outlet Valve"},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor,/area/engineering/atmos) -"cqZ" = (/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) -"cra" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) +"cqZ" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"cra" = (/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) "crb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/virology_break) "crc" = (/obj/machinery/light,/turf/simulated/floor{dir = 8; icon_state = "whitegreen"},/area/medical/virology_break) "crd" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/light,/turf/simulated/floor{dir = 4; icon_state = "whitegreen"},/area/medical/virology_break) @@ -6316,16 +6316,16 @@ "crx" = (/obj/machinery/atmospherics/pipe/simple/insulated/visible,/turf/simulated/wall,/area/maintenance/incinerator) "cry" = (/obj/structure/barricade/wooden,/turf/simulated/floor/plating,/area/maintenance/incinerator) "crz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/incinerator) -"crA" = (/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"crB" = (/obj/machinery/light{dir = 8},/obj/machinery/alarm/server{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/camera{c_tag = "Telecomms Coldroom West"; dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"crC" = (/obj/machinery/telecomms/processor/preset_two,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"crD" = (/obj/machinery/telecomms/bus/preset_two,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"crE" = (/obj/machinery/telecomms/hub/preset,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"crF" = (/obj/machinery/air_sensor{id_tag = "tcomms_sensor"; output = 63},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"crG" = (/obj/machinery/telecomms/processor/preset_three,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"crH" = (/obj/machinery/telecomms/bus/preset_three,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"crI" = (/obj/machinery/telecomms/server/presets/science,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"crJ" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/camera{c_tag = "Telecomms Coldroom East"; dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"crA" = (/obj/machinery/light{dir = 8},/obj/machinery/alarm/server{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/camera{c_tag = "Telecomms Coldroom West"; dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"crB" = (/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"crC" = (/obj/machinery/telecomms/processor/preset_two,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"crD" = (/obj/machinery/telecomms/bus/preset_two,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"crE" = (/obj/machinery/telecomms/hub/preset,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"crF" = (/obj/machinery/air_sensor{id_tag = "tcomms_sensor"; output = 63},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"crG" = (/obj/machinery/telecomms/bus/preset_three,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"crH" = (/obj/machinery/telecomms/processor/preset_three,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"crI" = (/obj/machinery/telecomms/server/presets/science,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"crJ" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/obj/machinery/camera{c_tag = "Telecomms Coldroom East"; dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "crK" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor{dir = 4; icon_state = "yellowcorner"},/area/hallway/primary/aft) "crL" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "yellowcorner"},/area/hallway/primary/aft) "crM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor,/area/hallway/primary/aft) @@ -6340,8 +6340,8 @@ "crV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/engineering/atmos) "crW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor,/area/engineering/atmos) "crX" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "tox_in"; name = "Toxin Supply Control"; output_tag = "tox_out"; sensors = list("tox_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/obj/machinery/light{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/engineering/atmos) -"crY" = (/obj/machinery/atmospherics/miner/plasma,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) -"crZ" = (/obj/effect/decal/warning_stripes{icon_state = "plasma"},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) +"crY" = (/obj/effect/decal/warning_stripes{icon_state = "plasma"},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"crZ" = (/obj/machinery/atmospherics/miner/toxins,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) "csa" = (/turf/simulated/wall/r_wall,/area/maintenance/virology_maint) "csb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/virology_break) "csc" = (/obj/structure/sign/biohazard,/turf/simulated/wall/r_wall,/area/medical/virology_break) @@ -6366,14 +6366,14 @@ "csv" = (/obj/machinery/atmospherics/unary/tank/oxygen{starting_volume = 3200},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "csw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "csx" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) -"csy" = (/obj/machinery/telecomms/server/presets/engineering,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"csz" = (/obj/machinery/telecomms/processor/preset_one,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"csA" = (/obj/machinery/telecomms/bus/preset_one,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"csB" = (/obj/machinery/telecomms/receiver/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"csC" = (/obj/machinery/telecomms/receiver/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"csD" = (/obj/machinery/telecomms/processor/preset_four,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"csE" = (/obj/machinery/telecomms/bus/preset_four,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"csF" = (/obj/machinery/telecomms/server/presets/security,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"csy" = (/obj/machinery/telecomms/server/presets/engineering,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"csz" = (/obj/machinery/telecomms/processor/preset_one,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"csA" = (/obj/machinery/telecomms/bus/preset_one,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"csB" = (/obj/machinery/telecomms/receiver/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"csC" = (/obj/machinery/telecomms/receiver/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"csD" = (/obj/machinery/telecomms/bus/preset_four,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"csE" = (/obj/machinery/telecomms/processor/preset_four,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"csF" = (/obj/machinery/telecomms/server/presets/security,/turf/simulated/floor{icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "csG" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/hallway/primary/aft) "csH" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor,/area/hallway/primary/aft) "csI" = (/obj/structure/closet/emcloset,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/hallway/primary/aft) @@ -6387,12 +6387,12 @@ "csQ" = (/obj/structure/stool/bed/chair/comfy/black{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/simulated/floor,/area/engineering/break_room) "csR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "atmos"; name = "Atmos Blast Door"; opacity = 0},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/engineering/atmos) "csS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/engineering/atmos) -"csT" = (/obj/structure/reagent_dispensers/fueltank,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engineering/atmos) +"csT" = (/obj/structure/reagent_dispensers/fueltank,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engineering/atmos) "csU" = (/obj/structure/reagent_dispensers/watertank,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/engineering/atmos) "csV" = (/obj/machinery/floodlight{on = 0},/turf/simulated/floor,/area/engineering/atmos) "csW" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 0; icon_state = "intact_on"; name = "Gas filter (Plasma tank)"; on = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor,/area/engineering/atmos) -"csX" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "tox_sensor"},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) -"csY" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "tox_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "plasma floor"; starting_gases = list("plasma" = 70000)},/area/engineering/atmos) +"csX" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "tox_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) +"csY" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "tox_sensor"},/turf/simulated/floor/engine{name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/engineering/atmos) "csZ" = (/obj/machinery/door/airlock/external{req_access_txt = "13"; req_one_access_txt = "13"},/turf/simulated/floor/plating,/area/maintenance/virology_maint) "cta" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/wardrobe/virology_white,/turf/simulated/floor{icon_state = "white"},/area/medical/virology_break) "ctb" = (/obj/structure/closet/emcloset,/turf/simulated/floor{icon_state = "white"},/area/medical/virology_break) @@ -6426,9 +6426,9 @@ "ctD" = (/obj/machinery/atmospherics/binary/pump{dir = 1; icon_state = "intact_on"; name = "Gas Pump"; on = 1},/turf/simulated/floor/plating,/area/maintenance/incinerator) "ctE" = (/obj/machinery/atmospherics/binary/pump,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "ctF" = (/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) -"ctG" = (/obj/machinery/blackbox_recorder,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"ctH" = (/obj/machinery/telecomms/relay/preset/telecomms,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"ctI" = (/obj/machinery/message_server,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"ctG" = (/obj/machinery/blackbox_recorder,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"ctH" = (/obj/machinery/telecomms/relay/preset/telecomms,/turf/simulated/floor{dir = 1; icon_state = "dark-markings"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"ctI" = (/obj/machinery/message_server,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "ctJ" = (/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/hallway/primary/aft) "ctK" = (/turf/simulated/floor,/area/hallway/primary/aft) "ctL" = (/obj/structure/closet/emcloset,/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/hallway/primary/aft) @@ -6474,9 +6474,9 @@ "cuz" = (/obj/machinery/atmospherics/pipe/manifold/general/visible,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cuA" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cuB" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cuC" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cuD" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/light,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) -"cuE" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/tcomms/chamber) +"cuC" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cuD" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/machinery/light,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) +"cuE" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcomms/chamber) "cuF" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor,/area/hallway/primary/aft) "cuG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=AIE"; location = "AftH"},/turf/simulated/floor,/area/hallway/primary/aft) "cuH" = (/obj/machinery/camera{c_tag = "Aft Primary Hallway 1"; dir = 8; pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/hallway/primary/aft) @@ -6490,8 +6490,8 @@ "cuP" = (/obj/machinery/portable_atmospherics/pump,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engineering/atmos) "cuQ" = (/obj/machinery/portable_atmospherics/pump,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/engineering/atmos) "cuR" = (/obj/machinery/atmospherics/binary/valve/digital{_color = "yellow"; dir = 4; name = "CO2 Outlet Valve"},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/turf/simulated/floor{dir = 5; icon_state = "yellow"},/area/engineering/atmos) -"cuS" = (/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) -"cuT" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) +"cuS" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) +"cuT" = (/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) "cuU" = (/obj/machinery/vending/snack,/turf/simulated/floor{icon_state = "white"},/area/medical/virology_break) "cuV" = (/obj/machinery/washing_machine,/turf/simulated/floor{icon_state = "white"},/area/medical/virology_break) "cuW" = (/obj/machinery/access_button{command = "cycle_interior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; req_access_txt = "39"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology_break) @@ -6531,8 +6531,8 @@ "cvE" = (/obj/machinery/vending/cola,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/engineering/break_room) "cvF" = (/obj/machinery/space_heater,/turf/simulated/floor,/area/engineering/atmos) "cvG" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "co2_in"; name = "Carbon Dioxide Supply Control"; output_tag = "co2_out"; sensors = list("co2_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/engineering/atmos) -"cvH" = (/obj/machinery/atmospherics/miner/carbon_dioxide,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) -"cvI" = (/obj/effect/decal/warning_stripes{icon_state = "carbon_dioxide"},/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) +"cvH" = (/obj/effect/decal/warning_stripes{icon_state = "carbon_dioxide"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) +"cvI" = (/obj/machinery/atmospherics/miner/carbon_dioxide,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) "cvJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "virology_airlock_interior"; locked = 1; name = "Virology Interior Airlock"; req_access_txt = "39"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology_break) "cvK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/medical/virology_break) "cvL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/camera{c_tag = "Habitat Air Supply West"; dir = 4},/obj/machinery/light{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint3) @@ -6572,8 +6572,8 @@ "cwt" = (/obj/machinery/space_heater/air_conditioner,/turf/simulated/floor,/area/engineering/atmos) "cwu" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/obj/machinery/meter,/turf/simulated/floor,/area/engineering/atmos) "cwv" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 3; icon_state = "intact_on"; name = "Gas filter (CO2 tank)"; on = 1},/turf/simulated/floor{dir = 6; icon_state = "yellow"},/area/engineering/atmos) -"cww" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "co2_sensor"},/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) -"cwx" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "co2_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "co2 floor"; starting_gases = list("carbon_dioxide" = 50000)},/area/engineering/atmos) +"cww" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "co2_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) +"cwx" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "co2_sensor"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/engineering/atmos) "cwy" = (/obj/machinery/light_switch{pixel_x = -23},/turf/simulated/floor/plating,/area/maintenance/virology_maint) "cwz" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/maintenance/virology_maint) "cwA" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/virology_maint) @@ -6932,7 +6932,7 @@ "cDp" = (/turf/simulated/wall/r_wall,/area/science/xenobiology/specimen_6) "cDq" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/catwalk{icon_state = "catwalk3"},/turf/space,/area) "cDr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/wall/r_wall,/area/engineering/burn_chamber) -"cDs" = (/obj/machinery/airlock_sensor{id_tag = "inc_chamber_airlock_sensor"; master_tag = "inc_airlock_control"; pixel_x = -24},/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume{dir = 4; frequency = 1449; id_tag = "inc_airlock_pump"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) +"cDs" = (/obj/machinery/airlock_sensor{id_tag = "inc_chamber_airlock_sensor"; master_tag = "inc_airlock_control"; pixel_x = -24},/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume{dir = 4; frequency = 1449; id_tag = "inc_airlock_pump"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) "cDt" = (/obj/machinery/door/airlock/glass_research{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "inc_airlock_interior"; locked = 1; name = "Incinerator Interior Airlock"; req_access_txt = "0"; req_one_access_txt = "10;24"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/engine,/area/engineering/burn_chamber) "cDu" = (/obj/machinery/airlock_sensor{id_tag = "inc_int_airlock_sensor"; master_tag = "inc_airlock_control"; pixel_y = 24},/obj/effect/decal/warning_stripes{icon_state = "no"},/obj/effect/decal/warning_stripes{icon_state = "oxygen"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor,/area/engineering/burn_chamber) "cDv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/engineering/burn_chamber) @@ -6983,7 +6983,7 @@ "cEo" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "xenobio6"; name = "Containment Blast Doors"; opacity = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/disposalpipe/segment,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/science/xenobiology/specimen_6) "cEp" = (/obj/machinery/door/window{dir = 2; base_state = "right"; name = "Containment Pen"; req_access_txt = "47"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "xenobio6"; name = "Containment Blast Doors"; opacity = 0},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) "cEq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "xenobio6"; name = "Containment Blast Doors"; opacity = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/science/xenobiology/specimen_6) -"cEr" = (/obj/machinery/door/airlock/glass_research{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "inc_airlock_exterior"; locked = 1; name = "Incinerator Exterior Airlock"; req_access_txt = "0"; req_one_access_txt = "10;24"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) +"cEr" = (/obj/machinery/door/airlock/glass_research{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "inc_airlock_exterior"; locked = 1; name = "Incinerator Exterior Airlock"; req_access_txt = "0"; req_one_access_txt = "10;24"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) "cEs" = (/obj/machinery/embedded_controller/radio/advanced_airlock_controller{frequency = 1449; id_tag = "inc_airlock_control"; pixel_x = -24; tag_airpump = "inc_airlock_pump"; tag_chamber_sensor = "inc_chamber_airlock_sensor"; tag_exterior_door = "inc_airlock_exterior"; tag_exterior_sensor = "inc_ext_airlock_sensor"; tag_interior_door = "inc_airlock_interior"; tag_interior_sensor = "inc_int_airlock_sensor"},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor,/area/engineering/burn_chamber) "cEt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/engineering/burn_chamber) "cEu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/engineering/burn_chamber) @@ -7028,20 +7028,20 @@ "cFh" = (/obj/structure/closet/secure_closet/personal/patient,/obj/machinery/camera{c_tag = "Virology Isolation 2"; dir = 10},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "cFi" = (/obj/structure/disposalpipe/segment,/obj/structure/catwalk,/turf/space,/area) "cFj" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/engine,/area/science/xenobiology/specimen_4) -"cFk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_4) +"cFk" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_4) "cFl" = (/obj/machinery/alarm/xenobio{dir = 8; pixel_x = 24},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_4) "cFm" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/engine,/area/science/xenobiology/specimen_5) -"cFn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_5) +"cFn" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_5) "cFo" = (/obj/machinery/alarm/xenobio{dir = 8; pixel_x = 24},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_5) "cFp" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) -"cFq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) +"cFq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) "cFr" = (/obj/machinery/alarm/xenobio{dir = 8; pixel_x = 24},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) "cFs" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/catwalk{icon_state = "catwalk15"},/turf/space,/area/solar/astarboard) "cFt" = (/obj/structure/catwalk,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/catwalk{icon_state = "catwalk1"},/turf/space,/area/solar/aport) -"cFu" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) -"cFv" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) -"cFw" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) -"cFx" = (/obj/machinery/airlock_sensor{id_tag = "inc_ext_airlock_sensor"; master_tag = "inc_airlock_control"; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) +"cFu" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) +"cFv" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) +"cFw" = (/obj/machinery/airlock_sensor{id_tag = "inc_ext_airlock_sensor"; master_tag = "inc_airlock_control"; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) +"cFx" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) "cFy" = (/obj/structure/window/full/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 4},/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber) "cFz" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/atmospherics/unary/cap/hidden/general{tag = "icon-cap (WEST)"; icon_state = "cap"; dir = 8},/turf/simulated/floor{dir = 9; icon_state = "yellowfull"},/area/engineering/burn_chamber) "cFA" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/atmospherics/unary/portables_connector,/turf/simulated/floor{dir = 9; icon_state = "yellowfull"},/area/engineering/burn_chamber) @@ -7068,15 +7068,15 @@ "cFV" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor,/area/engineering/engine) "cFW" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/terminal{dir = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor,/area/engineering/engine) "cFX" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor,/area/engineering/engine) -"cFY" = (/obj/effect/decal/warning_stripes{icon_state = "nitrogen"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"cFZ" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id_tag = "n2_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"cGa" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"cGb" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"cGc" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id_tag = "o2_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"cGd" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"cGe" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; icon_state = "on"; id_tag = "air_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"cGf" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 50000, "oxygen" = 10000)},/area/engineering/atmos) -"cGg" = (/obj/effect/decal/warning_stripes{icon_state = "air"},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) +"cFY" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id_tag = "n2_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"cFZ" = (/obj/effect/decal/warning_stripes{icon_state = "nitrogen"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"cGa" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"cGb" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id_tag = "o2_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"cGc" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"cGd" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"cGe" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; icon_state = "on"; id_tag = "air_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"cGf" = (/obj/effect/decal/warning_stripes{icon_state = "air"},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"cGg" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 50000; oxygen = 10000},/area/engineering/atmos) "cGh" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/virology_maint) "cGi" = (/obj/structure/table,/obj/machinery/computer/med_data/laptop,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "cGj" = (/obj/machinery/computer/diseasesplicer,/turf/simulated/floor{icon_state = "whitegreen"},/area/medical/virology) @@ -7089,8 +7089,8 @@ "cGq" = (/turf/simulated/floor/engine,/area/science/xenobiology/specimen_5) "cGr" = (/obj/machinery/light/small{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) "cGs" = (/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) -"cGt" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) -"cGu" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; frequency = 1449; id_tag = "inc_in"},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) +"cGt" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 5},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) +"cGu" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; frequency = 1449; id_tag = "inc_in"},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) "cGv" = (/obj/structure/window/full/reinforced/plasma,/obj/machinery/atmospherics/pipe/simple/yellow/hidden{dir = 4},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber) "cGw" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/manifold/yellow/hidden,/obj/machinery/meter{name = "Fuel Meter"},/turf/simulated/floor{dir = 6; icon_state = "yellow"},/area/engineering/burn_chamber) "cGx" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/manifold/yellow/hidden,/turf/simulated/floor{dir = 6; icon_state = "yellow"},/area/engineering/burn_chamber) @@ -7113,15 +7113,15 @@ "cGO" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/engineering/engine) "cGP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/engineering/engine) "cGQ" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/engineering/engine) -"cGR" = (/obj/machinery/atmospherics/miner/nitrogen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small,/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"cGS" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"cGT" = (/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/engineering/atmos) -"cGU" = (/obj/machinery/atmospherics/miner/oxygen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small,/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"cGV" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"cGW" = (/turf/simulated/floor/engine{name = "o2 floor"; starting_gases = list("oxygen" = 100000)},/area/engineering/atmos) -"cGX" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"cGY" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) -"cGZ" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/engine{name = "air floor"; starting_gases = list("nitrogen" = 10580, "oxygen" = 2644)},/area/engineering/atmos) +"cGR" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"cGS" = (/obj/machinery/atmospherics/miner/nitrogen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small,/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"cGT" = (/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/engineering/atmos) +"cGU" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"cGV" = (/obj/machinery/atmospherics/miner/oxygen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small,/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"cGW" = (/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/engineering/atmos) +"cGX" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"cGY" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) +"cGZ" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/engineering/atmos) "cHa" = (/obj/machinery/atmospherics/unary/vent{dir = 1},/obj/structure/catwalk,/turf/space,/area/maintenance/virology_maint) "cHb" = (/obj/structure/sign/biohazard,/turf/simulated/wall/r_wall,/area/medical/virology) "cHc" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/virology) @@ -7137,7 +7137,7 @@ "cHm" = (/obj/effect/decal/warning_stripes{tag = "icon-loading_area (EAST)"; icon_state = "loading_area"; dir = 4},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) "cHn" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) "cHo" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/lattice,/obj/structure/lattice,/turf/space,/area) -"cHp" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/obj/machinery/air_sensor{frequency = 1449; id_tag = "inc_sensor"; output = 63},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) +"cHp" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/obj/machinery/air_sensor{frequency = 1449; id_tag = "inc_sensor"; output = 63},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) "cHq" = (/obj/structure/window/full/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber) "cHr" = (/obj/machinery/computer/general_air_control/atmos_automation/burnchamber,/turf/simulated/floor{icon_state = "dark"},/area/engineering/burn_chamber) "cHs" = (/obj/machinery/door_control{desc = "Lets all the hot gas out very quickly."; id_tag = "Burn Chamber Vent"; name = "Burn Chamber Vent"; pixel_x = -7; pixel_y = 32; req_access_txt = "0"},/obj/machinery/ignition_switch{id_tag = "Burn Chamber Igniter"; pixel_x = 6; pixel_y = 32},/turf/simulated/floor,/area/engineering/burn_chamber) @@ -7171,7 +7171,7 @@ "cHU" = (/obj/machinery/door/poddoor{desc = "By gods, release the hounds!"; id_tag = "xenobioout6"; name = "Containment Release"},/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) "cHV" = (/obj/machinery/door/poddoor{desc = "By gods, release the hounds!"; id_tag = "xenobioout6"; name = "Containment Release"},/obj/machinery/atmospherics/pipe/simple/filtering/hidden,/turf/simulated/floor/engine,/area/science/xenobiology/specimen_6) "cHW" = (/obj/structure/sign/biohazard,/turf/simulated/wall/r_wall,/area/science/xenobiology/specimen_6) -"cHX" = (/obj/machinery/igniter{id_tag = "Burn Chamber Igniter"},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) +"cHX" = (/obj/machinery/igniter{id_tag = "Burn Chamber Igniter"},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 8},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) "cHY" = (/obj/structure/window/full/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 4},/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber) "cHZ" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 4},/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1449; input_tag = "inc_in"; output_tag = "inc_out"; sensors = list("inc_sensor" = "Tank")},/turf/simulated/floor{icon_state = "dark"},/area/engineering/burn_chamber) "cIa" = (/obj/machinery/atmospherics/pipe/manifold/insulated/hidden{dir = 1},/obj/effect/decal/warning_stripes/pathmarkers/red,/obj/effect/decal/warning_stripes/pathmarkers/red{tag = "icon-pathmarker (WEST)"; icon_state = "pathmarker"; dir = 8},/obj/effect/decal/warning_stripes/pathmarkers/red{tag = "icon-pathmarker (EAST)"; icon_state = "pathmarker"; dir = 4},/turf/simulated/floor,/area/engineering/burn_chamber) @@ -7214,7 +7214,7 @@ "cIL" = (/obj/structure/cable,/obj/machinery/power/solar/panel/tracker,/obj/structure/catwalk{icon_state = "catwalk1"},/turf/space,/area/solar/astarboard) "cIM" = (/obj/machinery/atmospherics/unary/vent/high_volume{dir = 4},/obj/structure/catwalk,/turf/space,/area) "cIN" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/engineering/burn_chamber) -"cIO" = (/obj/machinery/atmospherics/pipe/manifold/insulated/hidden{dir = 1},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) +"cIO" = (/obj/machinery/atmospherics/pipe/manifold/insulated/hidden{dir = 1},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) "cIP" = (/obj/structure/window/full/reinforced/plasma,/obj/machinery/atmospherics/pipe/manifold/insulated/hidden{dir = 1},/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/obj/machinery/meter{name = "Vent Gas Meter"},/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber) "cIQ" = (/obj/machinery/atmospherics/binary/valve/digital{dir = 4; name = "Hot Loop Release Valve"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor/plating,/area/engineering/burn_chamber) "cIR" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 9},/obj/effect/decal/warning_stripes/pathmarkers/red{tag = "icon-pathmarker (WEST)"; icon_state = "pathmarker"; dir = 8},/obj/effect/decal/warning_stripes/pathmarkers/red{tag = "icon-pathmarker (NORTH)"; icon_state = "pathmarker"; dir = 1},/turf/simulated/floor,/area/engineering/burn_chamber) @@ -7254,7 +7254,7 @@ "cJz" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint3) "cJA" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 1; icon_state = "intact_on"; name = "Gas filter (Xeno cell 6)"; on = 1; req_access = null; req_access_txt = "55"},/turf/simulated/floor/plating,/area/maintenance/asmaint3) "cJB" = (/obj/machinery/atmospherics/pipe/simple/filtering/hidden{dir = 9},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/asmaint3) -"cJC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; frequency = 1449; id_tag = "inc_out"; name = "Burn Chamber Scrubber"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) +"cJC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; frequency = 1449; id_tag = "inc_out"; name = "Burn Chamber Scrubber"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) "cJD" = (/obj/structure/window/full/reinforced/plasma,/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 5},/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/engineering/burn_chamber) "cJE" = (/obj/machinery/atmospherics/binary/valve/digital{dir = 4; name = "Cold Loop Release Valve"},/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor/plating,/area/engineering/burn_chamber) "cJF" = (/obj/machinery/meter{name = "Cold Loop"},/obj/machinery/atmospherics/pipe/manifold/insulated/hidden/blue{dir = 4},/obj/effect/decal/warning_stripes/pathmarkers/blue{tag = "icon-pathmarker (WEST)"; icon_state = "pathmarker"; dir = 8},/obj/effect/decal/warning_stripes/pathmarkers/blue,/obj/effect/decal/warning_stripes/pathmarkers/blue{tag = "icon-pathmarker (NORTH)"; icon_state = "pathmarker"; dir = 1},/turf/simulated/floor,/area/engineering/burn_chamber) @@ -7280,7 +7280,7 @@ "cJZ" = (/obj/structure/table,/turf/simulated/floor/plating,/area/maintenance/asmaint3) "cKa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/wall,/area/maintenance/asmaint3) "cKb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/wall,/area/maintenance/asmaint3) -"cKc" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/poddoor{id_tag = "Burn Chamber Vent"; name = "Burn Chamber Vent"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/engineering/burn_chamber) +"cKc" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/poddoor{id_tag = "Burn Chamber Vent"; name = "Burn Chamber Vent"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/engineering/burn_chamber) "cKd" = (/obj/machinery/light{dir = 8},/turf/simulated/floor,/area/engineering/burn_chamber) "cKe" = (/obj/machinery/camera{c_tag = "Burn Chamber South"; dir = 1},/turf/simulated/floor,/area/engineering/burn_chamber) "cKf" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes/pathmarkers/blue,/obj/effect/decal/warning_stripes/pathmarkers/blue{tag = "icon-pathmarker (NORTH)"; icon_state = "pathmarker"; dir = 1},/turf/simulated/floor,/area/engineering/burn_chamber) @@ -7462,7 +7462,7 @@ "cNz" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/floor/plating,/area/engineering/engineering_auxiliary) "cNA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/engineering/engineering_auxiliary) "cNB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/engineering/antimatter_room) -"cNC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/engineering/antimatter_room) +"cNC" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/engineering/antimatter_room) "cND" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "dark vault stripe"},/area/engineering/antimatter_room) "cNE" = (/turf/simulated/floor{icon_state = "dark vault stripe"},/area/engineering/antimatter_room) "cNF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/engineering/antimatter_room) @@ -7497,7 +7497,7 @@ "cOi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/obj/effect/decal/warning_stripes{dir = 8; icon_state = "radiation-w"},/turf/simulated/floor/plating,/area/engineering/engineering_auxiliary) "cOj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_engineering{name = "Supermatter Room"; req_access_txt = "0"; req_one_access_txt = "10;24"},/turf/simulated/floor/plating,/area/engineering/supermatter_room) "cOk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/engineering/supermatter_room) -"cOl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor,/area/engineering/supermatter_room) +"cOl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/turf/simulated/floor,/area/engineering/supermatter_room) "cOm" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engineering/supermatter_room) "cOn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/turf/simulated/floor,/area/engineering/supermatter_room) "cOo" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/engineering/supermatter_room) @@ -7549,8 +7549,8 @@ "cPi" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "coolant_in"; name = "Coolant Control"; output_tag = "coolant_out"; sensors = list("sme_sensor" = "Engine")},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/engineering/supermatter_room) "cPj" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/turf/simulated/floor,/area/engineering/supermatter_room) "cPk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/engineering/supermatter_room) -"cPl" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("nitrous_oxide","oxygen","plasma")},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/engineering/supermatter_room) -"cPm" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("nitrous_oxide","oxygen","plasma")},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/effect/decal/warning_stripes/pathmarkers/yellow,/obj/effect/decal/warning_stripes/pathmarkers/yellow{tag = "icon-pathmarker (NORTH)"; icon_state = "pathmarker"; dir = 1},/turf/simulated/floor/engine/vacuum,/area/engineering/supermatter_room) +"cPl" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_CO2 = 0; scrub_O2 = 1; scrub_Toxins = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/engineering/supermatter_room) +"cPm" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_CO2 = 0; scrub_O2 = 1; scrub_Toxins = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/effect/decal/warning_stripes/pathmarkers/yellow,/obj/effect/decal/warning_stripes/pathmarkers/yellow{tag = "icon-pathmarker (NORTH)"; icon_state = "pathmarker"; dir = 1},/turf/simulated/floor/engine/vacuum,/area/engineering/supermatter_room) "cPn" = (/obj/machinery/computer/general_air_control/atmos_automation,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/engineering/supermatter_room) "cPo" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/engineering/supermatter_room) "cPp" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/filtering/hidden{dir = 5},/turf/simulated/floor/plating,/area/engineering/supermatter_room) @@ -7597,7 +7597,7 @@ "cQe" = (/obj/structure/rack,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/head/hairflower,/turf/simulated/floor/holofloor{icon_state = "cult"},/area/holodeck/source_theatre) "cQf" = (/obj/structure/rack,/obj/map/spawner/set_spawner/theater,/turf/simulated/floor/holofloor{icon_state = "cult"},/area/holodeck/source_theatre) "cQg" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Holodeck Projector Floor"},/area/holodeck/source_plating) -"cQh" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; starting_gases = list("oxygen" = 2500, "plasma" = 5); temperature = 370},/area/holodeck/source_burntest) +"cQh" = (/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; nitrogen = 0; oxygen = 2500; temperature = 370; toxins = 5},/area/holodeck/source_burntest) "cQi" = (/turf/simulated/floor/holofloor{dir = 9; icon_state = "red"},/area/holodeck/source_emptycourt) "cQj" = (/turf/simulated/floor/holofloor{dir = 1; icon_state = "red"},/area/holodeck/source_emptycourt) "cQk" = (/turf/simulated/floor/holofloor{dir = 5; icon_state = "red"},/area/holodeck/source_emptycourt) @@ -7609,7 +7609,7 @@ "cQq" = (/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/holofloor/grass,/area/holodeck/source_picnicarea) "cQr" = (/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/holofloor/grass,/area/holodeck/source_picnicarea) "cQs" = (/turf/simulated/floor/holofloor{icon_state = "cult"},/area/holodeck/source_theatre) -"cQt" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; starting_gases = list("oxygen" = 2500, "plasma" = 5); temperature = 370},/area/holodeck/source_burntest) +"cQt" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/holofloor{icon_state = "engine"; name = "Burn-Mix Floor"; nitrogen = 0; oxygen = 2500; temperature = 370; toxins = 5},/area/holodeck/source_burntest) "cQu" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "red"},/area/holodeck/source_emptycourt) "cQv" = (/turf/simulated/floor/holofloor,/area/holodeck/source_emptycourt) "cQw" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "red"},/area/holodeck/source_emptycourt) @@ -8772,7 +8772,7 @@ "dmJ" = (/obj/structure/stool/bed/chair{dir = 1},/obj/structure/disposalpipe/segment,/obj/effect/landmark{name = "tdomeadmin"},/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "dmK" = (/turf/unsimulated/beach/sand{density = 1},/area/beach) "dmL" = (/obj/machinery/computer/security/telescreen,/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) -"dmM" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/nitrous_oxide{pixel_x = 1},/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) +"dmM" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/sleeping_agent{pixel_x = 1},/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "dmN" = (/obj/item/weapon/wrench,/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "dmO" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/unsimulated/floor{icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "dmP" = (/turf/unsimulated/beach/sand,/area/beach) @@ -9179,42 +9179,42 @@ "duA" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/lattice,/turf/space,/area/turret_protected/tcomsat) "duB" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor{icon_state = "dark vault full"},/area/turret_protected/tcomsat) "duC" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/lattice,/turf/space,/area/turret_protected/tcomsat) -"duD" = (/obj/machinery/turret{lasers = 1; lasertype = 2},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duE" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duF" = (/obj/machinery/camera{c_tag = "Central Compartment North"; network = list("Tcomsat")},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duG" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duI" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 1; pixel_y = 24},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duJ" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duK" = (/obj/effect/decal/warning_stripes{tag = "icon-loading_area"; icon_state = "loading_area"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) +"duD" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duE" = (/obj/machinery/turret{lasers = 1; lasertype = 2},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duF" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 1; pixel_y = 24},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duG" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duI" = (/obj/machinery/camera{c_tag = "Central Compartment North"; network = list("Tcomsat")},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duJ" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duK" = (/obj/effect/decal/warning_stripes{tag = "icon-loading_area"; icon_state = "loading_area"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) "duL" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/turret_protected/tcomsat) "duM" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/lattice,/turf/space,/area/turret_protected/tcomsat) -"duN" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/air_sensor{id_tag = "satellite_coldroom"; output = 63},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duP" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duQ" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duR" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duS" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (WEST)"; icon_state = "warning_corner"; dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) +"duN" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duO" = (/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duP" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duQ" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/air_sensor{id_tag = "satellite_coldroom"; output = 63},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duS" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (WEST)"; icon_state = "warning_corner"; dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) "duT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/turret_protected/tcomsat) "duU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/turret_protected/tcomsat) "duV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/turret_protected/tcomsat) "duW" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor{icon_state = "dark vault full"},/area/turret_protected/tcomsat) "duX" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/lattice,/turf/space,/area/turret_protected/tcomsat) -"duY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/window/brigdoor{dir = 1; base_state = "left"; req_access = list(61)},/obj/effect/decal/warning_stripes{tag = "icon-loading_area"; icon_state = "loading_area"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"duZ" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dva" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/structure/table,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvb" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvc" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvd" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) +"duY" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"duZ" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/structure/table,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dva" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/window/brigdoor{dir = 1; base_state = "left"; req_access = list(61)},/obj/effect/decal/warning_stripes{tag = "icon-loading_area"; icon_state = "loading_area"; dir = 2},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvc" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvd" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) "dve" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/turret_protected/tcomsat) "dvf" = (/obj/structure/table,/turf/simulated/floor,/area/turret_protected/tcomsat) "dvg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1},/obj/machinery/camera{c_tag = "Telecoms Storage"; network = list("Tcomsat")},/turf/simulated/floor,/area/turret_protected/tcomsat) "dvh" = (/obj/machinery/camera{c_tag = "West Solars"; dir = 8; network = list("Tcomsat")},/turf/space,/area) "dvi" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = "0"},/turf/simulated/floor{icon_state = "dark vault full"},/area/turret_protected/tcomsat) "dvj" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/camera{c_tag = "West Wing Middle"; dir = 8; network = list("Tcomsat")},/turf/space,/area/turret_protected/tcomsat) -"dvk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvl" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvm" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) +"dvk" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvm" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) "dvn" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/lattice,/turf/space,/area/turret_protected/tcomsat) "dvo" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/turret_protected/tcomsat) "dvp" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/space,/area/turret_protected/tcomsat) @@ -9224,36 +9224,36 @@ "dvt" = (/turf/simulated/floor/plating,/area) "dvu" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "dark vault full"},/area/turret_protected/tcomsat) "dvv" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 8},/obj/machinery/light{dir = 4},/turf/space,/area/turret_protected/tcomsat) -"dvw" = (/obj/structure/sign/nosmoking_2{pixel_x = -32},/obj/machinery/light{dir = 8},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/displaycase/gooncode,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvy" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvz" = (/obj/structure/sign/nosmoking_2{pixel_x = 32},/obj/machinery/light{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) +"dvw" = (/obj/structure/sign/nosmoking_2{pixel_x = -32},/obj/machinery/light{dir = 8},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/displaycase/gooncode,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvy" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvz" = (/obj/structure/sign/nosmoking_2{pixel_x = 32},/obj/machinery/light{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) "dvA" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/lattice,/obj/machinery/light{dir = 8},/turf/space,/area/turret_protected/tcomsat) "dvB" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/turret_protected/tcomsat) "dvC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/turret_protected/tcomsat) "dvD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/door/airlock/maintenance_hatch{name = "Telecoms Storage"; req_access_txt = "61"},/turf/simulated/floor{icon_state = "dark vault full"},/area/turret_protected/tcomsat) -"dvE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvF" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/cell/hyper,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) +"dvE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvF" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/cell/hyper,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) "dvG" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/space,/area/turret_protected/tcomsat) "dvH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/turret_protected/tcomsat) "dvI" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor,/area/turret_protected/tcomsat) -"dvJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table,/obj/structure/window/reinforced,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvK" = (/obj/structure/table,/obj/structure/window/reinforced,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvL" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvM" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvN" = (/obj/structure/table,/obj/structure/window/reinforced,/obj/item/weapon/coin/silver,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) +"dvJ" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvK" = (/obj/structure/table,/obj/structure/window/reinforced,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table,/obj/structure/window/reinforced,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvM" = (/obj/structure/table,/obj/structure/window/reinforced,/obj/item/weapon/coin/silver,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvN" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) "dvO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/turret_protected/tcomsat) -"dvP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvQ" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvR" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 9},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvS" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 6},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvT" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (NORTH)"; icon_state = "warning_corner"; dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) +"dvP" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 6},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvQ" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 9},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvR" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvT" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (NORTH)"; icon_state = "warning_corner"; dir = 1},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) "dvU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/turret_protected/tcomsat) "dvV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/turret_protected/tcomsat) "dvW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/turret_protected/tcomsat) -"dvX" = (/obj/machinery/camera{c_tag = "Central Compartment South"; dir = 1; network = list("Tcomsat")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvY" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) -"dvZ" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 1; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/turret_protected/goonroom) +"dvX" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvY" = (/obj/machinery/camera{c_tag = "Central Compartment South"; dir = 1; network = list("Tcomsat")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) +"dvZ" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 1; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/turret_protected/goonroom) "dwa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall,/area/turret_protected/goonroom) "dwb" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = "0"},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "dark vault full"},/area/turret_protected/tcomsat) "dwc" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/space,/area/turret_protected/tcomsat) @@ -9469,9 +9469,9 @@ "dAe" = (/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/derelict/research) "dAf" = (/turf/simulated/floor/plating/airless,/area/derelict/research) "dAg" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/research) -"dAh" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) -"dAi" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) -"dAj" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"dAh" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"dAi" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"dAj" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dAk" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "dAl" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 10},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "dAm" = (/obj/structure/table,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) @@ -9479,19 +9479,19 @@ "dAo" = (/turf/simulated/wall/r_wall,/area/derelict/atmos) "dAp" = (/obj/structure/sign/nosmoking_1,/turf/simulated/wall/r_wall,/area/derelict/atmos) "dAq" = (/obj/machinery/door/airlock/external{name = "Toxins Tank Access"},/turf/simulated/floor/plating/airless,/area/derelict/atmos) -"dAr" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) -"dAs" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"dAr" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) +"dAs" = (/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dAt" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "dAu" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue,/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "dAv" = (/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dAw" = (/obj/machinery/air_sensor{frequency = 1438; id_tag = "tox_sensor"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dAx" = (/turf/simulated/wall/r_wall,/area/derelict/research) -"dAy" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"dAy" = (/obj/machinery/r_n_d/server/robotics,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dAz" = (/obj/machinery/r_n_d/fabricator/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHWEST)"; icon_state = "warning"; dir = 9},/turf/simulated/floor/airless,/area/derelict/research) "dAA" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/airless,/area/derelict/research) "dAB" = (/obj/machinery/computer/rdconsole/core,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor/airless,/area/derelict/research) "dAC" = (/obj/machinery/floodlight,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) -"dAD" = (/obj/machinery/atmospherics/miner/plasma,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) +"dAD" = (/obj/machinery/atmospherics/miner/toxins,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dAE" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dAF" = (/obj/machinery/r_n_d/destructive_analyzer,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHWEST)"; icon_state = "warning"; dir = 10},/turf/simulated/floor/airless,/area/derelict/research) "dAG" = (/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor/airless,/area/derelict/research) @@ -9500,7 +9500,7 @@ "dAJ" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; external_pressure_bound = 120; frequency = 1438; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dAK" = (/obj/effect/decal/warning_stripes{icon_state = "plasma"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) "dAL" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1438; icon_state = "on"; id_tag = "tox_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos) -"dAM" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; starting_gases = list("nitrogen" = 100); temperature = 80},/area/derelict/research) +"dAM" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research) "dAN" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/research) "dAO" = (/obj/machinery/atmospherics/pipe/manifold/insulated/hidden/blue{dir = 4},/obj/item/weapon/paper/derelict_invoice,/obj/machinery/meter,/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) "dAP" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research) @@ -10228,9 +10228,9 @@ "dOJ" = (/obj/machinery/door_control{id_tag = "rdorm1"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/carpet,/area/research_outpost/hallway) "dOK" = (/obj/machinery/camera{c_tag = "Research Outpost Hallway Fore"; dir = 4; network = list("RD","SS13")},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) "dOL" = (/obj/machinery/door_control{id_tag = "rdorm2"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/carpet,/area/research_outpost/hallway) -"dOM" = (/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos) -"dON" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/miner/nitrogen,/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos) -"dOO" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/miner/oxygen,/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos) +"dOM" = (/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) +"dON" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/miner/oxygen,/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) +"dOO" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/atmospherics/miner/nitrogen,/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) "dOP" = (/obj/structure/transit_tube{icon_state = "N-S"},/obj/structure/lattice,/turf/space,/area) "dOQ" = (/turf/unsimulated/mineral/random,/area/mine/unexplored) "dOR" = (/obj/machinery/anomaly/isotope_ratio,/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/spectro) @@ -10243,15 +10243,15 @@ "dOY" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/research_outpost/maintstore1) "dOZ" = (/obj/machinery/door/airlock/maintenance{name = "Auxiliary Storage"; req_access_txt = "0"; req_one_access_txt = "11;47"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/maintstore1) "dPa" = (/turf/simulated/floor,/area/research_outpost/maintstore1) -"dPb" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor,/area/research_outpost/maintstore1) +"dPb" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/research_outpost/maintstore1) "dPc" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/camera{c_tag = "Research Outpost Auxiliary Storage"; dir = 8; network = list("RD","SS13")},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor,/area/research_outpost/maintstore1) "dPd" = (/obj/structure/table,/turf/simulated/floor/carpet,/area/research_outpost/hallway) "dPe" = (/turf/simulated/floor/carpet,/area/research_outpost/hallway) "dPf" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{id_tag = "rminingdorm1"; name = "Dorm 1"},/turf/simulated/floor{icon_state = "carpet"},/area/research_outpost/hallway) "dPg" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{id_tag = "rdorm2"; name = "Dorm 2"},/turf/simulated/floor{icon_state = "carpet"},/area/research_outpost/hallway) -"dPh" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 2; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos) -"dPi" = (/obj/effect/decal/warning_stripes{icon_state = "nitrogen"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos) -"dPj" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/research_outpost/atmos) +"dPh" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) +"dPi" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 2; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) +"dPj" = (/obj/effect/decal/warning_stripes{icon_state = "nitrogen"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos) "dPk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/research_outpost/spectro) "dPl" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/research_outpost/spectro) "dPm" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/turf/simulated/floor{icon_state = "dark"},/area/research_outpost/spectro) @@ -10274,7 +10274,7 @@ "dPD" = (/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/spectro) "dPE" = (/obj/structure/window/full/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/spectro) "dPF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/spectro) -"dPG" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{dir = 4; icon_state = "whitegreen"},/area/research_outpost/spectro) +"dPG" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_CO2 = 0},/turf/simulated/floor{dir = 4; icon_state = "whitegreen"},/area/research_outpost/spectro) "dPH" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/research{name = "Spectrometry Lab"; req_access_txt = "47"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/spectro) "dPI" = (/obj/machinery/light_switch{pixel_x = 0; pixel_y = 27},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/sample) "dPJ" = (/obj/structure/sign/nosmoking_2{pixel_y = 32},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/sample) @@ -10316,7 +10316,7 @@ "dQt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) "dQu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) "dQv" = (/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light_switch{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plating,/area/research_outpost/atmos) -"dQw" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor/plating,/area/research_outpost/atmos) +"dQw" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor/plating,/area/research_outpost/atmos) "dQx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/visible{dir = 6},/turf/simulated/floor/plating,/area/research_outpost/atmos) "dQy" = (/obj/machinery/atmospherics/pipe/manifold/supply/visible,/turf/simulated/floor/plating,/area/research_outpost/atmos) "dQz" = (/obj/machinery/atmospherics/pipe/simple/supply/visible{dir = 4},/turf/simulated/floor/plating,/area/research_outpost/atmos) @@ -10372,7 +10372,7 @@ "dRx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor/border_only{dir = 1; layer = 2.6; name = "Firelock North"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) "dRy" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 4},/turf/simulated/floor/plating,/area/research_outpost/atmos) "dRz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/visible,/turf/simulated/floor/plating,/area/research_outpost/atmos) -"dRA" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor/plating,/area/research_outpost/atmos) +"dRA" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/plating,/area/research_outpost/atmos) "dRB" = (/obj/structure/transit_tube{icon_state = "NE-SW"},/obj/structure/lattice,/turf/space,/area) "dRC" = (/turf/unsimulated/mineral/random,/area/mine/explored) "dRD" = (/obj/structure/lattice,/obj/structure/transit_tube{icon_state = "S-NE"},/turf/space,/area) @@ -10567,7 +10567,7 @@ "dVk" = (/obj/structure/window/reinforced{dir = 8},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) "dVl" = (/obj/machinery/door/window{base_state = "left"; dir = 4; name = "Testing Chamber"; req_access_txt = "47"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor,/area/research_outpost/anomaly) "dVm" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) -"dVn" = (/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) +"dVn" = (/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) "dVo" = (/obj/machinery/anomaly/fourier_transform,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) "dVp" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) "dVq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/research_outpost/power) @@ -10641,12 +10641,12 @@ "dWG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/transit_tube{icon_state = "N-SE"},/turf/simulated/floor/plating,/area/research_outpost/entry) "dWH" = (/obj/structure/transit_tube{icon_state = "D-SW"},/obj/structure/flora/pottedplant/random,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor,/area/research_outpost/entry) "dWI" = (/turf/simulated/floor,/area/research_outpost/entry) -"dWJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor,/area/research_outpost/entry) +"dWJ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor,/area/research_outpost/entry) "dWK" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/research_outpost/entry) "dWL" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/research_outpost/entry) "dWM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_research{name = "Research Shuttle Dock"; req_access_txt = "47"},/turf/simulated/floor,/area/research_outpost/entry) "dWN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/research_outpost/entry) -"dWO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/research_outpost/entry) +"dWO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/research_outpost/entry) "dWP" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor,/area/research_outpost/entry) "dWQ" = (/obj/machinery/door/airlock/glass_medical{id_tag = ""; name = "Medbay"; req_access_txt = "7"},/obj/machinery/door/firedoor/border_only{dir = 8; layer = 2.6; name = "Firelock West"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/med) "dWR" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/med) @@ -10804,13 +10804,13 @@ "dZN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/maint) "dZO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light/small{dir = 1},/obj/structure/table,/obj/machinery/light_switch{pixel_x = -27; pixel_y = 0},/turf/simulated/floor,/area/research_outpost/iso1) "dZP" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/research_outpost/iso1) -"dZQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso1) +"dZQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso1) "dZR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light/small{dir = 1},/obj/structure/table,/obj/machinery/light_switch{pixel_x = -27; pixel_y = 0},/turf/simulated/floor,/area/research_outpost/iso2) "dZS" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/research_outpost/iso2) -"dZT" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso2) +"dZT" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso2) "dZU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/light/small{dir = 1},/obj/structure/table,/obj/machinery/light_switch{pixel_x = -27; pixel_y = 0},/turf/simulated/floor,/area/research_outpost/iso3) "dZV" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/research_outpost/iso3) -"dZW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso3) +"dZW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/alarm/isolation{pixel_y = 24},/turf/simulated/floor,/area/research_outpost/iso3) "dZX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/maintstore2) "dZY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/research_outpost/maintstore2) "dZZ" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/research_outpost/longtermstorage) @@ -10972,13 +10972,13 @@ "ecZ" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 6},/turf/simulated/floor/plating,/area/research_outpost/maint) "eda" = (/obj/machinery/atmospherics/pipe/manifold/cyan/visible{dir = 4},/turf/simulated/floor/plating,/area/research_outpost/maint) "edb" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso1) -"edc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/obj/effect/landmark{name = "bluespacerift"},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso2) +"edc" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso1) "edd" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso1) "ede" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso2) -"edf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso1) +"edf" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrub_CO2 = 0},/obj/effect/landmark{name = "bluespacerift"},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso2) "edg" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso2) "edh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso3) -"edi" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso3) +"edi" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; scrub_CO2 = 0},/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso3) "edj" = (/obj/structure/table,/obj/item/device/flashlight/lamp,/turf/simulated/floor{icon_state = "dark vault full"},/area/research_outpost/iso3) "edk" = (/obj/structure/closet/hydrant{pixel_x = -32},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/research_outpost/maintstore2) "edl" = (/obj/structure/rack,/obj/item/weapon/storage/box/gloves,/obj/item/weapon/storage/box/samplebags{pixel_x = 3; pixel_y = -3},/obj/machinery/power/apc{dir = 4; pixel_x = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/research_outpost/maintstore2) @@ -10990,7 +10990,7 @@ "edr" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "eds" = (/obj/machinery/portable_atmospherics/canister/plasma,/obj/machinery/alarm/vox{pixel_y = 24},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "edt" = (/obj/machinery/portable_atmospherics/canister,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) -"edu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrubbing_gases = list("nitrous_oxide","plasma")},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) +"edu" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_CO2 = 0},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "edv" = (/obj/machinery/vending/engivend,/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "edw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/vox,/area/vox_trading_post/trade_processing) "edx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/vox,/area/vox_trading_post/trade_processing) @@ -11182,8 +11182,8 @@ "ehb" = (/obj/structure/disposalpipe/segment,/turf/unsimulated/floor/airless{icon_state = "asteroidwarning"},/area/mine/explored) "ehc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "ehd" = (/obj/structure/window/full/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating/vox,/area/vox_trading_post/atmos) -"ehe" = (/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/vox_trading_post/atmos) -"ehf" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "vox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/vox_trading_post/atmos) +"ehe" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "vox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/vox_trading_post/atmos) +"ehf" = (/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/vox_trading_post/atmos) "ehg" = (/obj/structure/table,/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable,/turf/simulated/floor/vox,/area/vox_trading_post/trade_processing) "ehh" = (/obj/structure/closet/emcloset/vox,/turf/simulated/floor,/area/vox_trading_post/trading_floor) "ehi" = (/obj/structure/window/full/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/vox_trading_post/trading_floor) @@ -11196,9 +11196,9 @@ "ehp" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 10},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "ehq" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "vox_in"; name = "Nitrogen Supply Control"; output_tag = "vox_out"; sensors = list("vox_sensor" = "Tank")},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "ehr" = (/obj/structure/window/full/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating/vox,/area/vox_trading_post/atmos) -"ehs" = (/obj/machinery/atmospherics/miner/nitrogen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/vox_trading_post/atmos) -"eht" = (/obj/effect/decal/warning_stripes{dir = 8; icon_state = "nitrogen"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/vox_trading_post/atmos) -"ehu" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "vox_sensor"; output = 63},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/vox_trading_post/atmos) +"ehs" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "vox_sensor"; output = 63},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/vox_trading_post/atmos) +"eht" = (/obj/effect/decal/warning_stripes{dir = 8; icon_state = "nitrogen"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/vox_trading_post/atmos) +"ehu" = (/obj/machinery/atmospherics/miner/nitrogen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/vox_trading_post/atmos) "ehv" = (/obj/structure/table,/turf/simulated/floor/vox,/area/vox_trading_post/trade_processing) "ehw" = (/turf/unsimulated/mineral/random/high_chance,/area/mine/unexplored) "ehx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 5},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) @@ -11207,7 +11207,7 @@ "ehA" = (/obj/machinery/atmospherics/trinary/filter{dir = 4; filter_type = 2; icon_state = "intact_on"; name = "Gas filter (Vox N2 tank)"; on = 1},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "ehB" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 9},/turf/simulated/floor/vox,/area/vox_trading_post/atmos) "ehC" = (/obj/structure/window/full/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating/vox,/area/vox_trading_post/atmos) -"ehD" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "vox_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; starting_gases = list("nitrogen" = 100000)},/area/vox_trading_post/atmos) +"ehD" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "vox_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/vox_trading_post/atmos) "ehE" = (/obj/structure/closet/emcloset/vox,/turf/simulated/floor/vox,/area/vox_trading_post/trade_processing) "ehF" = (/obj/structure/closet/emcloset/vox,/obj/machinery/light,/turf/simulated/floor/vox,/area/vox_trading_post/trade_processing) "ehG" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor/vox,/area/vox_trading_post/trade_processing) @@ -11507,7 +11507,7 @@ "eno" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/mine/living_quarters) "enp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/mine/living_quarters) "enq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/mine/living_quarters) -"enr" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/mine/living_quarters) +"enr" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/mine/living_quarters) "ens" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/recharger{pixel_x = -29},/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/living_quarters) "ent" = (/obj/machinery/light/small{dir = 4},/obj/structure/closet/emcloset,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1},/turf/simulated/floor,/area/mine/living_quarters) "enu" = (/obj/machinery/status_display{pixel_x = -32},/turf/simulated/floor,/area/mine/production) @@ -11523,7 +11523,7 @@ "enE" = (/turf/simulated/floor/plating,/area/mine/living_quarters) "enF" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/mine/living_quarters) "enG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/mine/living_quarters) -"enH" = (/obj/machinery/atmospherics/miner/oxygen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/mine/living_quarters) +"enH" = (/obj/machinery/atmospherics/miner/oxygen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/mine/living_quarters) "enI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/recharger{pixel_x = -29},/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/mine/living_quarters) "enJ" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 32},/obj/structure/ore_box,/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/mine/living_quarters) "enK" = (/turf/space,/area/shuttle/mining/outpost) @@ -11538,7 +11538,7 @@ "enT" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/mine/living_quarters) "enU" = (/obj/structure/reagent_dispensers/fueltank,/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plating,/area/mine/living_quarters) "enV" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/mine/living_quarters) -"enW" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "mining_air_out"; internal_pressure_bound = 300; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; starting_gases = list("nitrogen" = 0.01, "oxygen" = 0.01)},/area/mine/living_quarters) +"enW" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{canSpawnMice = 0; dir = 8; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "mining_air_out"; internal_pressure_bound = 300; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/mine/living_quarters) "enX" = (/obj/machinery/door/airlock/external,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{blocks_air = 1; icon_state = "floorgrime"},/area/mine/living_quarters) "enY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/mine/living_quarters) "enZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor,/area/mine/production) @@ -11694,7 +11694,7 @@ "eqT" = (/obj/structure/grille/broken,/turf/simulated/floor/airless{icon_state = "circuit"},/area) "eqU" = (/obj/structure/grille,/turf/simulated/floor/airless{broken = 1; icon_state = "floorscorched2"},/area) "eqV" = (/obj/item/clothing/gloves/bikergloves,/turf/space,/area) - + (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa