rej cleanup

2017-05-10 22:35:01 -05:00
parent cbffd533ba
commit b7acf503eb
8 changed files with 0 additions and 195 deletions
@@ -1,10 +0,0 @@
-diff a/code/controllers/configuration.dm b/code/controllers/configuration.dm	(rejected hunks)
-@@ -777,7 +767,7 @@
- 				if("mice_roundstart")
- 					mice_roundstart = text2num(value)
- 				else
-					GLOB.diary << "Unknown setting in configuration: '[name]'"
-+					GLOB.world_game_log << "Unknown setting in configuration: '[name]'"
- 
- 	fps = round(fps)
- 	if(fps <= 0)
@@ -1,10 +0,0 @@
-diff a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm	(rejected hunks)
-@@ -41,7 +41,7 @@ SUBSYSTEM_DEF(blackbox)
- 	msg_service = SSblackbox.msg_service
- 	msg_cargo = SSblackbox.msg_cargo
- 	msg_other = SSblackbox.msg_other
-	
-+
- 	feedback = SSblackbox.feedback
- 
- //no touchie