Merge branch 'TimePath/modules'

# Conflicts:
#	qcsrc/common/turrets/turret/fusionreactor.qc

diff --cc qcsrc/common/mutators/mutator/waypoints/all.qh
Simple merge

diff --cc qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
Simple merge

diff --cc qcsrc/common/turrets/turret/fusionreactor.qh
index 0000000000000000000000000000000000000000,5d3313e5561b763ae9750ea3fc42cddfe73429cb..134b805e9f56a881ef43cd3b8145a04002f84358
mode 000000,100644..100644
--- /dev/null
--- 2/qcsrc/common/turrets/turret/fusionreactor.qh
+++ b/qcsrc/common/turrets/turret/fusionreactor.qh
@@@ -1,0 -1,13 +1,13 @@@
 -/* netname    */ ATTRIB(FusionReactor, netname, string, "fusionreactor");
+ #pragma once
+ 
+ CLASS(FusionReactor, Turret)
+ /* spawnflags */ ATTRIB(FusionReactor, spawnflags, int, TUR_FLAG_SUPPORT | TUR_FLAG_AMMOSOURCE);
+ /* mins       */ ATTRIB(FusionReactor, mins, vector, '-34 -34 0');
+ /* maxs       */ ATTRIB(FusionReactor, maxs, vector, '34 34 90');
+ /* modelname  */ ATTRIB(FusionReactor, mdl, string, "base.md3");
+ /* model      */ ATTRIB_STRZONE(FusionReactor, model, string, strcat("models/turrets/", this.mdl));
+ /* head_model */ ATTRIB_STRZONE(FusionReactor, head_model, string, strcat("models/turrets/", "reactor.md3"));
++/* netname    */ ATTRIB(FusionReactor, netname, string, "fusreac");
+ /* fullname   */ ATTRIB(FusionReactor, turret_name, string, _("Fusion Reactor"));
+ ENDCLASS(FusionReactor)
+ REGISTER_TURRET(FUSIONREACTOR, NEW(FusionReactor));

diff --cc qcsrc/server/g_damage.qc
Simple merge

diff --cc qcsrc/server/mutators/events.qh
Simple merge