Ccomp5950 63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm

2014-02-20 19:16:23 -06:00

..

__HELPERS

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

2014-02-20 19:16:23 -06:00

_onclick

Fix for #4011.

2014-02-02 02:34:30 +03:00

ATMOSPHERICS

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

2014-02-20 19:16:23 -06:00

controllers

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

2014-02-04 23:55:27 -08:00

datums

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

2014-02-20 19:16:23 -06:00

defines

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

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

FEA

…

game

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

2014-02-20 19:16:23 -06:00

js

…

modules

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

2014-02-20 19:16:23 -06:00

TriDimension

Fixes so ladders actually connect and function now.

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

unused

…

WorkInProgress

New areas for engineering remap

2014-02-08 18:34:32 +13:00

ZAS

Mass correction of controler to controller.

2014-01-25 03:15:13 +10:30

global.dm

Admin requested addition of a global dsay toggle.

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

hub.dm

…

names.dm

…

setup.dm

Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.

2014-01-28 15:59:50 +10:30

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