Leshana e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 ...

# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm

2018-04-06 15:40:06 -04:00

..

sniper

Adds Collapsible AM rifle. Createes new uplink entry (#3644)

2017-07-28 16:06:20 -05:00

automatic_vr.dm

…

automatic.dm

Ports more two-handed gun sprites from Bay

2018-02-21 01:57:56 -06:00

boltaction.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

contender.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

dartgun.dm

More merging updates

2017-09-19 23:58:40 -04:00

pistol_vr.dm

More guns for the gun box

2018-01-18 18:53:43 -05:00

pistol.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

revolver.dm

44 revolvers

2018-03-26 14:33:43 -07:00

semiauto.dm

Grammar error

2017-09-01 04:46:44 -04:00

shotgun.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

sniper_vr.dm

Adjust VOREStation guns for PolarisSS13/Polaris/#4185

2018-02-17 16:56:30 -05:00

sniper.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00