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

..

dead

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

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

freelook

…

language

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

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

living

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

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

new_player

Merge pull request #124 from VOREStation/heatfix

2016-05-21 13:20:12 -04:00

animations.dm

Revert to old_x and old_y after attack animations (#85)

2016-05-16 19:16:54 -04:00

death.dm

Fixes #993

2016-05-19 13:30:12 -04:00

emote.dm

Adds 2 verbs to ghosts.

2016-04-26 17:03:39 -07:00

gender.dm

…

hear_say.dm

Satisfies Travis

2016-05-08 17:05:27 +03:00

holder.dm

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

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

inventory.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

login.dm

Adds SSD/ghost and idle time to examine text

2016-05-22 02:16:15 -04:00

logout.dm

Adds SSD/ghost and idle time to examine text

2016-05-22 02:16:15 -04:00

mob_defines.dm

Adds SSD/ghost and idle time to examine text

2016-05-22 02:16:15 -04:00

mob_grab_specials.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

mob_grab.dm

…

mob_helpers.dm

Adds ability for players to ignore other players. (#1539)

2016-05-05 10:14:34 -04:00

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

Spawn timer fix

2016-05-21 11:30:48 -04:00

say_vr.dm

Adds in the "Subtle" command. (#173)

2016-05-22 12:12:06 -04:00

say.dm

Worked Whisper into Say

2016-05-25 16:59:47 -04:00

transform_procs.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

typing_indicator.dm

…

update_icons.dm

…