Ikarrus 6cc17a6243 Resolved Conflicts: ...

code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm

2015-06-27 00:17:02 -06:00

..

Chemistry-Reagents

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

Chemistry-Recipes

Merge pull request #9971 from KorPhaeron/newfloors

2015-06-23 03:43:28 +01:00

reagent_containers

Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours

2015-06-26 15:34:24 -05:00

Chemistry-Colours.dm

Ports /vg/ chem weighted colour averaging

2015-05-12 23:55:35 +01:00

Chemistry-Holder.dm

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

Chemistry-Machinery.dm

Merge pull request #9466 from Fayrik/TheNanoing

2015-06-22 14:24:20 +02:00

Chemistry-Readme.dm

Reorganizing the reagents files. Goon chems are no longer in separate files.

2015-04-16 22:07:24 +02:00

Chemistry-Reagents.dm

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

Chemistry-Recipes.dm

JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging

2015-06-14 23:37:35 +10:00

reagent_containers.dm

Remove SpeciesCanConsume() proc, replaced by iscarbon checks.

2015-04-11 22:16:42 +02:00

reagent_dispenser.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00