Merge pull request #4514 from VOREStation/vplk-extra-atmos-machinery

Updates misc atmospherics machinery init and destroy
This commit is contained in:
Neerti
2018-01-10 18:35:51 -05:00
committed by GitHub
3 changed files with 13 additions and 19 deletions
@@ -14,11 +14,9 @@
//Simple variable to prevent me from doing attack_hand in both this and the child computer
var/zone = "This computer is working on a wireless range, the range is currently limited to 25 meters."
New()
..()
//So the scrubbers have time to spawn
spawn(10)
scanscrubbers()
initialize()
. = ..()
scanscrubbers()
attack_ai(var/mob/user as mob)
return src.attack_hand(user)
+3 -10
View File
@@ -30,16 +30,9 @@
var/turf/T = src.loc
T.contents += contents
if(beaker)
beaker.loc = get_step(src.loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube
..()
/obj/machinery/atmospherics/unary/cryo_cell/initialize()
if(node) return
var/node_connect = dir
for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
if(target.initialize_directions & get_dir(target,src))
node = target
break
beaker.forceMove(get_step(loc, SOUTH)) //Beaker is carefully ejected from the wreckage of the cryotube
beaker = null
. = ..()
/obj/machinery/atmospherics/unary/cryo_cell/process()
..()
+7 -4
View File
@@ -26,8 +26,11 @@ obj/machinery/atmospherics/pipe/zpipe
level = 1
obj/machinery/atmospherics/pipe/zpipe/New()
/obj/machinery/atmospherics/pipe/zpipe/New()
..()
init_dir()
/obj/machinery/atmospherics/pipe/zpipe/init_dir()
switch(dir)
if(SOUTH)
initialize_directions = SOUTH
@@ -91,7 +94,7 @@ obj/machinery/atmospherics/pipe/zpipe/Destroy()
node1.disconnect(src)
if(node2)
node2.disconnect(src)
..()
. = ..()
obj/machinery/atmospherics/pipe/zpipe/pipeline_expansion()
return list(node1, node2)
@@ -122,7 +125,7 @@ obj/machinery/atmospherics/pipe/zpipe/up
name = "upwards pipe"
desc = "A pipe segment to connect upwards."
obj/machinery/atmospherics/pipe/zpipe/up/initialize()
obj/machinery/atmospherics/pipe/zpipe/up/atmos_init()
normalize_dir()
var/node1_dir
@@ -160,7 +163,7 @@ obj/machinery/atmospherics/pipe/zpipe/down
name = "downwards pipe"
desc = "A pipe segment to connect downwards."
obj/machinery/atmospherics/pipe/zpipe/down/initialize()
obj/machinery/atmospherics/pipe/zpipe/down/atmos_init()
normalize_dir()
var/node1_dir