Tribes2/TWM2
1
0
Fork 0
mirror of https://github.com/PhantomGamesDevelopment/TWM2.git synced 2026-07-11 14:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the merge issues

Browse source
This commit is contained in:
Robert Fritzen 2015-02-12 19:56:24 -06:00
parent 26ff02fd38
commit 9add24b42e
9 changed files with 0 additions and 1375 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/weapons/Construction/modifiertool.cs
View file

@ -545,17 +545,10 @@ function MergeToolImage::onFire(%data,%obj,%slot)
function MergeToolImage::onMount(%this,%obj,%slot)
{
<<<<<<< HEAD
if(%obj.MTMode $= "")
%obj.MTMode = 0;
if(%obj.MTSubMode $= "")
%obj.MTSubMode = 0;
=======
if(%obj.client.MTMode $= "")
%obj.client.MTMode = 0;
if(%obj.client.MTSubMode $= "")
%obj.client.MTSubMode = 0;
>>>>>>> origin/development
%obj.usingMTelec = 1;
//Phantom139: Added
%obj.hasMineModes = 1;