cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/game/machinery/computer/shuttle.dm
#	code/game/machinery/doors/firedoor.dm
#	code/game/objects/items/weapons/weaponry.dm
#	code/modules/admin/admin_attack_log.dm
#	code/modules/admin/admin_verbs.dm
This commit is contained in:
skull132
2017-05-27 20:11:54 +03:00
parent 9b80bce9ab fd6a8305a5
commit 22c7748336
34 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/security levels/keycard authentication.dm
+3 -3
View File
@@ -122,7 +122,7 @@
confirmed = 0
trigger_event(event)
log_game("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]",ckey=key_name(event_triggered_by),ckey_target=key_name(event_confirmed_by))
message_admins("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]", 1)
message_admins("[key_name_admin(event_triggered_by)] triggered and [key_name_admin(event_confirmed_by)] confirmed event [event]", 1)
reset()
/obj/machinery/keycard_auth/proc/receive_request(var/obj/machinery/keycard_auth/source)
@@ -153,10 +153,10 @@
feedback_inc("alert_keycard_auth_maintRevoke",1)
if("Cyborg Crisis Override")
cyborg_crisis_override()
feedback_inc("alert_keycard_auth_borgCrisis",1)
feedback_inc("alert_keycard_auth_borgCrisis",1)
if("Disable Cyborg Crisis Override")
disable_cyborg_crisis_override()
feedback_inc("alert_keycard_auth_borgDisable",1)
feedback_inc("alert_keycard_auth_borgDisable",1)
if("Emergency Response Team")
if(is_ert_blocked())
usr << "<span class='warning'>All emergency response teams are dispatched and can not be called at this time.</span>"