PsiOmega eca4265abe Merge remote-tracking branch 'upstream/dev' into CanTrack ...

Conflicts:
	code/game/machinery/camera/tracking.dm

2015-02-02 08:15:41 +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

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

carn

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

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

Chinsky

Fixed capitalization of 'engine control console'.

2014-12-18 23:15:22 +01:00

Cib

refactor 'dir = ' into 'set_dir()'

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

computer3

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

2015-02-02 08:15:41 +01:00

kilakk

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

Mini

Less copy-pastah

2014-11-20 13:18:07 +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

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

Sigyn

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

SkyMarshal

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

Susan

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

Tastyfish

refactor 'dir = ' into 'set_dir()'

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

Wrongnumber

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

autopsy.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

buildmode.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00: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

Newscaster and photo cleanup

2014-11-06 13:28:17 +01:00