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

..

chem_grenade.dm

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

2015-06-24 21:15:09 +02:00

clusterbuster.dm

Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.

2015-03-10 20:30:46 +01:00

emgrenade.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

flashbang.dm

Fixes conflicts and commits

2015-03-21 12:47:25 -04:00

ghettobomb.dm

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

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

grenade.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

smokebomb.dm

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

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

spawnergrenade.dm

Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.

2015-03-10 20:30:46 +01:00

syndieminibomb.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00