Novacat f73a757152 Merge pull request #4924 from VOREStation/upstream-merge-6025 ...

[MIRROR] Replaces AI-controlled Maint Drones with AI-controlled Borg Shells

2019-04-06 14:56:27 -04:00

..

bot

Conflict Resolution

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

carbon

Replaces AI-controlled Maint Drones with AI-controlled Borg Shells

2019-04-06 05:07:05 -04:00

silicon

Conflict Resolution

2019-04-06 14:47:21 -04:00

simple_animal

Fixes Merge Errors

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

simple_mob

Also fixes the mobs attacking non-mob stuff

2019-04-06 17:35:47 +10:00

voice

…

autohiss.dm

…

damage_procs.dm

…

death.dm

Replaces AI-controlled Maint Drones with AI-controlled Borg Shells

2019-04-06 05:07:05 -04:00

default_language.dm

…

inventory.dm

…

life.dm

…

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

…

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

…

logout.dm

…

say.dm

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

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