cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +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/atmospherics.dm
+5 -3
View File
@@ -57,6 +57,7 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/Destroy()
QDEL_NULL(stored)
SSair.atmos_machinery -= src
SSair.deferred_pipenet_rebuilds -= src
for(var/mob/living/L in src) //ventcrawling is serious business
L.remove_ventcrawl()
L.forceMove(get_turf(src))
@@ -143,12 +144,13 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/proc/replacePipenet()
return
/obj/machinery/atmospherics/proc/build_network()
/obj/machinery/atmospherics/proc/build_network(remove_deferral = FALSE)
// Called to build a network from this node
return
if(remove_deferral)
SSair.deferred_pipenet_rebuilds -= src
/obj/machinery/atmospherics/proc/defer_build_network()
deferred_pipenet_rebuilds += src
SSair.deferred_pipenet_rebuilds += src
/obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference)
return
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)
code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+2 -1
View File
@@ -237,11 +237,12 @@
return
// Pipenet procs
/obj/machinery/atmospherics/omni/build_network()
/obj/machinery/atmospherics/omni/build_network(remove_deferral = FALSE)
for(var/datum/omni_port/P in ports)
if(!P.parent)
P.parent = new /datum/pipeline()
P.parent.build_pipeline(src)
..()
/obj/machinery/atmospherics/omni/disconnect(obj/machinery/atmospherics/reference)
for(var/datum/omni_port/P in ports)
code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
+2 -1
View File
@@ -104,7 +104,7 @@
update_icon()
update_underlays()
/obj/machinery/atmospherics/trinary/build_network()
/obj/machinery/atmospherics/trinary/build_network(remove_deferral = FALSE)
if(!parent1)
parent1 = new /datum/pipeline()
parent1.build_pipeline(src)
@@ -116,6 +116,7 @@
if(!parent3)
parent3 = new /datum/pipeline()
parent3.build_pipeline(src)
..()
/obj/machinery/atmospherics/trinary/disconnect(obj/machinery/atmospherics/reference)
if(reference == node1)
code/ATMOSPHERICS/components/unary_devices/unary_base.dm
+2 -1
View File
@@ -50,10 +50,11 @@
build_network()
. = 1
/obj/machinery/atmospherics/unary/build_network()
/obj/machinery/atmospherics/unary/build_network(remove_deferral = FALSE)
if(!parent)
parent = new /datum/pipeline()
parent.build_pipeline(src)
..()
/obj/machinery/atmospherics/unary/disconnect(obj/machinery/atmospherics/reference)
if(reference == node)
code/ATMOSPHERICS/datum_pipeline.dm
-2
View File
@@ -1,5 +1,3 @@
var/global/list/deferred_pipenet_rebuilds = list()
/datum/pipeline
var/datum/gas_mixture/air
var/list/datum/gas_mixture/other_airs = list()
code/ATMOSPHERICS/pipes/pipe.dm
+2 -1
View File
@@ -66,10 +66,11 @@
return 0
return parent.air
/obj/machinery/atmospherics/pipe/build_network()
/obj/machinery/atmospherics/pipe/build_network(remove_deferral = FALSE)
if(!parent)
parent = new /datum/pipeline()
parent.build_pipeline(src)
..()
/obj/machinery/atmospherics/pipe/setPipenet(datum/pipeline/P)
parent = P