diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 1b2c50fb636..19d827640f2 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -118,7 +118,7 @@ proc/increment_ert_chance() proc/trigger_armed_response_team(var/force = 0) - if(!can_call_ert) + if(!can_call_ert && !force) return if(send_emergency_team) return diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index b36a1772be7..ae66ba5f5d1 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -69,8 +69,8 @@ if(screen == 1) dat += "Select an event to trigger:" user << browse(dat, "window=keycard_auth;size=500x250") if(screen == 2) @@ -147,7 +147,7 @@ if("Emergency Maintenance Access") make_maint_all_access() feedback_inc("alert_keycard_auth_maint",1) - if("Emergency Rescue Team") // DEC + if("Emergency Rescue Team") trigger_armed_response_team(1) feedback_inc("alert_keycard_auth_ert",1)