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

NanoUI atmosphere control and remote air alarm support.

Browse Source
This commit is contained in:
PsiOmega
2015-02-19 18:23:47 +01:00
parent d32cffaefe
commit 5b299e0104
12 changed files with 175 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
var/damtype = "brute"
var/force = 0
/obj/Topic(href, href_list, var/nowindow = 0, var/checkrange = 1)
/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/custom_state)
// Calling Topic without a corresponding window open causes runtime errors
if(!nowindow && ..())
return 1
@@ -24,7 +24,7 @@
// 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()
if(host.CanUseTopic(usr, checkrange) == STATUS_INTERACTIVE)
if(host.CanUseTopic(usr, href_list, custom_state) == STATUS_INTERACTIVE)
CouldUseTopic(usr)
return 0