Novacat e3b2a69517 Merge pull request #4852 from Haery70/master ...

Fixes a Spriting Issue in Mobvore

2019-03-28 22:01:57 -04:00

..

bot

Conflict Resolution

2019-03-28 20:37:08 -04:00

carbon

Merge pull request #4800 from Mewchild/MC-Mlem

2019-03-28 21:27:40 -04:00

silicon

Removes conductive flags from VR stuff

2019-03-28 21:45:38 -04:00

simple_animal

Fixes Merge Errors

2019-03-28 13:53:03 -04:00

simple_mob

Merge pull request #4852 from Haery70/master

2019-03-28 22:01:57 -04:00

voice

…

autohiss.dm

…

damage_procs.dm

Merge pull request #5760 from Anewbe/bioacid

2018-12-06 16:20:03 -05:00

death.dm

Breaks a Vorestation Edit in death.dm

2019-01-05 16:35:07 -05:00

default_language.dm

…

inventory.dm

…

life.dm

Merges AI Branch into Master

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

living_defense.dm

Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it

2019-03-27 14:49:30 -04:00

living_defines_vr.dm

…

living_defines.dm

Merges AI Branch into Master

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

living_movement.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

living_powers.dm

…

living.dm

Fixes the 'cannot push thing being pulled' bug and other weirdness.

2019-03-28 20:15:30 -04:00

login.dm

Merges AI Branch into Master

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

logout.dm

Merges AI Branch into Master

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

say.dm

Merge pull request #4702 from VOREStation/upstream-merge-5885

2019-03-27 19:25:50 -04:00