cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into remove-weapons

Browse Source
This commit is contained in:
Fox McCloud
2018-04-19 17:01:38 -04:00
parent b3fa91030b ac5a276686
commit 2b25584372
25 changed files with 426 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
+2 -1
View File
@@ -67,7 +67,7 @@
update_icon()
update_underlays()
/obj/machinery/atmospherics/binary/build_network()
/obj/machinery/atmospherics/binary/build_network(remove_deferral = FALSE)
if(!parent1)
parent1 = new /datum/pipeline()
parent1.build_pipeline(src)
@@ -75,6 +75,7 @@
if(!parent2)
parent2 = new /datum/pipeline()
parent2.build_pipeline(src)
..()
/obj/machinery/atmospherics/binary/disconnect(obj/machinery/atmospherics/reference)
if(reference == node1)