[nexuiz-commits] r6868 - trunk/misc/netradiant-NexuizPack/nexuiz.game/data

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-05 03:53:46 -0400 (Fri, 05 Jun 2009)
New Revision: 6868

Modified:
   trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
Log:
merge


Modified: trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
===================================================================
--- trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-06-05 07:52:01 UTC (rev 6867)
+++ trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-06-05 07:53:46 UTC (rev 6868)
@@ -1471,6 +1471,7 @@
 */
 
 /*QUAKED weapon_seeker (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
+Placing this entity on a map kills your dog, voids the warranty on your car, and makes your map an unenjoyable noobs' paradise.
 the T.A.G. Seeker.
 -------- KEYS --------
 ammo_rockets: initial rockets of the weapon (if unset, g_pickup_rockets is used)
@@ -1506,8 +1507,6 @@
 
 /*QUAKED weapon_campingrifle (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 the Camping Rifle.
-WARNING: DO NOT PLACE THIS ON MAPS YET.
-The weapon is subject to change in behaviour and appearance, and such a change may break weapon balance on your map. So don't place it yet, use it as server weapon replacement option ONLY.
 -------- KEYS --------
 ammo_nails: initial bullets of the weapon (if unset, g_pickup_nails is used)
 respawntime: time till it respawns (default: 30)