From db993cd5834b0126237bc0ab81b817970f3735d3 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Fri, 9 Jul 2021 18:16:15 +0000 Subject: [PATCH] Fix bitwise ops broken in caee8d45 --- code/_helpers/mobs.dm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/code/_helpers/mobs.dm b/code/_helpers/mobs.dm index dc5c92f708..66839f82ba 100644 --- a/code/_helpers/mobs.dm +++ b/code/_helpers/mobs.dm @@ -243,6 +243,16 @@ Proc for attack log creation, because really why not if(exclusive) user.status_flags |= DOING_TASK +<<<<<<< HEAD +||||||| parent of 21251d755c... Merge pull request #10996 from VOREStation/Arokha/fixbit + + if(target && exclusive & TASK_TARGET_EXCLUSIVE) + target.flags |= IS_BUSY +======= + + if(target && (exclusive & TASK_TARGET_EXCLUSIVE)) + target.flags |= IS_BUSY +>>>>>>> 21251d755c... Merge pull request #10996 from VOREStation/Arokha/fixbit . = 1 while (world.time < endtime) @@ -282,6 +292,14 @@ Proc for attack log creation, because really why not if(exclusive) user.status_flags &= ~DOING_TASK +<<<<<<< HEAD +||||||| parent of 21251d755c... Merge pull request #10996 from VOREStation/Arokha/fixbit + if(target & exclusive & TASK_TARGET_EXCLUSIVE) + target.flags &= ~IS_BUSY +======= + if(target && (exclusive & TASK_TARGET_EXCLUSIVE)) + target.flags &= ~IS_BUSY +>>>>>>> 21251d755c... Merge pull request #10996 from VOREStation/Arokha/fixbit if(progbar) qdel(progbar)