PsiOmega 01be3a37c1 Merge remote-tracking branch 'upstream/dev' into AtmosList. Atmospherics Control Console no longer sorts the machines list, as this is now done elsewhere.

2014-08-25 21:53:17 +02:00

..

area

Fixes #6130

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

dna

Fixes icons and other things not updating when the master controller updates power status.

2014-08-10 03:45:20 -04:00

gamemodes

Based on https://github.com/tgstation/-tg-station/pull/4562 and adapted to BS12 shuttle code. Credit to @Ikarrus.

2014-08-25 07:37:59 +02:00

jobs

Merge pull request #6142 from PsiOmegaDelta/sec_hud

2014-08-24 21:45:34 +04:00

machinery

Merge remote-tracking branch 'upstream/dev' into AtmosList. Atmospherics Control Console no longer sorts the machines list, as this is now done elsewhere.

2014-08-25 21:53:17 +02:00

magic

…

mecha

Now mecha area denial feedback is closer to 5 seconds apart then ever.

2014-08-24 23:41:15 +02:00

objects

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

2014-08-21 11:40:35 -05:00

turfs

…

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

…