Merge
authorAsher Baker <asherkin@gmail.com>
Wed Aug 22 18:44:27 2012 +0100 (2012-08-22)
changeset 3622934e840e114d
parent 3620 bb36770ded54
parent 3621 d5510357db56
child 3623 3fd87cb487f8
Merge
     1.1 --- a/core/PlayerManager.cpp	Tue Aug 21 00:44:44 2012 -0400
     1.2 +++ b/core/PlayerManager.cpp	Wed Aug 22 18:44:27 2012 +0100
     1.3 @@ -777,14 +777,16 @@
     1.4  		}
     1.5  		else if (args.ArgC() > 1 && strcmp(args.Arg(1), "credits") == 0)
     1.6  		{
     1.7 -			ClientConsolePrint(pEntity,
     1.8 -				"SourceMod would not be possible without:");
     1.9 + 			ClientConsolePrint(pEntity,
    1.10 + 				"SourceMod would not be possible without:");
    1.11 + 			ClientConsolePrint(pEntity,
    1.12 +				" David \"BAILOPAN\" Anderson, Matt \"pRED\" Woodrow");
    1.13 + 			ClientConsolePrint(pEntity,
    1.14 +				" Scott \"DS\" Ehlert, Fyren");
    1.15 + 			ClientConsolePrint(pEntity,
    1.16 +				" Nicholas \"psychonic\" Hastings, Asher \"asherkin\" Baker");
    1.17  			ClientConsolePrint(pEntity,
    1.18 -				" David \"BAILOPAN\" Anderson, Borja \"faluco\" Ferrer");
    1.19 -			ClientConsolePrint(pEntity,
    1.20 -				" Scott \"DS\" Ehlert, Matt \"pRED\" Woodrow");
    1.21 -			ClientConsolePrint(pEntity,
    1.22 -				" Michael \"ferret\" McKoy, Pavol \"PM OnoTo\" Marko");
    1.23 +				" Borja \"faluco\" Ferrer, Pavol \"PM OnoTo\" Marko");
    1.24  			ClientConsolePrint(pEntity,
    1.25  				"SourceMod is open source under the GNU General Public License.");
    1.26  			RETURN_META(MRES_SUPERCEDE);
     2.1 --- a/core/sm_srvcmds.cpp	Tue Aug 21 00:44:44 2012 -0400
     2.2 +++ b/core/sm_srvcmds.cpp	Wed Aug 22 18:44:27 2012 +0100
     2.3 @@ -329,9 +329,10 @@
     2.4  		ConsolePrint("  Scott \"DS\" Ehlert");
     2.5  		ConsolePrint("  Fyren");
     2.6  		ConsolePrint("  Nicholas \"psychonic\" Hastings");
     2.7 +		ConsolePrint("  Asher \"asherkin\" Baker");
     2.8  		ConsolePrint("  Borja \"faluco\" Ferrer");
     2.9  		ConsolePrint("  Pavol \"PM OnoTo\" Marko");
    2.10 -		ConsolePrint(" Special thanks to asherkin, Liam, ferret, and Mani");
    2.11 +		ConsolePrint(" Special thanks to Liam, ferret, and Mani");
    2.12  		ConsolePrint(" Special thanks to Viper and SteamFriends");
    2.13  		ConsolePrint(" http://www.sourcemod.net/");
    2.14  	}