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

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

Browse Source 
Uplink Items - Part III
This commit is contained in:
Zuhayr
2015-08-20 19:19:12 +09:30
parent fd007cdea0 b879db05b4
commit c8b6813426
47 changed files with 851 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,9 +19,8 @@
nanomanager.close_uis(src)
return ..()
/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = default_state)
// Calling Topic without a corresponding window open causes runtime errors
if(!nowindow && ..())
/obj/Topic(href, href_list, var/datum/topic_state/state = default_state)
if(usr && ..())
return 1
// In the far future no checks are made in an overriding Topic() beyond if(..()) return
@@ -144,4 +143,4 @@
return
/obj/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
return
return