From de10a5b2236dbe9272b361801a8d09e121fcc183 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Dec 2017 13:32:53 -0600 Subject: [PATCH] Update spider_infestation.dm --- code/modules/events/spider_infestation.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 70ee38c93f..a3c625e396 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -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