Resolves conflicts.

This commit is contained in:
Desolate
2018-10-11 05:36:22 -05:00
486 changed files with 16260 additions and 10647 deletions
@@ -166,7 +166,7 @@
if(check_rights(R_EVENT, 0, C.mob))
fullmin_count++
if(fullmin_count)
ert_request_answered = 0
ert_request_answered = TRUE
ERT_Announce(ert_reason , event_triggered_by, 0)
ert_reason = "Reason for ERT"
feedback_inc("alert_keycard_auth_ert",1)