diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 31b896eed7f..5512592730e 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -433,115 +433,6 @@ obj/machinery/computer/general_air_control/Destroy() radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) -/obj/machinery/computer/general_air_control/reaction_chamber - name = "reaction chamber monitoring console" - desc = "A console that monitors and controls a reaction chamber." - icon_screen = "engi" - light_color = "#ffcc33" - - frequency = 1442 - var/igniter_id - var/last_ignite = 0 - var/input_tag - var/output_tag - - var/list/input_info - var/list/output_info - - var/default_input_flow_setting = 200 - var/default_pressure_setting = ONE_ATMOSPHERE * 45 - var/max_input_flow_setting = ATMOS_DEFAULT_VOLUME_PUMP + 500 - var/max_pressure_setting = 50 * ONE_ATMOSPHERE - - circuit = /obj/item/circuitboard/air_management/reaction_chamber - -/obj/machinery/computer/general_air_control/reaction_chamber/vueui_data_change(var/list/data, var/mob/user, var/datum/vueui/ui) - . = ..() - if(!data) - . = data = list("sensors" = list()) - - VUEUI_SET_CHECK(data["igniter"], !!igniter_id, ., data) - - data["maxrate"] = max_input_flow_setting - data["maxpressure"] = max_pressure_setting - - if(input_info) - LAZYINITLIST(data["input"]) - VUEUI_SET_CHECK(data["input"]["power"], input_info["power"], ., data) - VUEUI_SET_CHECK(data["input"]["rate"], input_info["volume_rate"], ., data) - VUEUI_SET_CHECK_IFNOTSET(data["input"]["setrate"], default_input_flow_setting, ., data) - - if(output_info) - LAZYINITLIST(data["output"]) - VUEUI_SET_CHECK(data["output"]["power"], output_info["power"], ., data) - VUEUI_SET_CHECK(data["output"]["pressure"], output_info["internal"], ., data) - VUEUI_SET_CHECK_IFNOTSET(data["output"]["setpressure"], default_pressure_setting, ., data) - -/obj/machinery/computer/general_air_control/reaction_chamber/ui_interact(mob/user) - var/datum/vueui/ui = SSvueui.get_open_ui(user, src) - if (!ui) - ui = new(user, src, "console-atmocontrol-reaction", 460, 470, capitalize(src.name)) - ui.auto_update_content = TRUE - ui.open() - -/obj/machinery/computer/general_air_control/reaction_chamber/receive_signal(datum/signal/signal) - if(!signal || signal.encryption) return - - var/id_tag = signal.data["tag"] - if(!id_tag) return - - if(input_tag == id_tag) - input_info = signal.data - else if(output_tag == id_tag) - output_info = signal.data - else - ..(signal) - -/obj/machinery/computer/general_air_control/reaction_chamber/Topic(href, href_list) - if(..()) - return 1 - - if(!radio_connection) - return 0 - var/datum/signal/signal = new - signal.transmission_method = TRANSMISSION_RADIO - signal.source = src - if(href_list["in_refresh_status"]) - input_info = null - signal.data = list ("tag" = input_tag, "status" = 1) - - if(href_list["in_toggle_injector"]) - input_info = null - signal.data = list ("tag" = input_tag, "power_toggle" = 1) - - if(href_list["in_set_flowrate"] != null) - var/setrate = between(0, text2num(href_list["in_set_flowrate"]), max_input_flow_setting) - input_info = null - signal.data = list ("tag" = input_tag, "set_volume_rate" = "[setrate]") - - if(href_list["out_refresh_status"]) - output_info = null - signal.data = list ("tag" = output_tag, "status" = 1) - - if(href_list["out_toggle_power"]) - output_info = null - signal.data = list ("tag" = output_tag, "power_toggle" = 1) - - if(href_list["out_set_pressure"] != null) - var/setpressure = between(0, text2num(href_list["out_set_pressure"]), max_pressure_setting) - output_info = null - signal.data = list ("tag" = output_tag, "set_internal_pressure" = "[setpressure]") - - if(href_list["fire_igniter"]) - if((last_ignite + 5 SECONDS) < world.time) - for(var/obj/machinery/sparker/M in SSmachinery.all_machines) - if(M.id == igniter_id) - M.ignite() - last_ignite = world.time - - signal.data["sigtype"] = "command" - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - #undef SIGNAL_OXYGEN #undef SIGNAL_PHORON #undef SIGNAL_NITROGEN diff --git a/code/game/objects/items/weapons/circuitboards/computer/air_management.dm b/code/game/objects/items/weapons/circuitboards/computer/air_management.dm index 1003b141897..e263d635cb5 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/air_management.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/air_management.dm @@ -45,19 +45,6 @@ var/cutoff_temperature = 2000 var/on_temperature = 1200 -/obj/item/circuitboard/air_management/reaction_chamber - name = T_BOARD("tank control") - build_path = /obj/machinery/computer/general_air_control/reaction_chamber - frequency = 1442 - var/input_tag - var/output_tag - - var/list/input_info = list() - var/list/output_info = list() - - var/input_flow_setting = 200 - var/pressure_setting = ONE_ATMOSPHERE * 45 - /************ * Construct * ************/ diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm index 2fe6cf32f49..b63119e542b 100644 --- a/maps/sccv_horizon/placeholder-1_deck_1.dmm +++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm @@ -6152,8 +6152,8 @@ /turf/simulated/floor/tiled, /area/janitor) "fyz" = ( -/obj/machinery/atmospherics/binary/pump/high_power{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/engineering/atmos/propulsion/starboard) @@ -7849,6 +7849,9 @@ /obj/machinery/atmospherics/binary/passive_gate{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "gVx" = ( @@ -8352,7 +8355,7 @@ dir = 4; frequency = 1442; id = "starboard_prop_in"; - tag = null + tag = "starboard_prop_in" }, /turf/simulated/floor/reinforced, /area/engineering/atmos/propulsion/starboard) @@ -9907,11 +9910,11 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/computer/general_air_control/reaction_chamber{ - igniter_id = "port_prop_igni"; +/obj/machinery/computer/general_air_control/large_tank_control{ + frequency = 1442; input_tag = "port_prop_in"; output_tag = "port_prop_out"; - sensors = list("port_prop_sensor" = "Port Reaction Chamber") + sensors = list("port_prop_sensor" = "Port Propulsion Sensor") }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) @@ -10471,6 +10474,15 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) +"jtI" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/propulsion/starboard) "jue" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/purple, @@ -12105,9 +12117,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/machinery/button/remote/blast_door{ id = "exteriorpropulsionstarboard"; name = "Exterior Blast Door"; @@ -12120,6 +12129,9 @@ pixel_x = -25; pixel_y = 8 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "kSe" = ( @@ -12883,16 +12895,16 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/computer/general_air_control/reaction_chamber{ - dir = 8; - igniter_id = "starboard_prop_igni"; - input_tag = "starboard_prop_in"; - output_tag = "starboard_prop_out"; - sensors = list("starboard_prop_sensor" = "Starboard Reaction Chamber") - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 8; + frequency = 1442; + input_tag = "starboard_prop_in"; + output_tag = "starboard_prop_out"; + sensors = list("starboard_prop_sensor" = "Starboard Propulsion Sensor") + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "lGb" = ( @@ -13001,6 +13013,17 @@ /obj/machinery/light, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod4) +"lMv" = ( +/obj/machinery/button/ignition{ + id = "port_prop_igni"; + pixel_y = -26 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/propulsion) "lMA" = ( /obj/structure/railing/mapped{ dir = 4 @@ -13858,8 +13881,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, +/obj/machinery/button/ignition{ + id = "starboard_prop_igni"; + pixel_y = -26 + }, /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) @@ -14083,6 +14110,15 @@ }, /turf/simulated/floor/carpet/rubber, /area/rnd/xenoarch_atrium) +"mKb" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/propulsion) "mKj" = ( /turf/simulated/floor/tiled/ramp/bottom, /area/maintenance/operations) @@ -20170,6 +20206,9 @@ /obj/machinery/atmospherics/binary/passive_gate{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "srC" = ( @@ -21114,6 +21153,9 @@ "tkS" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, /obj/machinery/meter, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "tkX" = ( @@ -22852,9 +22894,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "uPx" = ( -/obj/machinery/atmospherics/binary/pump/high_power{ - dir = 4; - layer = 2.8 +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/engineering/atmos/propulsion) @@ -24225,6 +24266,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/hangar/auxiliary) +"wfg" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/propulsion) "wfo" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 8 @@ -25807,6 +25852,9 @@ pixel_x = 25; pixel_y = 8 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "xur" = ( @@ -42363,7 +42411,7 @@ apQ awJ srw wsO -ekt +jtI awJ jLn crh @@ -51454,7 +51502,7 @@ uVL gVu uKh fCd -hRF +wfg uVL lUr lUr @@ -51655,8 +51703,8 @@ fCd uVL xtY tkS -fCd -hRF +mKb +lMv uVL cxA cxA diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm index cc44010aa55..e76f52a5516 100644 --- a/maps/sccv_horizon/placeholder-2_deck_2.dmm +++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm @@ -23906,10 +23906,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"oXw" = ( -/obj/structure/bed/stool/padded/red, -/turf/simulated/floor/lino/grey, -/area/crew_quarters/cafeteria) "oXy" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/wall/r_wall, @@ -59038,7 +59034,7 @@ pFr pFr ycL jFo -oXw +tfl kAo thy mZI @@ -59236,10 +59232,10 @@ eSd txq mDD tfl -oXw -oXw -oXw -oXw +tfl +tfl +tfl +tfl kAo kAo vRV diff --git a/vueui/src/components/view/console/atmocontrol/reaction.vue b/vueui/src/components/view/console/atmocontrol/reaction.vue deleted file mode 100644 index 93b8ba713a7..00000000000 --- a/vueui/src/components/view/console/atmocontrol/reaction.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - \ No newline at end of file