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

..

dead

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync

2017-03-11 18:47:17 -05:00

freelook

…

language

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

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

living

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

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

new_player

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

2017-03-03 19:39:56 -05:00

animations.dm

…

death.dm

…

emote.dm

Adds Two QOL Say/Emote Features

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

gender.dm

…

hear_say.dm

Adds Two QOL Say/Emote Features

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

holder.dm

Polaris sync

2017-02-01 15:08:45 -05:00

inventory.dm

…

login.dm

…

logout.dm

…

mob_defines.dm

Polaris sync

2017-02-01 15:08:45 -05:00

mob_grab_specials.dm

…

mob_grab.dm

…

mob_helpers.dm

…

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

Polaris sync

2017-02-01 15:08:45 -05:00

say_vr.dm

…

say.dm

Adds Two QOL Say/Emote Features

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

transform_procs.dm

Merge large polaris changes

2017-03-02 22:44:17 -05:00

typing_indicator.dm

Swap typing indicator to right side

2017-03-07 00:53:21 -05:00

update_icons.dm

…