Skip to content
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

Jump to bottom

Keycard authentication device now reqires two users to activate events #6903

Merged
merged 8 commits into from
Aug 16, 2024
Merged

Keycard authentication device now reqires two users to activate events #6903

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9676fa0
eh
uuuuhuuuu Jul 13, 2024
a184b87
Merge branch 'master' of https://github.com/cuberound/cmss13
uuuuhuuuu Jul 13, 2024
444b74c
ehm
uuuuhuuuu Jul 16, 2024
98fa1ae
Merge branch 'master' of https://github.com/cuberound/cmss13
uuuuhuuuu Jul 16, 2024
2a78285
ehm
uuuuhuuuu Jul 16, 2024
b412fdb
Merge branch 'cmss13-devs:master' into master
cuberound Jul 18, 2024
2cb6b76
adds line to reqire two diferent users
uuuuhuuuu Aug 8, 2024
ea363c3
ehm
uuuuhuuuu Aug 16, 2024
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
5 changes: 4 additions & 1 deletion code/modules/security_levels/keycard_authentication.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@
if(active == 1)
//This is not the device that made the initial request. It is the device confirming the request.
if(event_source)
if(event_source.event_triggered_by == user)
user.visible_message(SPAN_DANGER("Your ID is rejected, as it is the one that triggered the event!"))
return
event_source.confirmed = 1
event_source.event_confirmed_by = usr
event_source.event_confirmed_by = user
else if(screen == 2)
event_triggered_by = usr
broadcast_request() //This is the device making the initial event request. It needs to broadcast to other devices
Expand Down
Loading