shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6697 from Citadel-Station-13/upstream-merge-37718

Browse Source 
[MIRROR] Distinguish between DNA and ID when failing to enter a mech
This commit is contained in:
deathride58
2018-05-11 03:39:50 +00:00
committed by GitHub
parent 852d2a529e 259485811b
commit 19d09b4b2d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/game/mecha/mecha.dm
View File

@@ -812,16 +812,18 @@
to_chat(usr, "<span class='warning'>The [name] is already occupied!</span>")
log_append_to_last("Permission denied.")
return
var/passed
if(dna_lock)
var/passed = FALSE
if(user.has_dna())
var/mob/living/carbon/C = user
if(C.dna.unique_enzymes==dna_lock)
passed = 1
else if(operation_allowed(user))
passed = 1
if(!passed)
to_chat(user, "<span class='warning'>Access denied.</span>")
passed = TRUE
if (!passed)
to_chat(user, "<span class='warning'>Access denied. [name] is secured with a DNA lock.</span>")
log_append_to_last("Permission denied.")
return
if(!operation_allowed(user))
to_chat(user, "<span class='warning'>Access denied. Insufficient operation keycodes.</span>")
log_append_to_last("Permission denied.")
return
if(user.buckled)