Skip to content

Commit df961ff

Browse files
Makes arcane tampered doors only link on current z-level (#37273)
* the nerf in question, if needed * nother thing * cleanup * yea...
1 parent 62a33cb commit df961ff

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

code/game/machinery/doors/door.dm

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -393,11 +393,15 @@ var/list/all_doors = list()
393393

394394
/obj/machinery/door/arcane_act(mob/user)
395395
..()
396-
if(!(flow_flags & ON_BORDER) && arcane_linkable())
397-
while(!arcane_linked_door || arcane_linked_door == src || !arcane_linked_door.arcane_linkable())
398-
arcane_linked_door = pick(all_doors)
399-
arcane_linked_door.arcanetampered = arcanetampered
400-
arcane_linked_door.arcane_linked_door = src
396+
if(arcane_linkable() && all_doors.len > 1)
397+
var/list/door_selection = all_doors.Copy()
398+
while(!arcane_linked_door || arcane_linked_door == src || arcane_linked_door.z != src.z || !arcane_linked_door.arcane_linkable())
399+
arcane_linked_door = pick_n_take(door_selection)
400+
if(!door_selection.len)
401+
break
402+
if(arcane_linked_door)
403+
arcane_linked_door.arcanetampered = arcanetampered
404+
arcane_linked_door.arcane_linked_door = src
401405
return "D'R ST'K!"
402406

403407
/obj/machinery/door/proc/arcane_linkable()

0 commit comments

Comments
 (0)