Blazemod update 2

[chaosvolt]

Once again PR'ing it for Blaze, in case any fixes on the latest version on mediafire aren't in the github version. Additionally, made sure to retain the water tank mainlining, turret volume fixes, and mounted weapon overrides from last update.

And finally, removed the "needs a battery mount" from the mounted laser, as it would presumably break things. Also added the mounted laser rifle to overrides, which I didn't do last time because copying "NEEDS_BATTERY_MOUNT" from the other mounted laser hindered things.

[kevingranade]

Please double-check these for tabs, this workflow of you copying things over means formatting errors like tab use keep getting reintroduced, at some point blaze needs to sync from the main project, or this is going to keep being a problem.

[DavidKeaton]

if need be a script could always be added to simply convert one \t into x spaces.

[Barhandar]

at some point blaze needs to sync from the main project, or this is going to keep being a problem.

And set their text editor to use spaces instead of tabs so it doesn't repeat. Notepad++ can do that.

[DavidKeaton]

Most, if not all, programming editors can do that.

[chaosvolt]

Ack. Crap. Sorry, I kinda just copy-pasted Blaze's work and re-added the latest divergences.

Unfortunately that's kinda Blaze's error, if he's adding tab issues. ._.

[chaosvolt]

Okay, I'm working on fixing this myself...

[kevingranade]

if need be a script could always be added to simple convert one \t into x
spaces.

How many spaces is x? In practice, it's either 8 or 4, unless it's
adaptive, in which case it's anything in between 1 and 8.
Basically if we could run astyle on the code in question it would sort it
out, but nothing less sophisticated than that is going to be able to fix it
without human intervention.

[chaosvolt]

It should be fixed now, plus some tabs I found that seem to have still been in the Github version.

[DavidKeaton]

where x is the number of spaces you want? I thought that was implied...

Plus, I forget about astyle sometimes, that's a better idea.

[chaosvolt]

Hmm. Somebody pester me if they find more tabs. @_@

[DavidKeaton]

an easy way to fix this is to use the search and replace function, simply change \t to ' ' (4 spaces).

(Vim Users-> :%s /\t/ /g)

[chaosvolt]

Hmm, could work. Or just find in general so I ensure I give the right amount of spaces.

[DavidKeaton]

True this, however automating it makes doing faster!

[chaosvolt]

Maybe. On it, in any case.

[chaosvolt]

I would hope that I've finally weeded out the tabs and space failures by now. <.<

[chaosvolt]

Why the hell is this giving a merge conflict NOW, and why did no one mention this?

[chaosvolt]

Augh. I've got other things to fix, we aren't really missing much if I close this.