Merge pull request #10494 from phil235/CloggedScrubberFix

Fixes for clogged vent event and backpack preferences.
This commit is contained in:
Cheridan
2015-07-11 09:19:25 -05:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ var/global/list/frills_list = list()
var/global/list/spines_list = list()
var/global/list/animated_spines_list = list()
//Backpacks
var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel")
var/global/list/backbaglist = list("Backpack", "Satchel")
//Female Uniforms
var/global/list/female_clothing_icons = list()
+1 -1
View File
@@ -17,7 +17,7 @@
/datum/round_event/vent_clog/setup()
endWhen = rand(25, 100)
for(var/obj/machinery/atmospherics/unary/vent_scrubber/temp_vent in machines)
if(temp_vent.loc.z == ZLEVEL_STATION)
if(temp_vent.loc.z == ZLEVEL_STATION && !temp_vent.welded)
if(temp_vent.parent.other_atmosmch.len > 20)
vents += temp_vent
if(!vents.len)