SinTwo f50adb9554 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade ...

Conflicts:
	code/_helpers/time.dm
	code/modules/economy/ATM.dm

2016-08-09 15:46:24 -04:00

..

antagonism

Adds fluff antag factions, antag visibility options for uplinks.

2016-06-29 11:25:52 -04:00

general

Allows FBPs to potentially have different age limits.

2016-07-13 18:25:07 -04:00

global

final new NanoUI fixes and tgui port

2016-07-27 23:01:26 -04:00

loadout

Ensures xeno loadout validation is done correctly

2016-08-06 20:27:23 +01:00

occupation

Can now toggle loadout and job preview equipment separately.

2016-07-10 04:53:49 +01:00

skills

Move preferences copy_to() new player mobs into the preference_setup datums.

2016-06-11 23:33:48 -04:00

_defines.dm

Can now toggle loadout and job preview equipment separately.

2016-07-10 04:53:49 +01:00

preference_setup.dm

no message

2016-08-05 17:58:15 +01:00