cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes firedoors

Browse Source
This commit is contained in:
Katherine Kiefer
2022-05-23 19:46:20 +10:00
parent 768ec93e8e
commit 59336fc060
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,7 +231,6 @@
latetoggle() latetoggle()
/obj/machinery/door/firedoor/proc/whack_a_mole(reconsider_immediately = FALSE) /obj/machinery/door/firedoor/proc/whack_a_mole(reconsider_immediately = FALSE)
set waitfor = 0
for(var/cdir in GLOB.cardinals) for(var/cdir in GLOB.cardinals)
if((flags_1 & ON_BORDER_1) && cdir != dir) if((flags_1 & ON_BORDER_1) && cdir != dir)
continue continue
@@ -240,7 +239,6 @@
whack_a_mole_part(get_turf(src), reconsider_immediately) whack_a_mole_part(get_turf(src), reconsider_immediately)
/obj/machinery/door/firedoor/proc/whack_a_mole_part(turf/start_point, reconsider_immediately) /obj/machinery/door/firedoor/proc/whack_a_mole_part(turf/start_point, reconsider_immediately)
set waitfor = 0
var/list/doors_to_close = list() var/list/doors_to_close = list()
var/list/turfs = list() var/list/turfs = list()
turfs[start_point] = 1 turfs[start_point] = 1
@@ -284,6 +282,7 @@
if(world.time >= emergency_close_timer || !consider_timer) if(world.time >= emergency_close_timer || !consider_timer)
emergency_pressure_close() emergency_pressure_close()
//this is here to prevent sleeps from messing with decomp, by closing firedoors instantly
/obj/machinery/door/firedoor/proc/emergency_pressure_close() /obj/machinery/door/firedoor/proc/emergency_pressure_close()
if(density) if(density)
return return
@@ -298,7 +297,6 @@
if(!(flags_1 & ON_BORDER_1)) if(!(flags_1 & ON_BORDER_1))
crush() crush()
/obj/machinery/door/firedoor/deconstruct(disassembled = TRUE) /obj/machinery/door/firedoor/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1) && disassembled) if(!(flags_1 & NODECONSTRUCT_1) && disassembled)
var/obj/structure/firelock_frame/F = new assemblytype(get_turf(src)) var/obj/structure/firelock_frame/F = new assemblytype(get_turf(src))
@@ -334,6 +332,18 @@
return TRUE return TRUE
if(operating || welded) if(operating || welded)
return return
check_pulls()
. = ..()
/obj/machinery/door/firedoor/border_only/emergency_pressure_close()
if(density)
return TRUE
if(operating || welded)
return
check_pulls()
. = ..()
/obj/machinery/door/firedoor/border_only/check_pulls()
var/turf/T1 = get_turf(src) var/turf/T1 = get_turf(src)
var/turf/T2 = get_step(T1, dir) var/turf/T2 = get_step(T1, dir)
for(var/mob/living/M in T1) for(var/mob/living/M in T1)
@@ -351,7 +361,6 @@
to_chat(M, span_notice("You pull [M.pulling] through [src] right as it closes")) to_chat(M, span_notice("You pull [M.pulling] through [src] right as it closes"))
M.pulling.forceMove(T2) M.pulling.forceMove(T2)
M.start_pulling(M2) M.start_pulling(M2)
. = ..()
/obj/machinery/door/firedoor/border_only/allow_hand_open(mob/user) /obj/machinery/door/firedoor/border_only/allow_hand_open(mob/user)
var/area/A = get_area(src) var/area/A = get_area(src)