diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 9b9b41ce6ee..9f042f28633 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -1250,16 +1250,8 @@ return /obj/machinery/atmospherics/pipe/layer_adapter/relaymove(mob/living/user, direction) - if(!(direction & initialize_directions)) //can't go in a way we aren't connecting to - var/on_offset_layer = user.ventcrawl_layer == layer_node.piping_layer - - on_offset_layer = !on_offset_layer - - if(on_offset_layer) - user.ventcrawl_layer = layer_node.piping_layer - else - user.ventcrawl_layer = mid_node.piping_layer - user << "You align yourself with the [user.ventcrawl_layer]\th layer." // ???? - return 1 - else + // Autoset layer + if(direction & initialize_directions) + user.ventcrawl_layer = (direction == dir) ? PIPING_LAYER_DEFAULT : piping_layer + user << "You are redirected into the [user.ventcrawl_layer]\th piping layer." return ..() \ No newline at end of file diff --git a/html/changelogs/N3X15.yml b/html/changelogs/N3X15.yml index 9f2be35458a..94071cc9eb3 100644 --- a/html/changelogs/N3X15.yml +++ b/html/changelogs/N3X15.yml @@ -1,2 +1,3 @@ author: N3X15 -changes: [] +changes: + - bugfix: Ventcrawling works properly across piping layer adapters.