first pass of cleaning up construction.dm + merge from upstream

This commit is contained in:
duncathan
2015-08-14 20:55:09 -06:00
parent 13b43cba87
commit d320c4c945
144 changed files with 77776 additions and 9886 deletions
+7 -3
View File
@@ -53,6 +53,9 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/proc/SetInitDirections()
return
/obj/machinery/atmospherics/proc/GetInitDirections()
return initialize_directions
/obj/machinery/atmospherics/proc/returnPipenet()
return
@@ -161,12 +164,10 @@ Pipelines + Other Objects -> Pipe network
return img
/obj/machinery/atmospherics/construction(D, P, pipe_type, obj_color)
dir = D
initialize_directions = P
if(can_unwrench)
color = obj_color
pipe_color = obj_color
stored.dir = D //need to define them here, because the obj directions...
stored.dir = src.dir //need to define them here, because the obj directions...
stored.pipe_type = pipe_type //... were not set at the time the stored pipe was created
stored.color = obj_color
var/turf/T = loc
@@ -196,6 +197,9 @@ Pipelines + Other Objects -> Pipe network
if(!(direction & initialize_directions)) //cant go this way.
return
if(buckled_mob == user) // fixes buckle ventcrawl edgecase fuck bug
return
var/obj/machinery/atmospherics/target_move = findConnecting(direction)
if(target_move)
if(is_type_in_list(target_move, ventcrawl_machinery) && target_move.can_crawl_through())
+3
View File
@@ -36,6 +36,9 @@
if(SOUTHWEST)
initialize_directions_he = SOUTH|WEST
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/GetInitDirections()
return ..() | initialize_directions_he
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/atmosinit()
normalize_dir()
var/N = 2