Ccomp5950 d0383883c2 Merge pull request #7094 from Neerti/borg_hud_port_2 ...

Semi-ports /tg/'s cyborg HUD, now with less merge conflict!

2014-11-22 03:27:10 -05:00

..

__HELPERS

Merge pull request #6983 from PsiOmegaDelta/Event

2014-11-12 23:45:02 +03:00

_onclick

Resolves conflicts, cherrypicks my code.

2014-11-21 03:32:00 -05:00

ATMOSPHERICS

Merge remote-tracking branch 'upstream/dev' into APC

2014-11-19 14:40:18 +01:00

controllers

Merge remote-tracking branch 'upstream/dev' into APC

2014-11-19 14:40:18 +01:00

datums

Merge pull request #7088 from mwerezak/skrell

2014-11-22 03:23:41 -05:00

defines

AI can now track people with max level sensors.

2014-11-21 08:33:20 +01:00

FEA

…

game

Merge pull request #7094 from Neerti/borg_hud_port_2

2014-11-22 03:27:10 -05:00

js

…

modules

Merge pull request #7094 from Neerti/borg_hud_port_2

2014-11-22 03:27:10 -05:00

TriDimension

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

unused

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

WorkInProgress

Merge remote-tracking branch 'upstream/dev' into AirAlarms

2014-11-21 15:28:54 +01:00

ZAS

…

global.dm

AI can now track people with max level sensors.

2014-11-21 08:33:20 +01:00

hub.dm

…

names.dm

…

setup.dm

Merge pull request #7088 from mwerezak/skrell

2014-11-22 03:23:41 -05:00

stylesheet.dm

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

world.dm

…