cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
890693b839e02b57f4fbf3afc5dd78e555bac395
CHOMPStation2/code/modules/reagents
History
Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
..
Chemistry-Reagents
Merge branch 'dev' into ofChemistryAndStuff
2015-05-15 11:28:05 +03:00
dispenser
Fixes #8700
2015-04-01 07:47:15 +01:00
reagent_containers
Merge branch 'dev' into ofChemistryAndStuff
2015-05-15 11:28:05 +03:00
Chemistry-Colours.dm
Updates chemistry colors
2015-04-28 09:23:39 +03:00
Chemistry-Holder.dm
Merge branch 'dev' into ofChemistryAndStuff
2015-05-15 11:28:05 +03:00
Chemistry-Machinery.dm
Merge branch 'dev' into ofChemistryAndStuff
2015-04-28 10:49:26 +03:00
Chemistry-Readme.dm
…
Chemistry-Reagents.dm
Merge branch 'dev' into ofChemistryAndStuff
2015-05-04 22:36:35 +03:00
Chemistry-Recipes.dm
Removes metorapan reaction
2015-05-05 12:01:02 +03:00
reagent_containers.dm
Merge branch 'dev' into ofChemistryAndStuff
2015-05-15 11:28:05 +03:00
reagent_dispenser.dm
Updates the atom_pool, now datum_pool, to handle any datum object.
2015-04-24 09:59:05 +02:00