content additions and such

[JohnOxford]

adds prime helmets adds legion armors for each rank adds scorched sierra power armor changes the ncr general to a ncr captain gives the captain scorched sierra gives him a officer beret too changes walkie talkie sprites adds legion shields adds light legion shields lots of syntax changes prefixes added to faction names adds a master crafted machete gladius for admemes changes the current axe sprite probally some other shit i forgot to mention

[JohnOxford]

it doesnt. trying to add a do not merge tag but thats generally given. i either fucked something up really bad or its not detecting entire files or some shit. i dunno ill have a look at it when i get back to my computer

[AndrewL97]

You have removed heaps of armor types, so job datums are upset that they can't find things like the power armor, under armor.dm I imagine that you have missed uploading wherever you moved that armor to?

To find out which items you have missed, either check the travis log or try compiling it @JohnOxford

[Sansaur]

I've read the logs and like 90% of the errors are undefined type paths used by other things, so yeah, it seems some of the things you've removed were being used by other items / datums / map objects... Whatever.

[JohnOxford]

i figured as much. ill be at a computer tonight and will unfuck it then.

[JohnOxford]

okay so after looking at it, it appears that it was the original big fuck off sized armor file that was creating issues, because i copy and pasted it from dmaster who added in sierra power armor to it but also apparently removed very important things like which icons the armors would pull from and outright removed some armors that were used in jobs and equipment spawns. so im just going to close this pr and recycle the work done without copy pasting. new pr shortly

[JohnOxford]

i lied im just going to try to fix this pr

[JohnOxford]

https://gyazo.com/ea8d890dbae11edece91c61ca6468730

it runs