cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-28 06:26:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8212 from PsiOmegaDelta/CleanTopic

Browse Source 
Minor NanoUI/Topic cleanup
This commit is contained in:
Zuhayr
2015-02-26 16:27:08 +10:30
parent b806b2d29b eb5e5aa0ba
commit 0e80242e92
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/objs.dm
+1 -4
View File
@@ -16,14 +16,11 @@
var/damtype = "brute"
var/force = 0
/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/custom_state)
/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/custom_state = default_state)
// Calling Topic without a corresponding window open causes runtime errors
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()