From e35c901af2be49ace1d2f2e07645a9fbaf488939 Mon Sep 17 00:00:00 2001 From: phil235 Date: Thu, 9 Jul 2015 20:28:28 +0200 Subject: [PATCH] Fixes The clogged vent event making smoke spawn on welded scrubbers. Removes the problematic preference option to spawn without backpack (just drop your backpack after you spawn). --- code/_globalvars/lists/flavor_misc.dm | 2 +- code/modules/events/vent_clog.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 752dc718e94..df39c500d7f 100644 --- 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 index 6a9fcf140e5..bba97ba8b00 100644 --- 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)