Merge pull request #34891 from YPOQ/closesoundfix

Fixes airlocks playing closing sound while already closed
This commit is contained in:
Jordan Brown
2018-01-26 03:00:00 -06:00
committed by CitadelStationBot
parent 0c86312618
commit fc5cf12523
2 changed files with 4 additions and 6 deletions
+2 -2
View File
@@ -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
+2 -4
View File
@@ -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))