cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bitwise ops broken in caee8d45

Browse Source
This commit is contained in:
Chompstation Bot
2021-07-09 18:16:15 +00:00
parent 7304bde62e
commit db993cd583
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/_helpers/mobs.dm
View File

@@ -243,6 +243,16 @@ Proc for attack log creation, because really why not
if(exclusive) if(exclusive)
user.status_flags |= DOING_TASK 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 . = 1
while (world.time < endtime) while (world.time < endtime)
@@ -282,6 +292,14 @@ Proc for attack log creation, because really why not
if(exclusive) if(exclusive)
user.status_flags &= ~DOING_TASK 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) if(progbar)
qdel(progbar) qdel(progbar)