Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

2013-09-02 23:32:33 +01:00

..

AI_Visibility

Expansion of every "icon = ''" path.

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

animusstation

Expansion of every "icon = ''" path.

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

Apples

Expansion of every "icon = ''" path.

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

Cael_Aislinn

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

2013-09-02 23:32:33 +01:00

carn

Adds explosive implant admin messages, and jump button for explosions.

2013-08-12 12:34:13 +01:00

Chinsky

Expansion of every "icon = ''" path.

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

Cib

Expansion of every "icon = ''" path.

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

kilakk

Added a fax machine to send messages to centcom with.

2013-08-18 14:39:08 -04:00

Mini

Expansion of every "icon = ''" path.

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

Mloc

…

organs

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

Ported

Expansion of every "icon = ''" path.

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

Sigyn

Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white.

2013-01-21 00:11:48 +00:00

SkyMarshal

Expansion of every "icon = ''" path.

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

Susan

Expansion of every "icon = ''" path.

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

Tastyfish

Expansion of every "icon = ''" path.

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

Wrongnumber

Expansion of every "icon = ''" path.

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

autopsy.dm

Fixes #3145

2013-06-24 21:31:38 -07:00

buildmode.dm

This just fixes a small typo in build mode.

2013-06-09 03:16:51 -04:00

explosion_particles.dm

…

meteors.dm

Expansion of every "icon = ''" path.

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

periodic_news.dm

Removes a few typos from channel names

2013-06-09 18:04:27 -04:00