Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Snake atmospherics fixes #2513

Merged
merged 12 commits into from
Sep 21, 2023
Merged

Snake atmospherics fixes #2513

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b2ecf0d
first push
bruhlookatthisdood Aug 11, 2023
0b6d2c6
fix
bruhlookatthisdood Aug 11, 2023
d8ef03a
give it their own objects
bruhlookatthisdood Aug 11, 2023
10a2b70
oopsies
bruhlookatthisdood Aug 11, 2023
88faf09
wtf
bruhlookatthisdood Aug 11, 2023
313a7b4
Update snake_lower.dmm
bruhlookatthisdood Aug 11, 2023
e6abb69
alright i fixed my mistake woopsie
bruhlookatthisdood Aug 11, 2023
f97fd1c
moves some stuff
bruhlookatthisdood Aug 14, 2023
014d465
Merge branch 'master' into snake-atmos-changes
bruhlookatthisdood Aug 14, 2023
504b2a4
some stuff
bruhlookatthisdood Aug 14, 2023
829efef
mapping 2.0
bruhlookatthisdood Aug 14, 2023
ed8900e
Merge remote-tracking branch 'upstream/master' into snake-atmos-changes
bruhlookatthisdood Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 49 additions & 26 deletions _maps/map_files/Snake/snake_lower.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions code/__DEFINES/atmospherics.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,10 @@
#define ATMOS_GAS_MONITOR_OUTPUT_TOXINS_LAB "toxinslab_out"
#define ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB "toxinslab_sensor"

#define ATMOS_GAS_MONITOR_INPUT_NUCLEIUM "nucleium_in" //NSV nucleium gas tank
#define ATMOS_GAS_MONITOR_OUTPUT_NUCLEIUM "nucleium_out"
#define ATMOS_GAS_MONITOR_SENSOR_NUCLEIUM "nucleium_sensor"

bruhlookatthisdood marked this conversation as resolved.
Show resolved Hide resolved
#define ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION "distro-loop_meter"
#define ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE "atmos-waste_loop_meter"

Expand Down
10 changes: 10 additions & 0 deletions code/game/machinery/computer/atmos_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
/obj/machinery/air_sensor/atmos/sm_core
name = "supermatter gas sensor"
id_tag = ATMOS_GAS_MONITOR_SENSOR_SM
/obj/machinery/air_sensor/atmos/nucleium_tank //nucleium stuff
name = "nucleium tank gas sensor"
id_tag = ATMOS_GAS_MONITOR_SENSOR_NUCLEIUM
bruhlookatthisdood marked this conversation as resolved.
Show resolved Hide resolved

/obj/machinery/air_sensor/update_icon()
icon_state = "gsensor[on]"
Expand Down Expand Up @@ -257,6 +260,13 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
sensors = list(ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB = "Toxins Mixing Chamber")
circuit = /obj/item/circuitboard/computer/atmos_control/tank/incinerator

/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

// This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this
/obj/machinery/computer/atmos_control/tank/proc/reconnect(mob/user)
var/list/IO = list()
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/items/circuitboards/computer_circuitboards.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@
name = "incinerator air control (Computer Board)"
build_path = /obj/machinery/computer/atmos_control/tank/incinerator

/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
bruhlookatthisdood marked this conversation as resolved.
Show resolved Hide resolved
/obj/item/circuitboard/computer/auxillary_base
name = "auxillary base management console (Computer Board)"
icon_state = "engineering"
Expand Down
3 changes: 3 additions & 0 deletions code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,3 +254,6 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input
name = "toxins mixing input injector"
id = ATMOS_GAS_MONITOR_INPUT_TOXINS_LAB
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nucleium_input
name = "nucleium tank input injector"
id = ATMOS_GAS_MONITOR_INPUT_NUCLEIUM
bruhlookatthisdood marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,9 @@
name = "toxins mixing output inlet"
id_tag = ATMOS_GAS_MONITOR_OUTPUT_TOXINS_LAB
frequency = FREQ_ATMOS_CONTROL
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nucleium_output //NSV nucleium tank
name = "nucleium tank output inlet"
id_tag = ATMOS_GAS_MONITOR_OUTPUT_NUCLEIUM
bruhlookatthisdood marked this conversation as resolved.
Show resolved Hide resolved

/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2
piping_layer = 2
Expand Down
Loading