Fixes a bug involving a map template resetting the map loader's

progress
This commit is contained in:
Crazylemon64
2016-07-06 22:51:48 -07:00
parent 2ca2397e69
commit 1745c71474
13 changed files with 111 additions and 48 deletions
+2 -2
View File
@@ -32,6 +32,8 @@ Pipelines + Other Objects -> Pipe network
var/global/datum/pipe_icon_manager/icon_manager
/obj/machinery/atmospherics/New()
..()
if(!icon_manager)
icon_manager = new()
@@ -42,8 +44,6 @@ Pipelines + Other Objects -> Pipe network
if(!pipe_color_check(pipe_color))
pipe_color = null
..()
/obj/machinery/atmospherics/initialize()
..()
@@ -60,13 +60,13 @@
icon_state = "map_vent_in"
/obj/machinery/atmospherics/unary/vent_pump/New()
..()
icon = null
initial_loc = get_area(loc)
area_uid = initial_loc.uid
if (!id_tag)
assign_uid()
id_tag = num2text(uid)
..()
/obj/machinery/atmospherics/unary/vent_pump/high_volume
name = "large air vent"
@@ -41,13 +41,13 @@
connect_types = list(1,3) //connects to regular and scrubber pipes
/obj/machinery/atmospherics/unary/vent_scrubber/New()
..()
icon = null
initial_loc = get_area(loc)
area_uid = initial_loc.uid
if (!id_tag)
assign_uid()
id_tag = num2text(uid)
..()
/obj/machinery/atmospherics/unary/vent_scrubber/Destroy()
if(initial_loc && frequency == 1439)
-2
View File
@@ -33,7 +33,6 @@ var/global/list/deferred_pipenet_rebuilds = list()
var/pipenetwarnings = 10
var/pipenets_made = 0
/datum/pipeline/proc/build_pipeline(obj/machinery/atmospherics/base)
var/volume = 0
if(istype(base, /obj/machinery/atmospherics/pipe))
@@ -48,7 +47,6 @@ var/pipenets_made = 0
addMachineryMember(base)
if(!air)
air = new
// log_startup_progress("Making pipenet [pipenets_made++]")
var/list/possible_expansions = list(base)
while(possible_expansions.len>0)
for(var/obj/machinery/atmospherics/borderline in possible_expansions)