diff --git a/_maps/map_files/Snake/snake_lower.dmm b/_maps/map_files/Snake/snake_lower.dmm index 8f23ef89e58..b0dcc7ac19a 100644 --- a/_maps/map_files/Snake/snake_lower.dmm +++ b/_maps/map_files/Snake/snake_lower.dmm @@ -765,7 +765,7 @@ /turf/open/floor/plasteel, /area/security/brig) "cO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{ +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ dir = 8 }, /turf/open/floor/engine/air, @@ -3151,7 +3151,7 @@ /turf/open/floor/engine, /area/nsv/weapons/fore) "ls" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{ dir = 4 }, /turf/open/floor/engine/airless, @@ -3797,9 +3797,9 @@ /turf/open/floor/plasteel/white, /area/science/lab) "nL" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ dir = 8; - name = "Fuel Mix Injector" + piping_layer = 4 }, /turf/open/floor/engine/airless, /area/engine/atmos) @@ -4718,6 +4718,12 @@ /obj/machinery/light_switch/north, /turf/open/floor/engine, /area/security/execution/transfer) +"ru" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nucleium_output{ + dir = 1 + }, +/turf/open/floor/engine/vacuum, +/area/engine/atmos) "rv" = ( /obj/machinery/light_switch/north, /turf/open/floor/plasteel/dark/side, @@ -6293,6 +6299,9 @@ dir = 4 }, /obj/item/radio/intercom/directional/south, +/obj/machinery/computer/atmos_control/tank/nucleium_tank{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/engine/atmos) "wV" = ( @@ -9238,6 +9247,12 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmos) +"GQ" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nucleium_input{ + dir = 1 + }, +/turf/open/floor/engine/vacuum, +/area/engine/atmos) "GS" = ( /obj/structure/kitchenspike, /obj/machinery/camera/autoname, @@ -13075,6 +13090,10 @@ /area/security/brig) "TL" = ( /obj/machinery/light/small, +/obj/machinery/air_sensor/atmos/nucleium_tank, +/obj/machinery/portable_atmospherics/canister/nucleium{ + filled = 0 + }, /turf/open/floor/engine/vacuum, /area/engine/atmos) "TP" = ( @@ -40506,7 +40525,7 @@ NS Ly IV hP -Hg +ru Hg ge ge @@ -41020,7 +41039,7 @@ iB yL xe hP -Hg +GQ Hg ge oe diff --git a/nsv13.dme b/nsv13.dme index fb2582598ce..55a6f279959 100644 --- a/nsv13.dme +++ b/nsv13.dme @@ -3660,6 +3660,7 @@ #include "interface\interface.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" +#include "nsv13\code\__DEFINES\atmospherics.dm" #include "nsv13\code\__DEFINES\components.dm" #include "nsv13\code\__DEFINES\fleets.dm" #include "nsv13\code\__DEFINES\ftl.dm" @@ -3787,6 +3788,7 @@ #include "nsv13\code\game\machinery\plasma_loader.dm" #include "nsv13\code\game\machinery\refillable_chem_dispenser.dm" #include "nsv13\code\game\machinery\computer\_ship.dm" +#include "nsv13\code\game\machinery\computer\atmos_control.dm" #include "nsv13\code\game\machinery\computer\boarding_pin.dm" #include "nsv13\code\game\machinery\computer\helm.dm" #include "nsv13\code\game\machinery\computer\munitions.dm" @@ -3839,8 +3841,10 @@ #include "nsv13\code\modules\antagonists\boarders\boarders.dm" #include "nsv13\code\modules\antagonists\boarders\pirate_boarders.dm" #include "nsv13\code\modules\atmospherics\gasmixtures\reactions.dm" +#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm" #include "nsv13\code\modules\atmospherics\machinery\components\binary_devices\constrictor.dm" #include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\tank.dm" +#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\vent_pump.dm" #include "nsv13\code\modules\cargo\mission_rewards.dm" #include "nsv13\code\modules\cargo\objective_cargo.dm" #include "nsv13\code\modules\cargo\packs.dm" diff --git a/nsv13/code/__DEFINES/atmospherics.dm b/nsv13/code/__DEFINES/atmospherics.dm new file mode 100644 index 00000000000..5de0fedc9f0 --- /dev/null +++ b/nsv13/code/__DEFINES/atmospherics.dm @@ -0,0 +1,3 @@ +#define ATMOS_GAS_MONITOR_INPUT_NUCLEIUM "nucleium_in" +#define ATMOS_GAS_MONITOR_OUTPUT_NUCLEIUM "nucleium_out" +#define ATMOS_GAS_MONITOR_SENSOR_NUCLEIUM "nucleium_sensor" diff --git a/nsv13/code/game/machinery/computer/atmos_control.dm b/nsv13/code/game/machinery/computer/atmos_control.dm new file mode 100644 index 00000000000..223ec4566f1 --- /dev/null +++ b/nsv13/code/game/machinery/computer/atmos_control.dm @@ -0,0 +1,11 @@ +/obj/machinery/computer/atmos_control/tank/nucleium_tank //NSV added nucleium tank console + name = "Nucleium Supply Monitor" + input_tag = ATMOS_GAS_MONITOR_INPUT_NUCLEIUM + output_tag = ATMOS_GAS_MONITOR_OUTPUT_NUCLEIUM + sensors = list(ATMOS_GAS_MONITOR_SENSOR_NUCLEIUM = "Nucleium Tank") + circuit = /obj/item/circuitboard/computer/atmos_control/tank/nucleium_tank + +/obj/machinery/air_sensor/atmos/nucleium_tank //nucleium stuff + name = "nucleium tank gas sensor" + id_tag = ATMOS_GAS_MONITOR_SENSOR_NUCLEIUM + diff --git a/nsv13/code/game/objects/items/nsv_circuitboards.dm b/nsv13/code/game/objects/items/nsv_circuitboards.dm index 4465dee6c6d..d89894a974f 100644 --- a/nsv13/code/game/objects/items/nsv_circuitboards.dm +++ b/nsv13/code/game/objects/items/nsv_circuitboards.dm @@ -439,6 +439,12 @@ /obj/item/stack/sheet/glass = 1) needs_anchored = FALSE +//Atmospheric consoles +/obj/item/circuitboard/computer/atmos_control/tank/nucleium_tank + name = "nucleium supply control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/tank/nucleium_tank + +//Bot navbeacon /obj/item/circuitboard/machine/navbeacon name = "Bot Navigational Beacon" icon_state = "science" diff --git a/nsv13/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/nsv13/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm new file mode 100644 index 00000000000..5a372955b8a --- /dev/null +++ b/nsv13/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -0,0 +1,3 @@ +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nucleium_input + name = "nucleium tank input injector" + id = ATMOS_GAS_MONITOR_INPUT_NUCLEIUM diff --git a/nsv13/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/nsv13/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm new file mode 100644 index 00000000000..2c9f578581e --- /dev/null +++ b/nsv13/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -0,0 +1,3 @@ +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nucleium_output + name = "nucleium tank output inlet" + id_tag = ATMOS_GAS_MONITOR_OUTPUT_NUCLEIUM