Leshana 4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08 ...

# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme

2017-05-08 21:07:45 -04:00

..

machinery

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-25 15:04:54 -04:00

mob

Fixes mutate() in xenobio2 to produce a unique traits datum

2017-05-05 12:23:00 -04:00

tools

Xenotaser should work now

2017-01-18 17:47:38 -06:00

_xeno_setup_vr.dm

…

_xeno_setup.dm

…

controller.dm

…