Merge branch 'the-p-o-o-l' of https://github.com/Detective-Google/Citadel-Station-13 into the-p-o-o-l

2020-02-13 00:12:13 -06:00
parent b6cbb3f505 a8aa9ac24b
commit c34617d42a
2 changed files with 2 additions and 2 deletions
@@ -74,7 +74,7 @@
 /turf/open/pool/Exit(atom/movable/AM, atom/newloc)
 	if(!AM.has_gravity(src))
 		return ..()
-	if(isliving(AM) || istype(AM, /obj/structure))
+	if(isliving(AM) || isstructure(AM))
 		if(AM.throwing)
 			return ..()			//WHEEEEEEEEEEE
 		if(istype(AM, /obj/structure) && isliving(AM.pulledby))