Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

_modifiers

Reagent Hoses

2020-08-20 21:24:06 -04:00

dead

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

2020-08-22 20:07:45 +02:00

freelook

…

language

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

2020-09-13 15:05:53 +02:00

living

Fixing conflicts

2020-10-05 18:10:53 -07:00

new_player

Fixing conflicts

2020-10-05 18:10:53 -07:00

animations.dm

…

death.dm

…

emote.dm

…

gender_vr.dm

…

gender.dm

…

hear_say.dm

…

holder.dm

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

2020-09-13 15:05:53 +02:00

inventory.dm

Merge pull request #7518 from Meghan-Rossi/borgcookfix

2020-08-21 01:25:40 -04:00

login_vr.dm

…

login.dm

…

logout.dm

NanoUI Goes To Brazil

2020-09-20 02:36:46 -07:00

mob_defines_vr.dm

…

mob_defines.dm

AI eye no longer appears on turf tab (#7666)

2020-09-18 23:35:53 -04:00

mob_grab_specials.dm

…

mob_grab.dm

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

2020-09-13 15:05:53 +02:00

mob_helpers.dm

…

mob_movement.dm

Jetpack cleanup, don't use fuel when unneeded

2020-08-31 21:13:04 -04:00

mob_planes_vr.dm

…

mob_planes.dm

…

mob_transformation_simple.dm

…

mob.dm

Fixing conflicts

2020-10-05 18:10:53 -07:00

say_vr.dm

…

say.dm

…

skillset.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…