cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 20:14:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-freeze' into dev

Browse Source 
Conflicts:
	icons/obj/ammo.dmi
This commit is contained in:
Chinsky
2013-11-30 05:15:22 +04:00
parent 3e52d581a7 5d3e712d64
commit 5b168c8e4b
32 changed files with 2113 additions and 1796 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
+1
View File
@@ -253,6 +253,7 @@
'nano/templates/cryo.tmpl',
'nano/templates/geoscanner.tmpl',
'nano/templates/dna_modifier.tmpl',
'nano/templates/telescience_console.tmpl',
'nano/images/uiBackground.png',
'nano/images/uiIcons16.png',
'nano/images/uiIcons24.png',