Leshana 4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01 ...

# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png

2018-02-01 23:55:47 -05:00

..

obj

weapon.dm fixes

2017-10-27 11:27:13 -04:00

procs

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

gases.dm

REmoves chemspill volatile fuel. Adds Oxidizing N2o

2017-09-12 09:41:08 -07:00

obj.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01

2018-02-01 23:55:47 -05:00