Skip to content

Commit

Permalink
Revert firedoor change for TM
Browse files Browse the repository at this point in the history
  • Loading branch information
Bokkiewokkie committed Oct 11, 2024
1 parent ebe720f commit feaf9d6
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions code/game/machinery/doors/firedoor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,6 @@
opacity = FALSE
var/ini_dir


/obj/machinery/door/firedoor/border_only/Initialize(mapload, loc, set_dir)
. = ..()
if(set_dir)
Expand Down Expand Up @@ -529,17 +528,23 @@
leaving.Bump(src)
return COMPONENT_ATOM_BLOCK_EXIT

//NSV13 - npcs can into firelock
/obj/machinery/door/firedoor/border_only/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/caller)
if((welded || (machine_stat & NOPOWER)) && (dir == to_dir))
//NSV13 - knpcs can into firelock
/obj/machinery/door/firedoor/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/caller)
if(istype(caller) && (caller.pass_flags & pass_flags_self))
return TRUE
if(!density)
return TRUE
if(welded)
return FALSE
if(!hasPower())
return isknpc(caller)
return TRUE

/obj/machinery/door/firedoor/border_only/CanAtmosPass(turf/T)
if(get_dir(loc, T) == dir)
return !density
else
return TRUE
return 1
//NSV13 end

/obj/machinery/door/firedoor/heavy
Expand Down

0 comments on commit feaf9d6

Please sign in to comment.