search

LLA-Gaming / SS13

Please put all your changes that are not fixes on the "Development" branch -
http://www.llagaming.net
GNU Affero General Public License v3.0
14 stars 37 forks source link

Ai core #311

Closed Daddysds1 closed 9 years ago

Daddysds1 commented 9 years ago

Because the other one was shit.

NullNeska commented 9 years ago

Please resolve the merge conflict.

NullNeska commented 9 years ago

Seems you are using a really old version of the map that isn't up to date to merge this (you are still on the main branch), the version of the map you should be using is https://github.com/Spoffy/LLA-Station-13/blob/master/_maps/map_files/tgstation.2.1.3.dmm additionally if you could use the mapmerger tool for this as well that would be swell

Daddysds1 commented 9 years ago

BAH i hate github i hate ittttt.

NullNeska commented 9 years ago

Closed on request of the OP