Arokha Sieyes 9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018 ...

# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.

2018-01-22 12:10:19 -05:00

..

engine_submaps

Add checks to allow Tesla to fully dissipate once it runs out of energy.

2018-01-21 16:19:13 -05:00

space_submaps

Allows Travis to Validate PoI Maps

2017-11-19 06:07:41 -05:00

surface_submaps

Dead SifGuard Patrol PoI (Fix) (#4599)

2018-01-21 16:17:24 -06:00

_readme.dm

Allows Travis to Validate PoI Maps

2017-11-19 06:07:41 -05:00