.rej cleanup

2017-06-26 06:14:42 -05:00
parent bebda394f4
commit 5571cca37c
21 changed files with 0 additions and 339 deletions
@@ -1,21 +0,0 @@
-diff a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm	(rejected hunks)
-@@ -279,19 +279,6 @@ GLOBAL_LIST_EMPTY(asset_datums)
- 		"changelog.css" = 'html/changelog.css'
- 	)
- 
-/datum/asset/simple/chat
-	assets = list(
-		"jquery.min.js" = 'code/modules/html_interface/js/jquery.min.js',
-		"json2.min.js" = 'goon/browserassets/js/json2.min.js',
-		"browserOutput.js" = 'goon/browserassets/js/browserOutput.js',
-		"fontawesome-webfont.eot" = 'tgui/assets/fonts/fontawesome-webfont.eot',
-		"fontawesome-webfont.svg" = 'tgui/assets/fonts/fontawesome-webfont.svg',
-		"fontawesome-webfont.ttf" = 'tgui/assets/fonts/fontawesome-webfont.ttf',
-		"fontawesome-webfont.woff" = 'tgui/assets/fonts/fontawesome-webfont.woff',
-		"font-awesome.css" = 'goon/browserassets/css/font-awesome.css',
-		"browserOutput.css" = 'goon/browserassets/css/browserOutput.css'
-	)
-
- //Registers HTML Interface assets.
- /datum/asset/HTML_interface/register()
- 	for(var/path in typesof(/datum/html_interface))
@@ -1,10 +0,0 @@
-diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm	(rejected hunks)
-@@ -196,6 +203,8 @@ var/next_external_rsc = 0
- 
- 	. = ..()	//calls mob.Login()
- 
-+	chatOutput.start()
-+
- 	connection_time = world.time
- 	connection_realtime = world.realtime
- 	connection_timeofday = world.timeofday