LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00

..

chem_grenade.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

clusterbuster.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

emgrenade.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

flashbang.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

ghettobomb.dm

Fixes clowns blowing shit up not being logged 50% of the time

2017-08-29 09:32:06 -05:00

grenade.dm

Update grenade.dm

2017-10-30 17:32:08 -05:00

plastic.dm

Datum rev & related upgrades to base datum antag

2017-10-18 02:26:11 -05:00

smokebomb.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

spawnergrenade.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

syndieminibomb.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00