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

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm

2016-03-30 22:55:00 -06:00

..

chem_grenade.dm

Don't message admins when a grenade goes bang

2016-01-29 01:32:30 +00:00

clusterbuster.dm

Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem

2016-03-25 03:56:01 -07:00

emgrenade.dm

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

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

flashbang.dm

- I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)

2016-02-07 18:50:18 +01:00

ghettobomb.dm

Added small explosion as suggested

2015-12-30 23:05:26 -05:00

grenade.dm

Merge pull request #13585 from KorPhaeron/reactive_expansion

2015-12-17 17:05:53 -06:00

smokebomb.dm

tkdrg said to name commits something useful

2016-03-20 19:50:22 -05:00

spawnergrenade.dm

Ups price to 4TC. Soap Spawnergrenade added to replace soap as payload.

2016-01-31 12:29:00 -08:00

syndieminibomb.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00