X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fitem_key.qc;h=7b386ec97514ef571a9aa7ab5186e50c1773ee0a;hb=8c05bf23501ad92a8822da9adf4aee494aa5e302;hp=e39f2813450abfad76fd6a9750cee7bee470770f;hpb=23fc0e8dbdfe468cbac2b79e14e03445a9996fd0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc
index e39f28134..7b386ec97 100644
--- a/qcsrc/server/item_key.qc
+++ b/qcsrc/server/item_key.qc
@@ -36,6 +36,8 @@ string item_keys_keylist(float keylist) {
 	if ((keylist & (keylist-1)) != 0)
 		return strcat("the ", item_keys_names[lowestbit(keylist)]);
 	
+	n = "";
+	base = 0;
 	while (keylist) {
 		l = lowestbit(keylist);
 		if (n)
@@ -181,12 +183,13 @@ void spawnfunc_item_key() {
 		break;
 	
 	default:
+		_netname = "FLUFFY PINK keycard";
+		_colormod = '1 1 1';
+
 		if (!self.netname) {
 			objerror("item_key doesn't have a default name for this key and a custom one was not specified!");
 			remove(self);
 			return;
-		} else if (!self.colormod) {
-			_colormod = '1 1 1';
 		}
 		break;