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

Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm

2013-11-24 23:37:09 +00:00

..

area

Map Fixes IV: Areas Rising

2013-11-17 15:50:55 -05:00

dna

Fixes duplicate beaker on Eject Occupant

2013-11-06 19:37:56 -05:00

gamemodes

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

2013-11-24 23:37:09 +00:00

jobs

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

2013-11-24 23:37:09 +00:00

machinery

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

2013-11-24 23:37:09 +00:00

magic

…

mecha

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

2013-11-24 23:37:09 +00:00

objects

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

2013-11-24 23:37:09 +00:00

turfs

Merge branch 'dev-freeze' into dev

2013-10-10 14:37:41 +04:00

vehicles

…

verbs

Merge pull request #3868 from DJSnapshot/master

2013-11-03 19:19:36 -08:00

asteroid.dm

…

atoms_movable.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

atoms.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

communications.dm

Adds colored department radio channels.

2013-07-30 17:38:34 -04:00

json.dm

…

response_team.dm

Added two ears back.

2013-08-27 22:05:27 +01:00

shuttle_engines.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

…