Rewrites Atmospherics

code/game/objects/effects/alien/aliens.dm

@@ -26,6 +26,7 @@
 	density = 1
 	opacity = 1
 	anchored = 1
+	can_atmos_pass = ATMOS_PASS_NO
 	var/health = 200
 	//var/mob/living/affecting = null
 
@@ -128,8 +129,7 @@
 	..()
 	return
 
-/obj/effect/alien/resin/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
-	if(air_group) return 0
+/obj/effect/alien/resin/CanPass(atom/movable/mover, turf/target)
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return !opacity
 	return !density

code/game/objects/effects/chem/foam.dm

@@ -130,6 +130,7 @@
 	anchored = 1
 	name = "foamed metal"
 	desc = "A lightweight foamed metal wall."
+	can_atmos_pass = ATMOS_PASS_NO
 	var/metal = 1 // 1 = aluminum, 2 = iron
 
 /obj/structure/foamedmetal/New()
@@ -178,8 +179,3 @@
 		qdel(src)
 	else
 		user << "<span class='notice'>You hit the metal foam to no effect.</span>"
-
-/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0)
-	if(air_group)
-		return 0
-	return !density

code/game/objects/effects/spiders.dm

@@ -62,17 +62,23 @@
 		icon_state = "stickyweb2"
 	return ..()
 
+<<<<<<< HEAD
 /obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(air_group || (height==0)) return 1
 	if(istype(mover, /mob/living/simple_mob/animal/giant_spider))
 		return 1
+=======
+/obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target)
+	if(istype(mover, /mob/living/simple_mob/animal/giant_spider))
+		return TRUE
+>>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
 	else if(istype(mover, /mob/living))
 		if(prob(50))
-			mover << "<span class='warning'>You get stuck in \the [src] for a moment.</span>"
-			return 0
+			to_chat(mover, span("warning", "You get stuck in \the [src] for a moment."))
+			return FALSE
 	else if(istype(mover, /obj/item/projectile))
 		return prob(30)
-	return 1
+	return TRUE
 
 /obj/effect/spider/eggcluster
 	name = "egg cluster"

code/game/objects/effects/zone_divider.dm

@@ -8,13 +8,12 @@
 	density = 0
 	opacity = 0
 
-/obj/effect/zone_divider/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/obj/effect/zone_divider/CanZASPass(turf/T, is_zone)
  	// Special case to prevent us from being part of a zone during the first air master tick.
  	// We must merge ourselves into a zone on next tick.  This will cause a bit of lag on
  	// startup, but it can't really be helped you know?
 	if(air_master && air_master.current_cycle == 0)
 		spawn(1)
 			air_master.mark_for_update(get_turf(src))
-		return 0
-	return !air_group // Anything except zones can pass
-
+		return ATMOS_PASS_NO
+	return is_zone ? ATMOS_PASS_NO : ATMOS_PASS_YES // Anything except zones can pass