Arokha Sieyes c57e6e75b7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync ...

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm

Line ending changes?

2017-04-02 23:25:59 -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-smallsync

2017-04-02 23:25:59 -04:00

living

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

2017-04-02 23:25:59 -04:00

new_player

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

2017-04-01 19:19:42 -04: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

Italics switch from / to | characters

2017-03-28 21:13:46 -05:00

holder.dm

…

inventory.dm

…

login.dm

…

logout.dm

…

mob_defines.dm

…

mob_grab_specials.dm

Merge pull request #2955 from Anewbe/heart_damage

2017-03-28 20:02:24 -05:00

mob_grab.dm

…

mob_helpers.dm

Arokha SA Rework (Polaris)

2017-03-22 19:32:19 -04:00

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

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

2017-04-01 19:19:42 -04:00

say_vr.dm

…

say.dm

Adds Two QOL Say/Emote Features

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

transform_procs.dm

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

typing_indicator.dm

Swap typing indicator to right side

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

update_icons.dm

…