From 89da19de8a523ea2360214486a9ab545c127d9bb Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 21 Feb 2015 10:32:02 +0100 Subject: [PATCH] Fixes runtime in Topics() when called from non-NanoUI sources. --- code/game/objects/objs.dm | 3 +++ code/modules/nano/nanointeraction.dm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index b67ce9023e9..518d6155528 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -21,6 +21,9 @@ if(!nowindow && ..()) return 1 + if(!custom_state) + custom_state = default_state + // In the far future no checks are made in an overriding Topic() beyond if(..()) return // Instead any such checks are made in CanUseTopic() var/obj/host = nano_host() diff --git a/code/modules/nano/nanointeraction.dm b/code/modules/nano/nanointeraction.dm index 09b46eb30e1..c8dfa630d67 100644 --- a/code/modules/nano/nanointeraction.dm +++ b/code/modules/nano/nanointeraction.dm @@ -111,6 +111,8 @@ if(. == STATUS_UPDATE && (TK in mutations)) // If we have telekinesis and remain close enough, allow interaction. return STATUS_INTERACTIVE +/var/global/datum/topic_state/default_state = new() + /datum/topic_state var/flags = 0