mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 11:13:16 +00:00
Merge pull request #8191 from PsiOmegaDelta/NanoFix
Fixes runtime in Topics() when called from non-NanoUI sources.
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user