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

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

Browse Source 
Conflicts:
	code/modules/mob/hear_say.dm
This commit is contained in:
GinjaNinja32
2014-12-08 15:32:49 +00:00
parent b6de85ec56 19b359f4eb
commit 681a6d21ea
96 changed files with 878 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/language.dm
View File

@@ -100,7 +100,7 @@
ask_verb = "creels"
exclaim_verb = "SHRIEKS"
colour = "vox"
key = "v"
key = "5"
flags = RESTRICTED
/datum/language/diona