Poojawa 789064a3a5 Clean up .rej files

2017-06-28 02:24:03 -05:00

..

energy_gun.dm

Update energy_gun.dm

2017-06-27 12:20:39 -05:00

kinetic_accelerator.dm

another huge sync

2017-06-21 18:00:00 -05:00

laser.dm

Ancient Space Station [Space Spawn Ruin]

2017-06-25 11:03:27 -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

pulse.dm

Ports guns to Initialize

2017-05-26 19:06:39 -05:00

special.dm

up to upstream-merge-27868

2017-06-11 00:04:00 -05:00

stun.dm

Disablers now have an in-hand sprite (Fixes #28582)

2017-06-20 10:31:24 -05:00