cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-freeze' into dev

Browse Source 
Conflicts:
	html/changelog.html
	maps/tgstation2.dmm
This commit is contained in:
Chinsky
2013-10-10 14:37:41 +04:00
parent 7f62dfc5b1 6e07981e67
commit 29ea7f0d3a
9 changed files with 74 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/setup.dm
+4
View File
@@ -737,3 +737,7 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse
//Language flags.
#define WHITELISTED 1 // Language is available if the speaker is whitelisted.
#define RESTRICTED 2 // Language can only be accquired by spawning or an admin.
//Flags for zone sleeping
#define ZONE_ACTIVE 1
#define ZONE_SLEEPING 0