Poojawa 789064a3a5 Clean up .rej files

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

..

ballistic

Merge pull request #1225 from Citadel-Station-13/upstream-merge-27611

2017-06-05 23:06:18 -05:00

energy

Clean up .rej files

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

magic

Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361

2017-05-30 15:15:51 -05:00

ballistic.dm

Fixes shooting self while suiciding with gun without proper firing pin auth (#1520)

2017-06-13 13:42:15 -07:00

energy.dm

Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync

2017-06-14 06:41:01 -05:00

grenade_launcher.dm

Bleeding edgy refresh (#303)

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

magic.dm

Ports guns to Initialize

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

medbeam.dm

Ports guns to Initialize

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

mounted.dm

Fixes armlasers breaking on retract (#498)

2017-04-20 22:03:30 -05:00

syringe_gun.dm

Ports guns to Initialize

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