phil235 e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix ...

Conflicts:
	code/modules/clothing/masks/gasmask.dm

2015-06-28 15:22:21 +02:00

..

blood_pack.dm

iv drip hotfixes

2015-02-03 18:34:32 -08:00

borghydro.dm

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00

bottle.dm

fixes sodium thiopental bottle

2015-03-22 20:19:21 -07:00

dropper.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix

2015-06-28 15:22:21 +02:00

glass.dm

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00

hypospray.dm

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00

patch.dm

Remove SpeciesCanConsume() proc, replaced by iscarbon checks.

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

pill.dm

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00

spray.dm

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00

syringes.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix

2015-06-28 15:22:21 +02:00