Cameron653 5fc76df183 Merge branch 'master' into ALRAUNE_STUFF

2018-07-23 20:08:30 -04:00

..

antagonism

…

general

Merge pull request #4052 from VOREStation/upstream-merge-5417

2018-07-21 15:52:01 -04:00

global

Merge pull request #3661 from VOREStation/aro-ssao-vs

2018-05-13 23:33:02 -04:00

loadout

Fix merge conflicts

2018-07-21 11:34:54 -04:00

occupation

Pathfinder Update (#3777)

2018-05-31 16:57:40 -04:00

skills

…

traits

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

2018-03-15 22:41:14 -04:00

vore

Prevents sanitization of custom icon base. Removes a custom fluff item since Alraune are now in.

2018-06-17 20:00:10 -04:00

_defines.dm

…

preference_setup_vr.dm

Enforce minimum age limit across all characters

2018-06-12 20:14:03 -04:00

preference_setup.dm

…