Zuhayr 97801b4617 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

2014-09-29 00:39:43 +09:30

..

area

Departments now have their air/scrubber pipes routed through relevant substations.

2014-09-26 23:21:40 +02:00

dna

Merge resolution, replaced 2 wires lost in map merge.

2014-09-25 23:54:24 +09:30

gamemodes

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

2014-09-29 00:39:43 +09:30

jobs

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

machinery

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

2014-09-29 00:39:43 +09:30

magic

…

mecha

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

objects

Merge resolution, replaced 2 wires lost in map merge.

2014-09-25 23:54:24 +09:30

turfs

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

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

Stack update

2014-09-02 09:59:32 +04:00