Initial commit of media suite

Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/area/areas.dm
	code/modules/client/client defines.dm
This commit is contained in:
Rob Nelson
2014-03-10 08:38:03 -07:00
committed by ZomgPonies
parent a9f67bf557
commit 8fb14a26e9
86 changed files with 36028 additions and 34 deletions
+2
View File
@@ -59,11 +59,13 @@ json_reader
while(++i <= lentext(json))
var/char = get_char()
if(escape)
escape=FALSE // WHICH STUPID ASSHOLE FORGOT THIS - N3X
switch(char)
if("\\", "'", "\"", "/", "u")
val += char
else
// TODO: support octal, hex, unicode sequences
//testing("Having trouble with \"\\[char]\" in string \"[val]\"")
ASSERT(sequences.Find(char))
val += ascii2text(sequences[char])
else