Leshana 7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm

2017-04-15 23:14:32 -05:00

..

artifacts

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

effects

Changes Shields

2017-04-13 00:36:13 -04:00

finds

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

tools

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

2017-03-03 19:39:56 -05:00

boulder.dm

…

effect.dm

Ports a bunch of fluff stuff

2017-02-21 13:50:14 -06:00

manuals.dm

…

master_controller.dm

…

misc_vr.dm

…

misc.dm

…

sampling.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00