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

Conflicts:
	code/modules/client/client procs.dm
	nano/templates/robot_control.tmpl

2016-07-27 16:11:55 -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

a whole lot of nanoui upgrades

2016-06-24 00:43:16 -04:00

loadout

more item_state fixes: worn_state purge

2016-07-24 19:03:15 -04: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

Allows FBPs to potentially have different age limits.

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