Lohikar dcf1b7d3ea Fix merge conflicts with mining changes

2017-03-22 17:54:52 -05:00

..

automatic.dm

Fix #1544 and cloning attempt (#1545)

2017-01-13 23:38:17 +02:00

boltaction.dm

New Map Mining (#1935)

2017-03-22 18:14:37 -04:00

dartgun.dm

Plenty'o'fixes (#1478)

2017-01-09 01:04:36 +02:00

improvised.dm

New Map Mining (#1935)

2017-03-22 18:14:37 -04:00

pistol.dm

RnD & Cat fixes (#1913)

2017-03-12 12:18:58 +02:00

revolver.dm

Plenty'o'fixes (#1478)

2017-01-09 01:04:36 +02:00

scout_sniper.dm

Automatic pistol, nutriment and sprites fixes (#1617)

2017-01-21 17:23:11 +02:00

shotgun.dm

New Map Mining (#1935)

2017-03-22 18:14:37 -04:00

sniper.dm

Plenty'o'fixes (#1478)

2017-01-09 01:04:36 +02:00

svd.dm

Plenty'o'fixes (#1478)

2017-01-09 01:04:36 +02:00