Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm

code/game/objects/structures/inflatable.dm

@@ -34,12 +34,6 @@
 	update_nearby_tiles()
 	..()
 
-/obj/structure/inflatable/proc/update_nearby_tiles(need_rebuild) //Copypasta from airlock code
-	if(!air_master)
-		return 0
-	air_master.mark_for_update(get_turf(src))
-	return 1
-
 /obj/structure/inflatable/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	return 0
 
@@ -265,4 +259,4 @@
 		new /obj/item/inflatable(src)
 		new /obj/item/inflatable(src)
 		new /obj/item/inflatable(src)
-		new /obj/item/inflatable(src)
+		new /obj/item/inflatable(src)

code/game/objects/structures/mineral_doors.dm

@@ -154,12 +154,6 @@
 				CheckHardness()
 		return
 
-	proc/update_nearby_tiles(need_rebuild) //Copypasta from airlock code
-		if(!air_master)
-			return 0
-		air_master.mark_for_update(get_turf(src))
-		return 1
-
 /obj/structure/mineral_door/iron
 	mineralType = "metal"
 	hardness = 3

code/game/objects/structures/windoor_assembly.dm

@@ -295,11 +295,3 @@ obj/structure/windoor_assembly/Del()
 
 	update_icon()
 	return
-
-/obj/structure/windoor_assembly/proc/update_nearby_tiles(need_rebuild)
-	if(!air_master)
-		return 0
-
-	air_master.mark_for_update(loc)
-
-	return 1

code/game/objects/structures/window.dm

@@ -316,15 +316,6 @@
 	dir = ini_dir
 	update_nearby_tiles(need_rebuild=1)
 
-
-//This proc has to do with airgroups and atmos, it has nothing to do with smoothwindows, that's update_nearby_tiles().
-/obj/structure/window/proc/update_nearby_tiles(need_rebuild)
-	if(!air_master)
-		return 0
-	air_master.mark_for_update(get_turf(src))
-
-	return 1
-
 //checks if this window is full-tile one
 /obj/structure/window/proc/is_fulltile()
 	if(dir & (dir - 1))