From 10643a192e0087fab8aee98064e043d04df24063 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Dec 2017 13:33:01 -0600 Subject: [PATCH] Update vent_clog.dm --- code/modules/events/vent_clog.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 4555588389..5e91160575 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -19,13 +19,8 @@ /datum/round_event/vent_clog/setup() endWhen = rand(25, 100) for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines) -<<<<<<< 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 if(!vents.len)