Arokha Sieyes 6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync ...

# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm

2017-03-13 01:29:01 -04:00

..

generic.dm

Updates language syllables and text. (#3000)

2017-02-23 15:17:14 -06:00

language.dm

Moves languages to use more defines. Redoes Diona splitting

2017-01-14 22:47:12 -06:00

monkey.dm

Readded monkey scooping.

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

outsider.dm

Adds and tweaks Vox toys

2017-01-19 21:28:51 -06:00

station_vr.dm

~Changes flag for squirrelkin language

2017-03-03 03:39:00 -08:00

station.dm

Updates language syllables and text. (#3000)

2017-02-23 15:17:14 -06:00

synthetic.dm

Adds Two QOL Say/Emote Features

2017-03-12 09:30:48 -04:00