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

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

AI_Visibility

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

2013-11-25 11:59:57 +00: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

Ctrl-H "faggot" to "meatball" and one icon state change.

2014-03-20 05:05:23 -06:00

carn

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

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

Chinsky

Merge pull request #4093 from comma/guestpass

2013-12-25 03:39:50 -08:00

Cib

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

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

kilakk

Merge pull request #4004 from volas/master

2013-12-05 02:56:06 -08:00

Mini

moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database)

2013-09-20 13:35:49 +10: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

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

2014-04-25 21:14:58 -05: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

Refactors code to work with BYOND 500.

2013-09-22 12:39:48 +01:00

Susan

Refactors code to work with BYOND 500.

2013-09-22 12:39:48 +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

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

buildmode.dm

Turfs who spawn with the spawn verb or with buildmode will now use the ChangeTurf() proc and stop making Linda runtime to hell.

2014-01-08 19:13:57 +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

Removes a few typos from channel names

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