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

Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm

2016-04-24 21:22:37 +02:00

..

chem_grenade.dm

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

2016-04-24 21:22:37 +02: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

…

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

First commit of this big PR

2016-04-24 20:26:24 +02: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