Merge pull request #5108 from Citadel-Station-13/upstream-merge-34891

[MIRROR] Fixes airlocks playing closing sound while already closed

code/game/machinery/doors/airlock.dm

@@ -1087,6 +1087,8 @@
 /obj/machinery/door/airlock/close(forced=0)
 	if(operating || welded || locked)
 		return
+	if(density)
+		return TRUE
 	if(!forced)
 		if(!hasPower() || wires.is_cut(WIRE_BOLTS))
 			return
@@ -1108,8 +1110,6 @@
 	if(killthis)
 		killthis.ex_act(EXPLODE_HEAVY)//Smashin windows
 
-	if(density)
-		return TRUE
 	operating = TRUE
 	update_icon(AIRLOCK_CLOSING, 1)
 	layer = CLOSED_DOOR_LAYER

code/game/machinery/doors/door.dm

@@ -268,10 +268,8 @@
 
 /obj/machinery/door/proc/close()
 	if(density)
-		return 1
-	if(operating)
-		return
-	if(welded)
+		return TRUE
+	if(operating || welded)
 		return
 	if(safe)
 		for(var/atom/movable/M in get_turf(src))