cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix windoor autoclosing when valid mobs stand among dead mobs. (#31077)

Browse Source 
* Fix windoor autoclosing when valid mobs stand among dead mobs.

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Alan
2025-11-27 09:49:42 +00:00
committed by GitHub
co-authored by DGamerL
parent ce9e0fee9a
commit 80453f856d
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/windowdoor.dm
+10 -9
View File
@@ -85,21 +85,22 @@
/obj/machinery/door/window/proc/open_and_close()
open()
addtimer(CALLBACK(src, PROC_REF(check_close)), check_access(null) ? 5 SECONDS : 2 SECONDS)
delay_close()
/// Check whether or not this door can close, based on whether or not someone's standing in front of it holding it open
/obj/machinery/door/window/proc/check_close()
var/mob/living/blocker = locate(/mob/living) in get_turf(get_step(src, dir)) // check the facing turf
if(!blocker || blocker.stat || !allowed(blocker))
blocker = locate(/mob/living) in get_turf(src)
if(blocker && !blocker.stat && allowed(blocker))
// kick the can down the road, someone's holding the door.
addtimer(CALLBACK(src, PROC_REF(check_close)), check_access(null) ? 5 SECONDS : 2 SECONDS)
return
for(var/mob/living/blocker in get_step(src, dir))
if(blocker && !blocker.stat && allowed(blocker))
return delay_close()
for(var/mob/living/blocker in get_turf(src))
if(blocker && !blocker.stat && allowed(blocker))
return delay_close()
close()
/obj/machinery/door/window/proc/delay_close()
addtimer(CALLBACK(src, PROC_REF(check_close)), check_access(null) ? 5 SECONDS : 2 SECONDS)
/obj/machinery/door/window/Bumped(atom/movable/AM)
if(operating || !density)
return