Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04: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 'master' into dev

2014-06-17 16:16:44 +04:00

carn

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

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

Chinsky

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

Cib

Changes all appropriate instances of toxins to phoron

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

kilakk

Fixes #5061

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

Mini

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07: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

Refactors code to work with BYOND 500.

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

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

Updates most used viable entries of t cet to Nyx

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