Merge pull request tgstation#10494 from phil235/CloggedScrubberFix

Fixes for clogged vent event and backpack preferences.
new525 · Jul 11, 2015 · e0bbfba · e0bbfba
2 parents 70191b5 + e35c901
commit e0bbfba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
@@ -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()
 

diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
@@ -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)