Spades aedcf169a6 Merge pull request #4539 from VOREStation/upstream-merge-5723 ...

[MIRROR] Promethean Regen tweaks. (The one with the devil's deal.)

2019-02-25 07:41:47 -05:00

..

_modifiers

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

dead

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

freelook

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

language

Merge branch 'master' into upstream-merge-5735

2019-01-14 11:20:55 -05:00

living

Merge pull request #4539 from VOREStation/upstream-merge-5723

2019-02-25 07:41:47 -05:00

new_player

Merge pull request #5718 from kartagrafi/hairunderwearwhatever

2018-12-01 00:17:11 -05:00

animations.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

death.dm

Merge pull request #5669 from VOREStation/pol-binocs

2018-10-15 15:51:43 -04:00

emote.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

gender_vr.dm

…

gender.dm

…

hear_say.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

holder.dm

Two pAI fixes

2018-07-27 19:52:31 -04:00

inventory.dm

…

login_vr.dm

…

login.dm

…

logout.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

mob_defines_vr.dm

…

mob_defines.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

mob_grab_specials.dm

…

mob_grab.dm

Merge pull request #4130 from KasparoVy/fix-tesh-hide-again

2018-10-06 08:25:35 -04:00

mob_helpers.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

mob_movement.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

mob_planes_vr.dm

…

mob_planes.dm

Merge pull request #5517 from Anewbe/hud_invis

2018-08-24 15:47:22 -07:00

mob_transformation_simple.dm

…

mob.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

say_vr.dm

…

say.dm

…

transform_procs.dm

Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

typing_indicator.dm

…

update_icons.dm

…