Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -04:00

..

dead

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

2016-05-31 18:17:58 -04:00

freelook

Merge pull request #1027 from Kelenius/mobCleanup

2016-03-18 13:50:47 -04:00

language

grammar tweak

2016-05-29 14:18:05 -05:00

living

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

2016-07-03 16:21:21 -04:00

new_player

Merge remote-tracking branch 'refs/remotes/VOREStation/master'

2016-06-15 14:30:40 -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

510 Improved Overlays

2016-06-18 15:50:10 -03:00

emote.dm

Rewrites LOOC and emote to use new proc

2016-06-11 21:53:56 -04:00

gender.dm

…

hear_say.dm

Satisfies Travis

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

holder.dm

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

2016-07-03 16:21:21 -04:00

inventory.dm

First commit of manual port of BS12

2016-05-29 00:56:11 +01:00

login.dm

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

2016-07-03 16:21:21 -04:00

logout.dm

Adds SSD/ghost and idle time to examine text

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

mob_defines.dm

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

2016-07-03 16:21:21 -04:00

mob_grab_specials.dm

Small mobs can no longer pin larger mobs

2016-06-20 00:09:37 +01:00

mob_grab.dm

Makes smaller mobs have smaller organs

2016-06-20 00:26:44 +01:00

mob_helpers.dm

Makes smaller mobs have smaller organs

2016-06-20 00:26:44 +01:00

mob_movement.dm

Fixes confused movement for walking/running, adjusts behaviour

2016-04-20 16:49:33 +02:00

mob_transformation_simple.dm

…

mob.dm

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

2016-07-03 16:21:21 -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

Replaced mobs with vore versions.

2016-06-03 22:57:51 -04:00

typing_indicator.dm

Makes it possible to have more than 16 preferences

2016-03-21 18:56:27 +00:00

update_icons.dm

Construction Update

2016-03-25 16:02:36 -04:00