From 63f3c0981d6c27954eec5ccdedd3c4e4083c2596 Mon Sep 17 00:00:00 2001 From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com> Date: Sun, 12 Jul 2020 13:59:01 +0100 Subject: [PATCH] Fixes drop airlock bolts button state for traitor borgs. (#9333) Fixes #9325 Traitor borgs could toggle state through the UI, but the greyed out button made it appear they could not. Button now properly changes to blue/green instead of grey, if your borg character is an antag. --- code/game/machinery/doors/airlock.dm | 2 ++ html/changelogs/disabled_button_fix.yml | 7 +++++++ vueui/src/components/view/misc/doors.vue | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/disabled_button_fix.yml diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index dff4eb62023..10336286e47 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -726,6 +726,8 @@ About the new airlock wires panel: VUEUI_SET_CHECK(data["elea"], electrified_at, ., data) var/isAI = issilicon(user) && !player_is_antag(user.mind) VUEUI_SET_CHECK(data["isai"], isAI, ., data) + var/isAdmin = check_rights(R_ADMIN) + VUEUI_SET_CHECK(data["isadmin"], isAdmin, ., data) VUEUI_SET_CHECK(data["idscan"], !aiDisabledIdScanner, ., data) VUEUI_SET_CHECK(data["bolts"], !locked, ., data) diff --git a/html/changelogs/disabled_button_fix.yml b/html/changelogs/disabled_button_fix.yml new file mode 100644 index 00000000000..ef3b71f099f --- /dev/null +++ b/html/changelogs/disabled_button_fix.yml @@ -0,0 +1,7 @@ +author: mikomyazaki + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +changes: + - bugfix: "A traitor AI/cyborg accessing an airlock UI will see the proper button state for dropping door bolts." \ No newline at end of file diff --git a/vueui/src/components/view/misc/doors.vue b/vueui/src/components/view/misc/doors.vue index 490a6470105..e0a26bcf36f 100644 --- a/vueui/src/components/view/misc/doors.vue +++ b/vueui/src/components/view/misc/doors.vue @@ -43,7 +43,7 @@ {{ c.et || 'Enabled' }} - {{ c.dt || 'Disabled' }} + {{ c.dt || 'Disabled' }}