mwerezak ababfc1d0c Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes ...

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

2014-08-22 01:24:34 -04:00

..

reagent_containers

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

2014-08-22 01:24:34 -04: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 pull request #5940 from mwerezak/power-net

2014-08-11 10:13:26 +09:30

Chemistry-Readme.dm

Paint mixing

2014-01-11 22:19:02 +01:00

Chemistry-Reagents-Antidepressants.dm

Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.

2014-01-08 21:33:17 -07:00

Chemistry-Reagents.dm

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

Chemistry-Recipes.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

dartgun.dm

Smallfix.

2013-10-17 04:00:33 +03:00

grenade_launcher.dm

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

reagent_containers.dm

Fixes reagent_containers not being usable for surgery

2014-07-06 15:37:05 -04:00

reagent_dispenser.dm

Added fingerprints and logs when wrenching fuel tanks, and added JMP buttons to logs regarding fuel tanks.

2014-08-17 15:51:01 -07: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