Chinsky 69ed2317bf Merge pull request #6428 from atlantiscze/cyborg-power ...

Cyborg power overhaul

2014-09-25 00:19:13 +04:00

..

__HELPERS

Merge pull request #6428 from atlantiscze/cyborg-power

2014-09-25 00:19:13 +04:00

_onclick

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

ATMOSPHERICS

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

controllers

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

datums

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

defines

Cleans up radio frequency numbers.

2014-09-18 13:07:34 +02:00

FEA

…

game

Merge pull request #6428 from atlantiscze/cyborg-power

2014-09-25 00:19:13 +04:00

js

…

modules

Merge pull request #6428 from atlantiscze/cyborg-power

2014-09-25 00:19:13 +04:00

TriDimension

Merge pull request #6275 from RavingManiac/dev

2014-09-09 17:54:53 +04:00

unused

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

2014-09-10 22:14:37 +01:00

WorkInProgress

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

ZAS

updating turf gas overlays is now delta-based

2014-09-11 20:13:10 +01:00

global.dm

Non-drone silicons now have access to a basic security xor medical hud.

2014-08-28 20:01:43 +02:00

hub.dm

…

names.dm

…

setup.dm

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

stylesheet.dm

…

world.dm

Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area.

2014-08-16 05:28:45 +04:00