cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 14:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
This commit is contained in:
PsiOmega
2015-09-05 09:24:30 +02:00
parent 777d5b7c61 8311e06d2b
commit 69fde6af03
50 changed files with 582 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/language/outsider.dm
View File

@@ -90,7 +90,7 @@
ask_verb = "intones"
exclaim_verb = "chants"
colour = "cult"
key = "n"
key = "f"
flags = RESTRICTED
space_chance = 100
syllables = list("ire","ego","nahlizet","certum","veri","jatkaa","mgar","balaq", "karazet", "geeri", \
@@ -108,5 +108,5 @@
ask_verb = "intones"
exclaim_verb = "chants"
colour = "cult"
key = "m"
key = "y"
flags = RESTRICTED | HIVEMIND