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

..

reagent_containers

Merge remote-tracking branch 'upstream/master' into dev-freeze

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

Chemistry-Colours.dm

Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast.

2014-06-18 23:45:25 +04:00

Chemistry-Holder.dm

Changes most viable, used entries of plasma with phoron.

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

Chemistry-Machinery.dm

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

2014-06-20 22:02:40 +01:00

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

…

Chemistry-Reagents.dm

Cleaned up some reagent stuff, made Skrell alcoholics a legit issue, fixed IPC getting phoron contamination from clothing.

2014-07-01 01:03:50 +09:30

Chemistry-Recipes.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

dartgun.dm

…

grenade_launcher.dm

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

reagent_containers.dm

A first pass at more realistic w_class values

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

reagent_dispenser.dm

Fixes FEA temperature_expose() being used...

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

syringe_gun.dm

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