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

2014-08-28 18:29:05 -07:00

..

area

Fixes #6130

2014-08-23 10:20:24 +02:00

dna

Cables are now stacks

2014-08-25 18:54:35 +04:00

gamemodes

Merge pull request #6188 from Kelenius/OfWizardsAndOrbs

2014-08-28 14:44:07 +04:00

jobs

Making sec huds more fault tolerant. A number of sources never set id.rank, only id.assignment.

2014-08-26 13:44:49 +02:00

machinery

Merge pull request #6193 from PsiOmegaDelta/StatusDisplayExam

2014-08-28 18:38:35 +04:00

magic

…

mecha

Merge pull request #6168 from Kelenius/OfCablesAndStacks

2014-08-26 15:25:31 +04:00

objects

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

2014-08-28 18:29:05 -07:00

turfs

Cables are now stacks

2014-08-25 18:54:35 +04:00

vehicles

…

verbs

…

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

fixes #5907

2014-08-21 15:41:28 +02:00

json.dm

…

response_team.dm

Merge pull request #6075 from MrSnapwalk/ertv3

2014-08-22 05:01:02 -05:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos.

2014-08-19 10:50:17 +02:00

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Merge pull request #5832 from Baystation12/master

2014-07-29 18:37:19 +04:00