GauHelldragon 85c9431aa4 Merge branch 'bleeding-edge-freeze' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	baystation12.dme

2013-01-15 13:59:10 -08:00

..

__HELPERS

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

ATMOSPHERICS

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

controllers

added placeholder economic stuff (probably never finish it), added random system-wide events (which are announced at the newscaster when they occur)

2013-01-15 21:25:45 +10:00

datums

tweaked some supply packs a bit, added formalwear and pizza supply packs, made supply packs organised and selectable by type in the order menu

2013-01-15 23:20:00 +10:00

defines

removed a bunch of unused files, moved amorphs and meme to workinprogress/cib

2013-01-15 23:29:49 +10:00

FEA

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

game

Merge branch 'bleeding-edge-freeze' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-01-15 13:59:10 -08:00

js

…

modules

removed a bunch of unused files, moved amorphs and meme to workinprogress/cib

2013-01-15 23:29:49 +10:00

TriDimension

…

unused

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

WorkInProgress

removed unused WIP file

2013-01-16 00:20:05 +10:00

ZAS

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-14 22:14:46 +10:00

global.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

hub.dm

…

names.dm

…

setup.dm

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

stylesheet.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

world.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00