Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
This commit is contained in:
Arokha Sieyes
2018-05-27 19:26:12 -04:00
85 changed files with 8058 additions and 2646 deletions
+13 -1
View File
@@ -129,4 +129,16 @@
flags = RESTRICTED
syllables = list("rus","zem","ave","groz","ski","ska","ven","konst","pol","lin","svy",
"danya","da","mied","zan","das","krem","myka","cyka","blyat","to","st","no","na","ni",
"ko","ne","en","po","ra","li","on","byl","cto","eni","ost","ol","ego","ver","stv","pro")
"ko","ne","en","po","ra","li","on","byl","cto","eni","ost","ol","ego","ver","stv","pro")
//For your event purposes.
/datum/language/occursus
name = LANGUAGE_EVENT1
desc = "The Powers That Be have seen it fit to grace you with a special language that sounds like... something. This description should be overridden by the time you see this."
speech_verb = "says"
ask_verb = "asks"
exclaim_verb = "shouts"
colour = "warning"
key = "]"
flags = RESTRICTED
syllables = list("chan","ange","thi","se")