From 94c572c854aff3fc8b7effa29e2805d3711499ac Mon Sep 17 00:00:00 2001 From: HowToLoLu Date: Wed, 20 Sep 2023 22:40:49 -0500 Subject: [PATCH 1/2] What was this if statement even... --- code/_onclick/adjacent.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index a7bce5c9253a5..d6bcbbbab0d99 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -96,7 +96,7 @@ continue //If there's a dense object on the turf, only allow the click to pass if you can throw items over it or it has a special flag. - if(O == target || O == mover || (O.pass_flags_self & LETPASSTHROW|LETPASSCLICKS)) + if(O.pass_flags_self & (LETPASSTHROW|LETPASSCLICKS)) continue // LETPASSTHROW is used for anything you can click through (or the firedoor special case, see above) if( O.flags_1&ON_BORDER_1) // windows are on border, check them first From c5e7670a30df9af306362e9652d639c643d7b3e9 Mon Sep 17 00:00:00 2001 From: HowToLoLu Date: Wed, 20 Sep 2023 22:52:00 -0500 Subject: [PATCH 2/2] Forgot to put these back- whoops --- code/_onclick/adjacent.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index d6bcbbbab0d99..7630558857570 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -96,7 +96,7 @@ continue //If there's a dense object on the turf, only allow the click to pass if you can throw items over it or it has a special flag. - if(O.pass_flags_self & (LETPASSTHROW|LETPASSCLICKS)) + if(O == target || O == mover || (O.pass_flags_self & (LETPASSTHROW|LETPASSCLICKS))) continue // LETPASSTHROW is used for anything you can click through (or the firedoor special case, see above) if( O.flags_1&ON_BORDER_1) // windows are on border, check them first