Repede d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-29 09:58:53 -04:00

..

_modifiers

Merge pull request #5360 from Anewbe/aura_modifier

2018-06-17 15:59:01 -04:00

dead

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

freelook

Make turf obfuscation lists lazy

2018-03-21 14:19:53 -04:00

language

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2018-06-29 09:58:53 -04:00

living

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2018-06-29 09:58:53 -04:00

new_player

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2018-06-29 09:58:53 -04:00

animations.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

death.dm

…

emote.dm

Message send failure reflection

2018-05-16 17:57:26 -04:00

gender_vr.dm

fixes gender_vr

2018-04-27 15:58:10 -07:00

gender.dm

…

hear_say.dm

Fix signlang being totally broken

2018-04-30 14:49:31 -04:00

holder.dm

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

2018-03-31 09:20:59 -04:00

inventory.dm

…

login_vr.dm

…

login.dm

Merge pull request #3661 from VOREStation/aro-ssao-vs

2018-05-13 23:33:02 -04:00

logout.dm

…

mob_defines_vr.dm

…

mob_defines.dm

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

2018-03-31 09:20:59 -04:00

mob_grab_specials.dm

…

mob_grab.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

mob_helpers.dm

…

mob_movement.dm

Lazily implements taur riding

2018-04-12 15:10:17 -04:00

mob_planes_vr.dm

…

mob_planes.dm

Fix SSAO mode mouse opacity problem

2018-05-14 11:00:46 -04:00

mob_transformation_simple.dm

…

mob.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-06-02 18:33:44 -04:00

say_vr.dm

Message send failure reflection

2018-05-16 17:57:26 -04:00

say.dm

Message send failure reflection

2018-05-16 17:57:26 -04:00

transform_procs.dm

…

typing_indicator.dm

POLARIS: Improve robot and typing overlays

2018-03-21 21:03:13 -04:00

update_icons.dm

…