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

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol

Browse Source 
Conflicts:
	code/_onclick/rig.dm
This commit is contained in:
Zuhayr
2015-08-22 02:36:05 +09:30
parent 825154863d bf313ae238
commit a00ac82221
614 changed files with 17339 additions and 15217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/devices/aicard.dm
View File

@@ -46,7 +46,7 @@
ui.open()
ui.set_auto_update(1)
/obj/item/device/aicard/Topic(href, href_list, nowindow, state)
/obj/item/device/aicard/Topic(href, href_list, state)
if(..())
return 1