Markolie c2ce8a63b9 Merge conflict

2014-11-20 22:43:31 +01:00

..

__HELPERS

Fixes sql errors caused by odd and unexpected behavor in dbcon.Quote()

2014-08-11 20:56:31 -04:00

_hooks

…

_onclick

AI fixes, borg fixes, map fixes

2014-11-14 14:15:17 +01:00

ATMOSPHERICS

Further atmos changes

2014-08-11 17:45:18 +01:00

controllers

nanotrasen.se

2014-09-04 19:45:43 +02:00

datums

Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders

2014-11-18 20:36:40 +01:00

defines

Fix stun batons and holographic sign projectors

2014-11-19 20:20:10 +01:00

FEA

…

game

Merge conflict

2014-11-20 22:43:31 +01:00

js

…

modules

Merge pull request #4 from ZomgPonies/master

2014-11-20 22:37:35 +01:00

TriDimension

…

unused

…

WorkInProgress

Glass now changes color when built based on the area, map fixes

2014-11-20 00:08:29 +01:00

ZAS

Cleanup of internal organs

2014-08-21 10:24:13 +01:00

ZAS - oldbs12

…

ZAS - vg

…

global.dm

Civilian round-start fix (2)

2014-10-28 02:51:27 +00:00

hub.dm

…

names.dm

…

setup.dm

AI fixes, borg fixes, map fixes

2014-11-14 14:15:17 +01:00

stylesheet.dm

…

test.dm

…

world.dm

nanotrasen.se

2014-09-04 19:45:43 +02:00