cadyn 855f42ec48 Fix conflicts

2020-11-25 20:22:48 -08:00

..

_modifiers

…

dead

Spawn as mouse disclaimer.

2020-10-06 02:55:59 -07:00

freelook

…

language

Adds Spacer Language

2020-10-19 10:40:15 +00:00

living

Fix conflicts

2020-11-25 20:20:07 -08:00

new_player

Fix conflicts

2020-11-25 20:22:48 -08:00

animations.dm

…

death.dm

…

emote.dm

…

gender_vr.dm

…

gender.dm

…

hear_say.dm

…

holder.dm

…

inventory.dm

…

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

Merge pull request #9265 from Detective-Google/pixel-shift

2020-10-31 19:37:42 +00:00

mob_grab_specials.dm

…

mob_grab.dm

Cadyn's traits v2

2020-11-11 12:34:31 -08:00

mob_helpers.dm

…

mob_movement.dm

…

mob_planes_vr.dm

…

mob_planes.dm

…

mob_transformation_simple.dm

…

mob.dm

Merge pull request #9265 from Detective-Google/pixel-shift

2020-10-31 19:37:42 +00:00

say_vr.dm

Merge pull request #9112 from Andromeda-K22/emote_text_box

2020-10-19 10:36:56 +00:00

say.dm

Merge pull request #9209 from VOREStation/upstream-merge-7695

2020-10-19 10:37:53 +00:00

skillset.dm

…

transform_procs.dm

…

typing_indicator.dm

Merge pull request #9318 from VOREStation/Verkister-patch-5

2020-11-17 22:06:07 +00:00

update_icons.dm

…