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

..

beams.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

bullets.dm

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

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

energy.dm

Preliminary tesla projectile refactor (also insults vcordie because I'm mean.)

2017-05-06 10:42:51 -05:00

magic.dm

April sync (#360)

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

megabuster.dm

Adds VG weaponry to the server (#243)

2017-02-28 07:55:22 -06:00

plasma.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

reusable.dm

Tg patch branch to master (#192)

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

special.dm

New() goes in the trash, we've gotta Initialize()

2017-04-26 17:15:48 -05:00