Arokha Sieyes 76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync ...

# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).

2016-05-26 09:59:18 -04:00

..

antagonism

Replaces BE_MONKEY with BE_RENEGADE

2016-05-16 21:20:30 -05:00

general

Fixes #132

2016-05-21 12:31:37 -04:00

global

Adds preference to mute remote LOOC chatter heard by admins.

2016-05-23 20:36:22 -04:00

loadout

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

2016-05-26 09:59:18 -04:00

occupation

Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync

2016-05-19 23:52:00 -04:00

skills

Ports Bay's adjustments of the faux-nanoui character setup and related

2016-05-12 18:26:24 +01:00

vore

Work on satisfying travis

2016-05-14 13:38:24 -04:00

preference_setup.dm

Both enabled and disabled preferences are now stored.

2016-03-22 16:13:54 +00:00