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

Conflicts:
	maps/tgstation2.dmm

2014-03-06 19:22:06 +08:00

..

__HELPERS

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

2014-03-04 18:29:03 -06:00

_onclick

Fixes admin attack logs to show up in-game as well as in the logfiles.

2014-02-25 20:36:46 +00:00

ATMOSPHERICS

Revert "derp"

2014-02-21 18:17:15 +11:00

controllers

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

2014-03-04 18:29:03 -06:00

datums

Added '50 Wooden Planks' to shipments

2014-03-02 21:35:10 +01:00

defines

Moved cable definition to cable.dm because what the fuck.

2014-01-19 03:05:48 +04:00

FEA

…

game

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

2014-03-06 19:22:06 +08:00

js

…

modules

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

2014-03-06 19:22:06 +08:00

TriDimension

Fixes so ladders actually connect and function now.

2014-01-25 04:16:18 +10:30

unused

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

WorkInProgress

Fixed ghosts' lighting toggle. Mesons still look weird.

2014-02-24 07:12:40 -07:00

ZAS

Fixed nuke shuttle being a swirly vortex of death.

2014-02-26 08:16:52 -07:00

global.dm

Admin requested addition of a global dsay toggle.

2014-01-20 18:27:12 -08:00

hub.dm

…

names.dm

…

setup.dm

Fixes a define spelling error.

2014-03-03 20:23:21 -08:00

stylesheet.dm

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

2014-01-10 13:52:07 -08:00

world.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00