Skip to content

[MIRROR] [MIRROR] fix some doors not operating in parallel #3280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VoRe-bot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[MIRROR] [MIRROR] fix some doors not operating in parallel #3280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions code/game/machinery/door_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,21 @@
if(D.id_tag == id)
if(specialfunctions & OPEN)
if(D.density)
<<<<<<< HEAD

Check failure on line 100 in code/game/machinery/door_control.dm

View workflow job for this annotation

GitHub Actions / DreamChecker 

got '<<', expected one of: ';', '//!', '/*!', '/'
spawn(0)
D.open()
return
else
spawn(0)
D.close()
return
=======
D.open()
continue
D.close()
continue

>>>>>>> 83d2abea8f ([MIRROR] fix some doors not operating in parallel (#11771))
if(desiredstate == 1)
if(specialfunctions & IDSCAN)
D.set_idscan(0)
Expand All @@ -113,15 +121,16 @@
D.electrify(-1)
if(specialfunctions & SAFE)
D.set_safeties(0)
else
if(specialfunctions & IDSCAN)
D.set_idscan(1)
if(specialfunctions & BOLTS)
D.unlock()
if(specialfunctions & SHOCK)
D.electrify(0)
if(specialfunctions & SAFE)
D.set_safeties(1)
continue

if(specialfunctions & IDSCAN)
D.set_idscan(1)
if(specialfunctions & BOLTS)
D.unlock()
if(specialfunctions & SHOCK)
D.electrify(0)
if(specialfunctions & SAFE)
D.set_safeties(1)

#undef OPEN
#undef IDSCAN
Expand Down
Loading