Merge branch 'TimePath/modules'
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 21 Aug 2016 06:29:24 +0000 (16:29 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 21 Aug 2016 06:29:39 +0000 (16:29 +1000)
# Conflicts:
# qcsrc/common/turrets/turret/fusionreactor.qc

1  2 
qcsrc/common/mutators/mutator/waypoints/all.qh
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/turrets/turret/fusionreactor.qh
qcsrc/server/g_damage.qc
qcsrc/server/mutators/events.qh

index 0000000,5d3313e..134b805
mode 000000,100644..100644
--- /dev/null
@@@ -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));
Simple merge
Simple merge