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

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

Browse Source 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
This commit is contained in:
PsiOmega
2015-08-01 19:45:42 +02:00
parent 82152daa30 f8799035f4
commit f8d86900a5
29 changed files with 899 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/language/generic.dm
+1 -1
View File
@@ -25,7 +25,7 @@
speech_verb = "says"
whisper_verb = "whispers"
key = "0"
flags = RESTRICTED
flags = RESTRICTED | COMMON_VERBS
syllables = list("blah","blah","blah","bleh","meh","neh","nah","wah")
//TODO flag certain languages to use the mob-type specific say_quote and then get rid of these.