ZuhayrandZomgPonies 38559ab477 Makes forks usable. ...

Conflicts:
	code/game/objects/items/weapons/kitchen.dm
	icons/obj/kitchen.dmi

2014-06-22 10:58:50 -04:00

..

reagent_containers

Makes forks usable.

2014-06-22 10:58:50 -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-20 12:08:30 -04:00

Chemistry-Holder.dm

Fix smoke

2014-04-20 02:34:40 -04:00

Chemistry-Machinery.dm

Fixes circuit var for other consoles

2014-05-26 06:21:03 -04:00

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

i'm still an idiot

2014-06-22 08:32:33 +09:30

Chemistry-Reagents.dm

atmos: fix everlasting fires

2014-06-22 10:54:19 -04:00

Chemistry-Recipes.dm

atmos: fix everlasting fires

2014-06-22 10:54:19 -04:00

dartgun.dm

Trying to cut down on attack lock spam

2014-05-24 17:17:38 -04:00

grenade_launcher.dm

…

reagent_containers.dm

…

reagent_dispenser.dm

Fixes FEA temperature_expose() being used...

2014-06-22 02:03:42 -04:00

syringe_gun.dm

Trying to cut down on attack lock spam

2014-05-24 17:17:38 -04:00