From 559eae16cd33af770524b2dbf583f687e7b36d64 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 10 Oct 2018 17:48:16 -0700 Subject: [PATCH 1/3] Fixes #9612 - ert panel not working for carbon mobs --- code/modules/nano/modules/ert_manager.dm | 2 +- code/modules/response_team/ert.dm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/nano/modules/ert_manager.dm b/code/modules/nano/modules/ert_manager.dm index 1d70157f079..080ed3d56ff 100644 --- a/code/modules/nano/modules/ert_manager.dm +++ b/code/modules/nano/modules/ert_manager.dm @@ -11,7 +11,7 @@ var/autoclose = 0 -/datum/nano_module/ert_manager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) +/datum/nano_module/ert_manager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = admin_state) ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(ui && autoclose) ui.close() diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index 8614df8135b..2f3e187ff11 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -34,8 +34,7 @@ var/ert_request_answered = FALSE return var/datum/nano_module/ert_manager/E = new() - E.ui_interact(usr) - + E.ui_interact(usr, state = admin_state) /mob/dead/observer/proc/JoinResponseTeam() if(!send_emergency_team) From 280ec3746b840d3d159c6ab8c852c781f686badf Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 10 Oct 2018 17:58:30 -0700 Subject: [PATCH 2/3] cleanup, better to use the default --- code/modules/response_team/ert.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index 2f3e187ff11..13e7fbba708 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -34,7 +34,7 @@ var/ert_request_answered = FALSE return var/datum/nano_module/ert_manager/E = new() - E.ui_interact(usr, state = admin_state) + E.ui_interact(usr) /mob/dead/observer/proc/JoinResponseTeam() if(!send_emergency_team) From 9cfee0afd528f737742a5a93914bcedd0f8d752d Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 10 Oct 2018 18:01:00 -0700 Subject: [PATCH 3/3] space --- code/modules/response_team/ert.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index 13e7fbba708..8614df8135b 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -36,6 +36,7 @@ var/ert_request_answered = FALSE var/datum/nano_module/ert_manager/E = new() E.ui_interact(usr) + /mob/dead/observer/proc/JoinResponseTeam() if(!send_emergency_team) to_chat(src, "No emergency response team is currently being sent.")