From 6e9d73e792977d9a898f1323b0b9517ae2f255ed Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Sat, 20 Jun 2015 20:35:05 -0400
Subject: [PATCH] Fixes #9585

Allows objects with PASSTABLE to pass over beds and chairs. Moves
chempuff passflags up to the parent water effect.
---
 code/game/objects/effects/chem/water.dm                  | 2 +-
 code/game/objects/structures/stool_bed_chair_nest/bed.dm | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/effects/chem/water.dm b/code/game/objects/effects/chem/water.dm
index 1b2ac9bb39d..9b154645443 100644
--- a/code/game/objects/effects/chem/water.dm
+++ b/code/game/objects/effects/chem/water.dm
@@ -3,6 +3,7 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "extinguish"
 	mouse_opacity = 0
+	pass_flags = PASSTABLE | PASSGRILLE
 
 /obj/effect/effect/water/New(loc)
 	..()
@@ -53,4 +54,3 @@
 	name = "chemicals"
 	icon = 'icons/obj/chempuff.dmi'
 	icon_state = ""
-	pass_flags = PASSTABLE | PASSGRILLE
\ No newline at end of file
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 9b62a14ef4b..e99dc648bc9 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -61,6 +61,12 @@
 		name = "[material.display_name] [initial(name)]"
 		desc += " It's made of [material.use_name]."
 
+/obj/structure/bed/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(istype(mover) && mover.checkpass(PASSTABLE))
+		return 1
+	else
+		return ..()
+
 /obj/structure/bed/ex_act(severity)
 	switch(severity)
 		if(1.0)