izac112 933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update ...

# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved

2020-01-31 18:23:50 +01:00

..

_modifiers

Medical Expansion

2019-10-19 23:28:38 -04:00

dead

compatibility fixes

2019-12-15 23:45:00 -05:00

freelook

…

language

Merge remote-tracking branch 'upstream/master'

2020-01-13 00:01:47 +00:00

living

Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update

2020-01-31 18:23:50 +01:00

new_player

Merge remote-tracking branch 'upstream/master'

2019-12-29 19:01:58 +00:00

animations.dm

…

death.dm

…

emote.dm

Chat fix by Aronai

2019-12-13 15:56:01 -05:00

gender_vr.dm

…

gender.dm

…

hear_say.dm

Adjusts Emphasize Name Mention (#6597)

2020-01-05 18:10:42 -05:00

holder.dm

GameMaster Tuning (#6593)

2020-01-05 01:39:28 -05:00

inventory.dm

Update Chat System to use to_chat(src, "") instead of src << ""

2019-11-05 19:22:38 -05:00

login_vr.dm

…

login.dm

…

logout.dm

Revert "Temporarily removes update_client_z from /logout"

2020-01-11 01:08:14 -05:00

mob_defines_vr.dm

Implements ferality indicator for xenochimera

2019-12-30 10:22:57 +10:00

mob_defines.dm

…

mob_grab_specials.dm

Fixes clamp issues

2020-01-06 08:37:27 +10:00

mob_grab.dm

removes sitting on head

2019-11-27 22:06:36 -05:00

mob_helpers.dm

Replaces lentext with length

2019-12-12 13:13:18 -05:00

mob_movement.dm

Fixes mob riding double input exploit

2020-01-12 02:09:56 +02:00

mob_planes_vr.dm

…

mob_planes.dm

…

mob_transformation_simple.dm

…

mob.dm

Merge remote-tracking branch 'upstream/master'

2020-01-06 00:47:53 +00:00

say_vr.dm

Chat fix by Aronai

2019-12-13 15:56:01 -05:00

say.dm

Change various global species lists to GLOB versions, adds 2 more event subspecies.

2019-12-16 00:52:29 -05:00

transform_procs.dm

Update Chat System to use to_chat(src, "") instead of src << ""

2019-11-05 19:22:38 -05:00

typing_indicator.dm

…

update_icons.dm

Testfix/reset filediff

2019-11-13 05:00:38 -07:00