cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8191 from PsiOmegaDelta/NanoFix

Browse Source 
Fixes runtime in Topics() when called from non-NanoUI sources.
This commit is contained in:
Chinsky
2015-02-21 14:34:09 +03:00
parent f54c6e6ac4 89da19de8a
commit 4daf7161ad
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/objs.dm
View File

@@ -21,6 +21,9 @@
if(!nowindow && ..()) if(!nowindow && ..())
return 1 return 1
if(!custom_state)
custom_state = default_state
// In the far future no checks are made in an overriding Topic() beyond if(..()) return // In the far future no checks are made in an overriding Topic() beyond if(..()) return
// Instead any such checks are made in CanUseTopic() // Instead any such checks are made in CanUseTopic()
var/obj/host = nano_host() var/obj/host = nano_host()

2
code/modules/nano/nanointeraction.dm
View File

@@ -111,6 +111,8 @@
if(. == STATUS_UPDATE && (TK in mutations)) // If we have telekinesis and remain close enough, allow interaction. if(. == STATUS_UPDATE && (TK in mutations)) // If we have telekinesis and remain close enough, allow interaction.
return STATUS_INTERACTIVE return STATUS_INTERACTIVE
/var/global/datum/topic_state/default_state = new()
/datum/topic_state /datum/topic_state
var/flags = 0 var/flags = 0