Mloc-Argent 4871a3a850 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi

2014-10-15 22:13:44 +01:00

..

area

Map alterations. Fixes #6677.

2014-10-12 12:44:13 +02:00

dna

Manual icon file merge.

2014-10-11 06:40:36 +10:30

gamemodes

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

2014-10-12 02:06:27 +10:30

jobs

Removed Taj hackfix

2014-10-09 06:20:15 +10:30

machinery

Thought I had done these before, turned out I did. Single-linebreak conflicts woo.

2014-10-12 11:55:33 +10:30

magic

…

mecha

Force removing a passenger now has a delay

2014-10-09 00:33:59 -04:00

objects

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-10-15 22:13:44 +01:00

turfs

Merge repair

2014-10-03 16:04:31 -04:00

vehicles

…

verbs

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

2014-09-29 06:19:26 +09:30

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

…

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Stack update

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