Mloc-Hibernia e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev ...

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

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm

2014-05-11 13:19:09 +00: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

misc tweaks and cleanups to shield gens/caps (renames, power usage), added a temp recharge delay when a field takes damage

2014-04-23 08:48:21 +10:00

carn

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

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

Chinsky

Null message fix

2014-05-10 00:37:48 +12:00

Cib

Changes all appropriate instances of toxins to phoron

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

kilakk

Merge pull request #4004 from volas/master

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

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

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

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

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

Changes all appropriate instances of 'Plasma' to 'Phoron'

2014-04-10 01:19:49 -07:00