diff --git a/aurorastation.dme b/aurorastation.dme index 4c939bd13ea..5ddf81d949d 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2052,10 +2052,12 @@ #include "code\modules\effects\map_effects\sound_emitter.dm" #include "code\modules\effects\map_effects\window_spawner.dm" #include "code\modules\effects\map_effects\marker\_defines.dm" +#include "code\modules\effects\map_effects\marker\_marker.dm" #include "code\modules\effects\map_effects\marker\airlock_.dm" #include "code\modules\effects\map_effects\marker\airlock_docking.dm" #include "code\modules\effects\map_effects\marker\airlock_helper.dm" #include "code\modules\effects\map_effects\marker\airlock_shuttle.dm" +#include "code\modules\effects\map_effects\marker\large_tank.dm" #include "code\modules\effects\maze_generation\maze_generator.dm" #include "code\modules\effects\maze_generation\maze_generator_blockwise.dm" #include "code\modules\effects\maze_generation\maze_helper_atoms.dm" diff --git a/code/modules/atmospherics/components/unary/vent_pump.dm b/code/modules/atmospherics/components/unary/vent_pump.dm index b436c22448d..6414fb2579c 100644 --- a/code/modules/atmospherics/components/unary/vent_pump.dm +++ b/code/modules/atmospherics/components/unary/vent_pump.dm @@ -57,9 +57,10 @@ /obj/machinery/atmospherics/unary/vent_pump/siphon pump_direction = 0 + frequency = 1441 /obj/machinery/atmospherics/unary/vent_pump/siphon/atmos - icon_state = "map_vent_in" + icon_state = "map_vent" external_pressure_bound = 0 external_pressure_bound_default = 0 internal_pressure_bound = PRESSURE_ONE_THOUSAND * 2 diff --git a/code/modules/effects/map_effects/marker/_defines.dm b/code/modules/effects/map_effects/marker/_defines.dm index 059d67350fb..b29639fc50e 100644 --- a/code/modules/effects/map_effects/marker/_defines.dm +++ b/code/modules/effects/map_effects/marker/_defines.dm @@ -1,10 +1,14 @@ -#define AIRLOCK_MARKER_TAG_MASTER "[master_tag]" -#define AIRLOCK_MARKER_TAG_SENSOR_CHAMBER "[master_tag]_sensor_chamber" -#define AIRLOCK_MARKER_TAG_SENSOR_INTERIOR "[master_tag]_sensor_interior" -#define AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR "[master_tag]_sensor_exterior" -#define AIRLOCK_MARKER_TAG_DOOR_EXTERIOR "[master_tag]_door_exterior" -#define AIRLOCK_MARKER_TAG_DOOR_INTERIOR "[master_tag]_door_interior" -#define AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER "[master_tag]_airpump_chamber" -#define AIRLOCK_MARKER_TAG_AIRPUMP_OUT_EXTERNAL "[master_tag]_pump_out_external" -#define AIRLOCK_MARKER_TAG_AIRPUMP_OUT_INTERNAL "[master_tag]_pump_out_internal" +#define MARKER_AIRLOCK_TAG_MASTER "[master_tag]" +#define MARKER_AIRLOCK_TAG_SENSOR_CHAMBER "[master_tag]_sensor_chamber" +#define MARKER_AIRLOCK_TAG_SENSOR_INTERIOR "[master_tag]_sensor_interior" +#define MARKER_AIRLOCK_TAG_SENSOR_EXTERIOR "[master_tag]_sensor_exterior" +#define MARKER_AIRLOCK_TAG_DOOR_EXTERIOR "[master_tag]_door_exterior" +#define MARKER_AIRLOCK_TAG_DOOR_INTERIOR "[master_tag]_door_interior" +#define MARKER_AIRLOCK_TAG_AIRPUMP_CHAMBER "[master_tag]_airpump_chamber" +#define MARKER_AIRLOCK_TAG_AIRPUMP_OUT_EXTERNAL "[master_tag]_pump_out_external" +#define MARKER_AIRLOCK_TAG_AIRPUMP_OUT_INTERNAL "[master_tag]_pump_out_internal" + +#define MARKER_LARGE_TANK_TAG_SENSOR "[master_tag]_sensor" +#define MARKER_LARGE_TANK_TAG_INJECTOR "[master_tag]_sensor_injector" +#define MARKER_LARGE_TANK_TAG_PUMP "[master_tag]_sensor_pump" diff --git a/code/modules/effects/map_effects/marker/_marker.dm b/code/modules/effects/map_effects/marker/_marker.dm new file mode 100644 index 00000000000..9fcad384568 --- /dev/null +++ b/code/modules/effects/map_effects/marker/_marker.dm @@ -0,0 +1,4 @@ +/obj/effect/map_effect/marker + name = "map marker parent abstract object" + icon = 'icons/effects/map_effects.dmi' + icon_state = "marker_base" diff --git a/code/modules/effects/map_effects/marker/airlock_.dm b/code/modules/effects/map_effects/marker/airlock_.dm index d0ead26ff62..158d75c8348 100644 --- a/code/modules/effects/map_effects/marker/airlock_.dm +++ b/code/modules/effects/map_effects/marker/airlock_.dm @@ -1,7 +1,3 @@ -/obj/effect/map_effect/marker - name = "map marker parent abstract object" - icon = 'icons/effects/map_effects.dmi' - icon_state = "marker_base" /// Airlock marker that, when placed above airlock components, actually sets them up to make it functional. /// This is a simple exterior access airlock, not used for docking. @@ -53,12 +49,12 @@ if(istype(controller)) // common controller vars controller.set_frequency(frequency) - controller.id_tag = AIRLOCK_MARKER_TAG_MASTER - controller.tag_airpump = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER - controller.tag_chamber_sensor = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER - controller.tag_exterior_sensor = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR - controller.tag_exterior_door = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR - controller.tag_interior_door = AIRLOCK_MARKER_TAG_DOOR_INTERIOR + controller.id_tag = MARKER_AIRLOCK_TAG_MASTER + controller.tag_airpump = MARKER_AIRLOCK_TAG_AIRPUMP_CHAMBER + controller.tag_chamber_sensor = MARKER_AIRLOCK_TAG_SENSOR_CHAMBER + controller.tag_exterior_sensor = MARKER_AIRLOCK_TAG_SENSOR_EXTERIOR + controller.tag_exterior_door = MARKER_AIRLOCK_TAG_DOOR_EXTERIOR + controller.tag_interior_door = MARKER_AIRLOCK_TAG_DOOR_INTERIOR controller.cycle_to_external_air = cycle_to_external_air controller.req_access = req_access controller.req_one_access = req_one_access @@ -75,21 +71,21 @@ door.req_one_access = req_one_access door.lock() if(is_interior) - door.id_tag = AIRLOCK_MARKER_TAG_DOOR_INTERIOR + door.id_tag = MARKER_AIRLOCK_TAG_DOOR_INTERIOR else if(is_exterior) - door.id_tag = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR + door.id_tag = MARKER_AIRLOCK_TAG_DOOR_EXTERIOR continue var/obj/machinery/airlock_sensor/sensor = thing if(istype(sensor)) sensor.set_frequency(frequency) - sensor.master_tag = AIRLOCK_MARKER_TAG_MASTER + sensor.master_tag = MARKER_AIRLOCK_TAG_MASTER if(is_interior) - sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_INTERIOR + sensor.id_tag = MARKER_AIRLOCK_TAG_SENSOR_INTERIOR else if(is_exterior) - sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR + sensor.id_tag = MARKER_AIRLOCK_TAG_SENSOR_EXTERIOR else - sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER + sensor.id_tag = MARKER_AIRLOCK_TAG_SENSOR_CHAMBER continue var/obj/machinery/atmospherics/unary/vent_pump/pump = thing @@ -98,17 +94,17 @@ unregister_radio(pump, frequency) pump.setup_radio() if(is_exterior) - pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_EXTERNAL + pump.id_tag = MARKER_AIRLOCK_TAG_AIRPUMP_OUT_EXTERNAL else if(is_out) - pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_INTERNAL + pump.id_tag = MARKER_AIRLOCK_TAG_AIRPUMP_OUT_INTERNAL else - pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER + pump.id_tag = MARKER_AIRLOCK_TAG_AIRPUMP_CHAMBER continue var/obj/machinery/access_button/button = thing if(istype(button)) button.set_frequency(frequency) - button.master_tag = AIRLOCK_MARKER_TAG_MASTER + button.master_tag = MARKER_AIRLOCK_TAG_MASTER button.req_access = req_access button.req_one_access = req_one_access if(is_interior) diff --git a/code/modules/effects/map_effects/marker/airlock_docking.dm b/code/modules/effects/map_effects/marker/airlock_docking.dm index 4de21ca35d2..63568378a57 100644 --- a/code/modules/effects/map_effects/marker/airlock_docking.dm +++ b/code/modules/effects/map_effects/marker/airlock_docking.dm @@ -41,12 +41,12 @@ if(istype(controller)) // common controller vars controller.set_frequency(frequency) - controller.id_tag = AIRLOCK_MARKER_TAG_MASTER - controller.tag_airpump = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER - controller.tag_chamber_sensor = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER - controller.tag_exterior_sensor = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR - controller.tag_exterior_door = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR - controller.tag_interior_door = AIRLOCK_MARKER_TAG_DOOR_INTERIOR + controller.id_tag = MARKER_AIRLOCK_TAG_MASTER + controller.tag_airpump = MARKER_AIRLOCK_TAG_AIRPUMP_CHAMBER + controller.tag_chamber_sensor = MARKER_AIRLOCK_TAG_SENSOR_CHAMBER + controller.tag_exterior_sensor = MARKER_AIRLOCK_TAG_SENSOR_EXTERIOR + controller.tag_exterior_door = MARKER_AIRLOCK_TAG_DOOR_EXTERIOR + controller.tag_interior_door = MARKER_AIRLOCK_TAG_DOOR_INTERIOR controller.cycle_to_external_air = cycle_to_external_air controller.req_access = req_access controller.req_one_access = req_one_access @@ -56,13 +56,13 @@ controller.program = controller.docking_program if(SSshuttle.registered_shuttle_landmarks[landmark_tag]) var/obj/effect/shuttle_landmark/landmark = SSshuttle.registered_shuttle_landmarks[landmark_tag] - landmark.docking_controller = SSshuttle.docking_registry[AIRLOCK_MARKER_TAG_MASTER] + landmark.docking_controller = SSshuttle.docking_registry[MARKER_AIRLOCK_TAG_MASTER] continue var/obj/effect/shuttle_landmark/landmark = thing if(istype(landmark)) - if(SSshuttle.docking_registry[AIRLOCK_MARKER_TAG_MASTER]) - landmark.docking_controller = SSshuttle.docking_registry[AIRLOCK_MARKER_TAG_MASTER] + if(SSshuttle.docking_registry[MARKER_AIRLOCK_TAG_MASTER]) + landmark.docking_controller = SSshuttle.docking_registry[MARKER_AIRLOCK_TAG_MASTER] continue // and all the other airlock components @@ -74,21 +74,21 @@ door.req_one_access = req_one_access door.lock() if(is_interior) - door.id_tag = AIRLOCK_MARKER_TAG_DOOR_INTERIOR + door.id_tag = MARKER_AIRLOCK_TAG_DOOR_INTERIOR else if(is_exterior) - door.id_tag = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR + door.id_tag = MARKER_AIRLOCK_TAG_DOOR_EXTERIOR continue var/obj/machinery/airlock_sensor/sensor = thing if(istype(sensor)) sensor.set_frequency(frequency) - sensor.master_tag = AIRLOCK_MARKER_TAG_MASTER + sensor.master_tag = MARKER_AIRLOCK_TAG_MASTER if(is_interior) - sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_INTERIOR + sensor.id_tag = MARKER_AIRLOCK_TAG_SENSOR_INTERIOR else if(is_exterior) - sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR + sensor.id_tag = MARKER_AIRLOCK_TAG_SENSOR_EXTERIOR else - sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER + sensor.id_tag = MARKER_AIRLOCK_TAG_SENSOR_CHAMBER continue var/obj/machinery/atmospherics/unary/vent_pump/pump = thing @@ -97,17 +97,17 @@ unregister_radio(pump, frequency) pump.setup_radio() if(is_exterior) - pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_EXTERNAL + pump.id_tag = MARKER_AIRLOCK_TAG_AIRPUMP_OUT_EXTERNAL else if(is_out) - pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_INTERNAL + pump.id_tag = MARKER_AIRLOCK_TAG_AIRPUMP_OUT_INTERNAL else - pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER + pump.id_tag = MARKER_AIRLOCK_TAG_AIRPUMP_CHAMBER continue var/obj/machinery/access_button/button = thing if(istype(button)) button.set_frequency(frequency) - button.master_tag = AIRLOCK_MARKER_TAG_MASTER + button.master_tag = MARKER_AIRLOCK_TAG_MASTER button.req_access = req_access button.req_one_access = req_one_access if(is_interior) diff --git a/code/modules/effects/map_effects/marker/airlock_shuttle.dm b/code/modules/effects/map_effects/marker/airlock_shuttle.dm index 5e66c134e80..4865a66a4a6 100644 --- a/code/modules/effects/map_effects/marker/airlock_shuttle.dm +++ b/code/modules/effects/map_effects/marker/airlock_shuttle.dm @@ -41,12 +41,12 @@ if(istype(controller)) // common controller vars controller.set_frequency(frequency) - controller.id_tag = AIRLOCK_MARKER_TAG_MASTER - controller.tag_airpump = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER - controller.tag_chamber_sensor = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER - controller.tag_exterior_sensor = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR - controller.tag_exterior_door = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR - controller.tag_interior_door = AIRLOCK_MARKER_TAG_DOOR_INTERIOR + controller.id_tag = MARKER_AIRLOCK_TAG_MASTER + controller.tag_airpump = MARKER_AIRLOCK_TAG_AIRPUMP_CHAMBER + controller.tag_chamber_sensor = MARKER_AIRLOCK_TAG_SENSOR_CHAMBER + controller.tag_exterior_sensor = MARKER_AIRLOCK_TAG_SENSOR_EXTERIOR + controller.tag_exterior_door = MARKER_AIRLOCK_TAG_DOOR_EXTERIOR + controller.tag_interior_door = MARKER_AIRLOCK_TAG_DOOR_INTERIOR controller.cycle_to_external_air = cycle_to_external_air controller.req_access = req_access controller.req_one_access = req_one_access @@ -56,7 +56,7 @@ controller.program = controller.docking_program if(SSshuttle.shuttles[shuttle_tag]) var/datum/shuttle/autodock/shuttle = SSshuttle.shuttles[shuttle_tag] - shuttle.dock_target = AIRLOCK_MARKER_TAG_MASTER + shuttle.dock_target = MARKER_AIRLOCK_TAG_MASTER continue // and all the other airlock components @@ -68,21 +68,21 @@ door.req_one_access = req_one_access door.lock() if(is_interior) - door.id_tag = AIRLOCK_MARKER_TAG_DOOR_INTERIOR + door.id_tag = MARKER_AIRLOCK_TAG_DOOR_INTERIOR else if(is_exterior) - door.id_tag = AIRLOCK_MARKER_TAG_DOOR_EXTERIOR + door.id_tag = MARKER_AIRLOCK_TAG_DOOR_EXTERIOR continue var/obj/machinery/airlock_sensor/sensor = thing if(istype(sensor)) sensor.set_frequency(frequency) - sensor.master_tag = AIRLOCK_MARKER_TAG_MASTER + sensor.master_tag = MARKER_AIRLOCK_TAG_MASTER if(is_interior) - sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_INTERIOR + sensor.id_tag = MARKER_AIRLOCK_TAG_SENSOR_INTERIOR else if(is_exterior) - sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_EXTERIOR + sensor.id_tag = MARKER_AIRLOCK_TAG_SENSOR_EXTERIOR else - sensor.id_tag = AIRLOCK_MARKER_TAG_SENSOR_CHAMBER + sensor.id_tag = MARKER_AIRLOCK_TAG_SENSOR_CHAMBER continue var/obj/machinery/atmospherics/unary/vent_pump/pump = thing @@ -91,17 +91,17 @@ unregister_radio(pump, frequency) pump.setup_radio() if(is_exterior) - pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_EXTERNAL + pump.id_tag = MARKER_AIRLOCK_TAG_AIRPUMP_OUT_EXTERNAL else if(is_out) - pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_OUT_INTERNAL + pump.id_tag = MARKER_AIRLOCK_TAG_AIRPUMP_OUT_INTERNAL else - pump.id_tag = AIRLOCK_MARKER_TAG_AIRPUMP_CHAMBER + pump.id_tag = MARKER_AIRLOCK_TAG_AIRPUMP_CHAMBER continue var/obj/machinery/access_button/button = thing if(istype(button)) button.set_frequency(frequency) - button.master_tag = AIRLOCK_MARKER_TAG_MASTER + button.master_tag = MARKER_AIRLOCK_TAG_MASTER button.req_access = req_access button.req_one_access = req_one_access if(is_interior) diff --git a/code/modules/effects/map_effects/marker/large_tank.dm b/code/modules/effects/map_effects/marker/large_tank.dm new file mode 100644 index 00000000000..89afba4a4b3 --- /dev/null +++ b/code/modules/effects/map_effects/marker/large_tank.dm @@ -0,0 +1,58 @@ + +/// Large tank marker, used to set up "large tanks", that being multi-tile tanks of gas, +/// with its own control console, sensor, pump, and injector. +/obj/effect/map_effect/marker/large_tank + name = "large tank marker" + desc = "See comments/documentation in code." + icon = 'icons/effects/map_effects.dmi' + icon_state = "marker_large_tank" + layer = LIGHTING_LAYER + + /// Radio frequency of this large tank. + var/frequency = 2199 + + /// Unique tag for this large tank. Not visible in game and to the player. Do not leave this as null. + /// THIS MUST BE UNIQUE FOR THE LARGE TANK. Every marker in one large tank should have the same `master_tag`. + /// Different large tanks, even on different maps, cannot share the same `master_tag`. + var/master_tag = null + +/obj/effect/map_effect/marker/large_tank/Initialize(mapload, ...) + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/effect/map_effect/marker/large_tank/LateInitialize() + if(!master_tag || !frequency) + return + + // iterate over components under this marker + // and actually set them up + for(var/thing in loc) + // set up the control console + var/obj/machinery/computer/general_air_control/large_tank_control/control = thing + if(istype(control)) + control.set_frequency(frequency) + control.input_tag = MARKER_LARGE_TANK_TAG_INJECTOR + control.output_tag = MARKER_LARGE_TANK_TAG_PUMP + control.sensors = list(MARKER_LARGE_TANK_TAG_SENSOR="Tank") + continue + + // and all the other components + + var/obj/machinery/air_sensor/sensor = thing + if(istype(sensor)) + sensor.set_frequency(frequency) + sensor.id_tag = MARKER_LARGE_TANK_TAG_SENSOR + continue + + var/obj/machinery/atmospherics/unary/outlet_injector/injector = thing + if(istype(injector)) + injector.set_frequency(frequency) + injector.id = MARKER_LARGE_TANK_TAG_INJECTOR + continue + + var/obj/machinery/atmospherics/unary/vent_pump/pump = thing + if(istype(pump)) + pump.frequency = frequency + pump.id_tag = MARKER_LARGE_TANK_TAG_PUMP + pump.setup_radio() + continue diff --git a/html/changelogs/DreamySkrell-large-tank-marker.yml b/html/changelogs/DreamySkrell-large-tank-marker.yml new file mode 100644 index 00000000000..60596d9c9e5 --- /dev/null +++ b/html/changelogs/DreamySkrell-large-tank-marker.yml @@ -0,0 +1,10 @@ + + +author: DreamySkrell + +delete-after: True + +changes: + - rscadd: "Adds large tank markers." + - maptweak: "Updates SCC Scout Ship to use large tank markers." + - maptweak: "Updates Civilian Yacht to use large tank markers." diff --git a/icons/effects/map_effects.dmi b/icons/effects/map_effects.dmi index adaff77832c..70e7742db18 100644 Binary files a/icons/effects/map_effects.dmi and b/icons/effects/map_effects.dmi differ diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index 23e74c2adc3..4ecc2dfca1d 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -6534,10 +6534,11 @@ /area/ship/scc_scout_ship/bridge) "OV" = ( /obj/random/dirt_75, -/obj/machinery/air_sensor{ - frequency = 1441; - id_tag = "co2_sensor" +/obj/effect/map_effect/marker/large_tank{ + master_tag = "scc_scout_ship_co2"; + name = "scc_scout_ship_co2" }, +/obj/machinery/air_sensor, /turf/simulated/floor/reinforced/carbon_dioxide, /area/ship/scc_scout_ship/maint_propulsion_port) "OY" = ( @@ -7619,14 +7620,14 @@ /area/ship/scc_scout_ship/quarters) "VX" = ( /obj/random/dirt_75, -/obj/machinery/computer/general_air_control/large_tank_control/terminal{ - dir = 4; - input_tag = "co2_in"; - output_tag = "co2_out"; - sensors = list("co2_sensor"="Tank"); - name = "Carbon Dioxide Supply Monitor" - }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/computer/general_air_control/large_tank_control/terminal{ + dir = 4 + }, +/obj/effect/map_effect/marker/large_tank{ + master_tag = "scc_scout_ship_co2"; + name = "scc_scout_ship_co2" + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "Wc" = ( @@ -7766,13 +7767,15 @@ /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "WM" = ( -/obj/random/dirt_75, -/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; - id_tag = "co2_out"; +/obj/machinery/light/small/emergency, +/obj/effect/map_effect/marker/large_tank{ + master_tag = "scc_scout_ship_co2"; + name = "scc_scout_ship_co2" + }, +/obj/machinery/atmospherics/unary/vent_pump/siphon/atmos{ dir = 1 }, -/obj/machinery/light/small/emergency, +/obj/random/dirt_75, /turf/simulated/floor/reinforced/carbon_dioxide, /area/ship/scc_scout_ship/maint_propulsion_port) "WO" = ( @@ -8224,12 +8227,12 @@ "Zh" = ( /obj/random/dirt_75, /obj/machinery/atmospherics/unary/outlet_injector{ - frequency = 1441; - id = "co2_in"; - name = "carbon dioxide injector"; - use_power = 1; dir = 1 }, +/obj/effect/map_effect/marker/large_tank{ + master_tag = "scc_scout_ship_co2"; + name = "scc_scout_ship_co2" + }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/ship/scc_scout_ship/maint_propulsion_port) "Zo" = ( diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm index 8ec589d406d..ff6fb8be6cb 100644 --- a/maps/away/ships/yacht_civ/yacht_civ.dmm +++ b/maps/away/ships/yacht_civ/yacht_civ.dmm @@ -1118,12 +1118,12 @@ /area/ship/yacht_civ/bridge) "kH" = ( /obj/machinery/atmospherics/unary/outlet_injector{ - frequency = 1441; - id = "co2_in"; - name = "carbon dioxide injector"; - use_power = 1; dir = 4 }, +/obj/effect/map_effect/marker/large_tank{ + master_tag = "yacht_civ_co2"; + name = "yacht_civ_co2" + }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/ship/yacht_civ/propulsion) "kK" = ( @@ -1374,13 +1374,13 @@ /turf/simulated/floor/exoplanet/grass, /area/ship/yacht_civ/hallway_mid) "mI" = ( -/obj/machinery/air_sensor{ - frequency = 1441; - id_tag = "co2_sensor" - }, /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/machinery/air_sensor, +/obj/effect/map_effect/marker/large_tank{ + master_tag = "yacht_civ_co2" + }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/ship/yacht_civ/propulsion) "mL" = ( @@ -1512,16 +1512,13 @@ /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_fore) "nI" = ( -/obj/machinery/computer/general_air_control/large_tank_control/terminal{ - dir = 8; - input_tag = "co2_in"; - output_tag = "co2_out"; - sensors = list("co2_sensor"="Tank"); - name = "propellant monitor" - }, /obj/effect/floor_decal/corner/beige{ dir = 6 }, +/obj/machinery/computer/general_air_control/large_tank_control/terminal{ + dir = 8; + name = "propellant monitor" + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/bridge) "nW" = ( @@ -5437,17 +5434,17 @@ /turf/simulated/floor/plating, /area/ship/yacht_civ/storage) "Va" = ( -/obj/machinery/computer/general_air_control/large_tank_control/terminal{ - dir = 8; - input_tag = "co2_in"; - output_tag = "co2_out"; - sensors = list("co2_sensor"="Tank"); - name = "propellant monitor" - }, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, +/obj/effect/map_effect/marker/large_tank{ + master_tag = "yacht_civ_co2" + }, +/obj/machinery/computer/general_air_control/large_tank_control/terminal{ + dir = 8; + name = "propellant monitor" + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/propulsion) "Vs" = ( @@ -5564,11 +5561,12 @@ /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "Wc" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; - id_tag = "co2_out"; +/obj/machinery/atmospherics/unary/vent_pump/siphon/atmos{ dir = 4 }, +/obj/effect/map_effect/marker/large_tank{ + master_tag = "yacht_civ_co2" + }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/ship/yacht_civ/propulsion) "We" = (