From aa4a5bd510a426cef6bc51bfbba980edcd090150 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 6 Feb 2022 12:33:10 -0800 Subject: [PATCH] Merge pull request #8364 from Verkister/patch-83 Fixes inactive vr pods trapping occupant --- code/game/machinery/virtual_reality/vr_console.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index 694d08fa139..4a83de34d38 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -185,7 +185,8 @@ if(!forced && avatar && tgui_alert(avatar, "Someone wants to remove you from virtual reality. Do you want to leave?", "Leave VR?", list("Yes", "No")) == "No") return - avatar.exit_vr() + if(avatar) + avatar.exit_vr() avatar = null if(occupant.client)