Update spider_infestation.dm

2017-12-30 13:32:53 -06:00
parent f698fd5329
commit de10a5b223
1 changed files with 0 additions and 5 deletions
@@ -22,13 +22,8 @@
 /datum/round_event/spider_infestation/start()
 	var/list/vents = list()
 	for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in world)
-<<<<<<< HEAD
-		if((temp_vent.loc.z in GLOB.station_z_levels) && !temp_vent.welded)
-			var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1
-=======
 		if(is_station_level(temp_vent.loc.z) && !temp_vent.welded)
 			var/datum/pipeline/temp_vent_parent = temp_vent.parents[1]
->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829)
 			if(temp_vent_parent.other_atmosmch.len > 20)
 				vents += temp_vent