Ccomp5950 56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm

2014-03-28 18:46:04 -05:00

..

chem_grenade.dm

Chemgrenade fix

2014-02-27 14:09:47 +13:00

emgrenade.dm

Reduced EMP grenade range.

2012-11-29 02:20:09 +00:00

flashbang.dm

Medical Hoopery

2013-11-14 12:40:30 -05:00

grenade.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

smokebomb.dm

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

spawnergrenade.dm

Ctrl-H "faggot" to "meatball" and one icon state change.

2014-03-20 05:05:23 -06:00