From: Lyberta <lyberta@lyberta.net>
Date: Thu, 9 Nov 2017 16:32:18 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/RandomItems
X-Git-Tag: xonotic-v0.8.5~2426^2~12
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=7aaff08fbaad9424651ec31c82f8a5d78e5ec1e1;hp=c05834ed15898e5a2cdc8b9bf490858401ce0290;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/RandomItems
---

diff --git a/qcsrc/common/triggers/trigger/relay.qc b/qcsrc/common/triggers/trigger/relay.qc
index 794f4dc11..a82034edc 100644
--- a/qcsrc/common/triggers/trigger/relay.qc
+++ b/qcsrc/common/triggers/trigger/relay.qc
@@ -8,4 +8,6 @@ spawnfunc(trigger_relay)
 	this.use = SUB_UseTargets;
 	this.reset = spawnfunc_trigger_relay; // this spawnfunc resets fully
 }
+
+spawnfunc(target_relay) { spawnfunc_trigger_relay(this); }
 #endif
diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index 4fc33badc..a85f4cca6 100644
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -99,6 +99,10 @@ void target_give_init(entity this)
 			this.ammo_rockets += it.count * WEP_CVAR(devastator, ammo);
 			this.netname = cons(this.netname, "devastator");
 		}
+		else if (it.classname == "weapon_railgun") {
+			this.ammo_cells += it.count * WEP_CVAR_PRI(vortex, ammo); // WEAPONTODO
+			this.netname = cons(this.netname, "vortex");
+		}
 		else if (it.classname == "weapon_lightning") {
 			this.ammo_cells += it.count * WEP_CVAR_PRI(electro, ammo); // WEAPONTODO
 			this.netname = cons(this.netname, "electro");