Poojawa 62273a3867 Merge branch 'master' into upstream-merge-31737

2017-10-21 07:18:14 -05:00

..

ballistic

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

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

energy

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

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

magic

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

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

misc

…

ballistic.dm

Merge branch 'master' into upstream-merge-31737

2017-10-21 07:18:14 -05:00

beam_rifle.dm

Merge pull request #31809 from ShizCalev/helper-cleanup

2017-10-17 19:21:14 -05:00

energy.dm

Removes a bunch of sleeps/spawns and makes a few booleans defines

2017-10-14 18:53:48 -05:00

grenade_launcher.dm

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

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

magic.dm

…

medbeam.dm

…

mounted.dm

…

syringe_gun.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00