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

Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess

Browse Source 
Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
This commit is contained in:
PsiOmegaDelta
2015-08-20 12:42:51 +02:00
parent c2e2252342 c8b6813426
commit c346b99371
56 changed files with 869 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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