Mloc-Argent 6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm

2014-06-30 23:44:46 +01:00

..

AI_Visibility

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

animusstation

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

Apples

Expansion of every "icon = ''" path.

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

Cael_Aislinn

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

2014-06-19 10:05:27 +10:00

carn

Tentative fix for #4037, unable to reproduce runtime to check.

2013-12-19 22:13:48 +10:30

Chinsky

Fixed #5374

2014-06-30 16:11:42 +04:00

Cib

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

computer3

shuttle controller fix

2014-06-23 15:15:53 -07:00

kilakk

Fixes #5061

2014-05-28 16:57:15 +09:30

Mini

Fixes #4688

2014-06-28 17:42:27 -04:00

Mloc

HUD Update

2012-05-23 22:58:52 +01:00

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

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

Sigyn

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

SkyMarshal

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

Susan

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

Tastyfish

Atmos mainline pipe code moved and enabled.

2014-04-28 09:08:38 -07:00

Wrongnumber

Expansion of every "icon = ''" path.

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

autopsy.dm

Fixes some printouts causing a runtime error when photocopied

2014-06-07 18:27:22 +02:00

buildmode.dm

Fixes #5088

2014-06-17 20:35:48 +01:00

explosion_particles.dm

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

meteors.dm

Expansion of every "icon = ''" path.

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

periodic_news.dm

Updates most used viable entries of t cet to Nyx

2014-05-26 15:58:16 -07:00