Iamgoofball e36f0c3fac Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into smallchanges ...

Conflicts:
	code/modules/research/designs.dm

2013-11-20 14:59:33 -08:00

..

__HELPERS

Changes Telescience to Projectile Trajectory!

2013-11-19 19:23:51 -08:00

_onclick

mecha fixes

2013-11-02 12:26:34 -07:00

ATMOSPHERICS

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

controllers

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2013-11-20 17:50:01 +10:30

datums

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma

2013-11-05 02:57:40 +04:00

defines

Poultice potency, bugfixes

2013-11-14 15:21:29 -05:00

FEA

…

game

Raider state display compile fix.

2013-11-20 18:47:37 +10:30

js

…

modules

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into smallchanges

2013-11-20 14:59:33 -08:00

TriDimension

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

unused

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

WorkInProgress

Sleeper Addition, Chemical Rebalance 2

2013-11-14 19:11:31 -05:00

ZAS

Medical Hoopery

2013-11-14 12:40:30 -05:00

global.dm

First pass on experimental change that allows zones to "Sleep"

2013-09-11 11:43:42 -07:00

hub.dm

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00

names.dm

…

setup.dm

Added and Adjusted Chemicals

2013-11-14 13:08:30 -05:00

stylesheet.dm

…

world.dm

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00