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

Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm

2014-01-23 00:05:53 -06:00

..

area

Refined earlier fix

2014-01-15 18:18:58 +13:00

dna

NanoUI updates.

2014-01-06 02:49:25 +00:00

gamemodes

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

2014-01-11 10:45:57 +10:30

jobs

Removed book that causes braindeadness

2014-01-17 18:06:30 -05:00

machinery

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

2014-01-23 00:05:53 -06:00

magic

…

mecha

Merge pull request #4237 from Mloc/bs12-tgstuff

2014-01-09 22:33:28 -08:00

objects

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

2014-01-23 00:05:53 -06:00

turfs

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

2014-01-09 17:42:30 +00:00

vehicles

…

verbs

Replaces modwho and adminwho with staffwho.

2014-01-10 12:49:32 -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

Made blood overlays respect blood color

2013-12-26 15:28:03 +04:00

communications.dm

Moved the CentComm channels onto their own tcomm network thing

2013-12-01 18:58:16 -05: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

…