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

Merge remote-tracking branch 'upstream/dev' into NarsiePort

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/say.dm
This commit is contained in:
PsiOmega
2015-03-29 12:55:23 +02:00
parent 916da8e8a3 6ec0c2e504
commit 1a000b0e0f
160 changed files with 1568 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/setup.dm
View File

@@ -453,7 +453,7 @@
#define INVISIBILITY_LEVEL_ONE 35
#define INVISIBILITY_LEVEL_TWO 45
#define INVISIBILITY_OBSERVER 60
#define INVISIBILITY_AI_EYE 61
#define INVISIBILITY_EYE 61
#define SEE_INVISIBLE_LIVING 25
#define SEE_INVISIBLE_OBSERVER_NOLIGHTING 15