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

..

generic.dm

Cleans up living/say broadcast and verb logic

2015-09-09 03:04:18 -04:00

language.dm

Fixes bad default whisper_verb

2016-05-25 00:26:14 -04:00

monkey.dm

Readded monkey scooping.

2015-08-31 07:01:56 +09:30

outsider.dm

Gives Cult Cultist Language (Again) (#1651)

2016-05-15 18:32:31 -04:00

station_vr.dm

Almost done with species

2016-05-10 21:06:35 -04:00

station.dm

Update station.dm

2016-05-13 15:39:03 -06:00

synthetic.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00