Merge branch 'master' of https://github.com/PolarisSS13/Polaris into make_ai_great_again

code/game/objects/structures/crates_lockers/closets/fireaxe.dm

@@ -16,6 +16,10 @@
 
 	starts_with = list(/obj/item/weapon/material/twohanded/fireaxe)
 
+/obj/structure/closet/fireaxecabinet/New()
+	..()
+	fireaxe = locate() in contents
+
 /obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
 	//..() //That's very useful, Erro
 
@@ -115,6 +119,7 @@
 	if(src.locked)
 		to_chat(user, "<span class='warning'>The cabinet won't budge!</span>")
 		return
+
 	if(localopened)
 		if(fireaxe)
 			user.put_in_hands(fireaxe)

code/game/objects/structures/flora/trees.dm

@@ -4,7 +4,8 @@
 	anchored = 1
 	density = 1
 	pixel_x = -16
-	layer = MOB_LAYER // You know what, let's play it safe.
+	plane = MOB_LAYER // You know what, let's play it safe.
+	layer = ABOVE_MOB_LAYER
 	var/base_state = null	// Used for stumps.
 	var/health = 200		// Used for chopping down trees.
 	var/max_health = 200

code/game/objects/structures/plasticflaps.dm

@@ -0,0 +1,78 @@
+/obj/structure/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY
+	name = "\improper plastic flaps"
+	desc = "Completely impassable - or are they?"
+	icon = 'icons/obj/stationobjs.dmi' //Change this.
+	icon_state = "plasticflaps"
+	density = 0
+	anchored = 1
+	layer = MOB_LAYER
+	plane = MOB_PLANE
+	explosion_resistance = 5
+	var/list/mobs_can_pass = list(
+		/mob/living/bot,
+		/mob/living/simple_animal/slime,
+		/mob/living/simple_animal/mouse,
+		/mob/living/silicon/robot/drone
+		)
+
+/obj/structure/plasticflaps/attackby(obj/item/P, mob/user)
+	if(istype(P, /obj/item/weapon/wirecutters))
+		playsound(src, P.usesound, 50, 1)
+		user << "<span class='notice'>You start to cut the plastic flaps.</span>"
+		if(do_after(user, 10 * P.toolspeed))
+			user << "<span class='notice'>You cut the plastic flaps.</span>"
+			var/obj/item/stack/material/plastic/A = new /obj/item/stack/material/plastic( src.loc )
+			A.amount = 4
+			qdel(src)
+		return
+	else
+		return
+
+/obj/structure/plasticflaps/CanPass(atom/A, turf/T)
+	if(istype(A) && A.checkpass(PASSGLASS))
+		return prob(60)
+
+	var/obj/structure/bed/B = A
+	if (istype(A, /obj/structure/bed) && B.has_buckled_mobs())//if it's a bed/chair and someone is buckled, it will not pass
+		return 0
+
+	if(istype(A, /obj/vehicle)) //no vehicles
+		return 0
+
+	var/mob/living/M = A
+	if(istype(M))
+		if(M.lying)
+			return ..()
+		for(var/mob_type in mobs_can_pass)
+			if(istype(A, mob_type))
+				return ..()
+		return issmall(M)
+
+	return ..()
+
+/obj/structure/plasticflaps/ex_act(severity)
+	switch(severity)
+		if (1)
+			qdel(src)
+		if (2)
+			if (prob(50))
+				qdel(src)
+		if (3)
+			if (prob(5))
+				qdel(src)
+
+/obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates
+	name = "airtight plastic flaps"
+	desc = "Heavy duty, airtight, plastic flaps."
+
+/obj/structure/plasticflaps/mining/New() //set the turf below the flaps to block air
+	var/turf/T = get_turf(loc)
+	if(T)
+		T.blocks_air = 1
+	..()
+
+/obj/structure/plasticflaps/mining/Destroy() //lazy hack to set the turf to allow air to pass if it's a simulated floor
+	var/turf/T = get_turf(loc)
+	if(T && istype(T, /turf/simulated/floor))
+		T.blocks_air = 0
+	..()