cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:tgstation/-tg-station into FUTURE_DNA_2

Browse Source 
Conflicts:
	code/game/dna.dm  <-- leave this shit alone unless it's a small-tidy change. ffs.
This commit is contained in:
carnie
2013-08-06 09:54:24 +01:00
parent 485e87728e d242f8aeaa
commit 3317aa9fe3
53 changed files with 944 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
+1 -2
View File
@@ -232,9 +232,8 @@ var/next_external_rsc = 0
'html/search.js',
'html/panels.css',
'html/browser/common.css',
'html/browser/cryo.css',
'html/browser/scannernew.css',
'html/browser/sleeper.css',
'html/browser/playeroptions.css',
'icons/pda_icons/pda_atmos.png',
'icons/pda_icons/pda_back.png',
'icons/pda_icons/pda_bell.png',