cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes depowered doors not being able to be closed

Browse Source
This commit is contained in:
GinjaNinja32
2015-03-23 23:25:58 +00:00
parent d518df1076
commit 89bbfbcfad
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/game/machinery/doors/airlock.dm
View File

@@ -844,19 +844,20 @@ About the new airlock wires panel:
return 0 return 0
return ..() return ..()
/obj/machinery/door/airlock/can_close(var/forced) /obj/machinery/door/airlock/can_close()
if(locked || welded) if(locked || welded)
return 0 return 0
if(!forced)
//despite the name, this wire is for general door control.
//Bolts are already covered by the check for locked, above
if(!arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_OPEN_DOOR))
return 0
return ..() return ..()
/obj/machinery/door/airlock/close(var/forced=0) /obj/machinery/door/airlock/close(var/forced=0)
if(!can_close(forced)) if(!can_close())
return return 0
if(!forced)
//despite the name, this wire is for general door control.
//Bolts are already covered by the check for locked in can_close()
if(!arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_OPEN_DOOR))
return 0
if(safe) if(safe)
for(var/turf/turf in locs) for(var/turf/turf in locs)

8
code/game/machinery/doors/door.dm
View File

@@ -88,10 +88,10 @@
return 0 return 0
return 1 return 1
/obj/machinery/door/proc/can_close(var/forced = 0) /obj/machinery/door/proc/can_close()
if(!density && !operating && !(!forced && (stat & (BROKEN|NOPOWER)))) if(density || operating || !ticker)
return 1 return 0
return 0 return 1
/obj/machinery/door/Bumped(atom/AM) /obj/machinery/door/Bumped(atom/AM)
if(p_open || operating) return if(p_open || operating) return