kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items ...

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

2017-05-21 18:17:42 -07:00

..

chem_grenade.dm

Changes a bunch of hrefs to the proper defines

2017-05-02 02:20:07 -05:00

clusterbuster.dm

TG sync Sunday (#201)

2017-02-06 00:36:56 -06:00

emgrenade.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

flashbang.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

ghettobomb.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

grenade.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

plastic.dm

Plastic explosives can no longer be detonated by EMPs

2017-05-18 16:37:30 -05:00

smokebomb.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

spawnergrenade.dm

[MIRROR] Fixes language code ignoring holder restrictions (#858)

2017-05-18 04:13:57 -05:00

syndieminibomb.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00